From b4efd1bf37d6bf18f08f8d3bd45cb316eb74a133 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?=
 <stc9606@palnet.co.kr>
Date: Thu, 20 Oct 2022 16:25:49 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8B=9D=EB=B3=84=EC=9E=A5=EC=B9=98=20prefix?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=EC=9C=BC=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20?=
 =?UTF-8?q?=EC=9E=91=EC=97=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/map/naver/dron/DronMarker.js   | 28 ++++++++++---------
 src/modules/control/gp/sagas/controlGpSaga.ts |  7 +++--
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/components/map/naver/dron/DronMarker.js b/src/components/map/naver/dron/DronMarker.js
index dcb59288..84e0e087 100644
--- a/src/components/map/naver/dron/DronMarker.js
+++ b/src/components/map/naver/dron/DronMarker.js
@@ -83,7 +83,7 @@ export const DronMarker = props => {
     arrMarkers.map(clickMarker => {
       if (objectId === clickMarker.controlId && isClickObject) {
         imageUrl =
-          clickMarker.id.indexOf('PALDRONE') > -1
+          clickMarker.type === 'DRONE'
             ? DronDetailIcon
             : FlightDetailIcon;
         clickMarker.setIcon({
@@ -93,7 +93,7 @@ export const DronMarker = props => {
         });
       } else {
         imageUrl =
-          clickMarker.id.indexOf('PALDRONE') > -1 ? DronIcon : FlightIcon;
+          clickMarker.type === 'DRONE' ? DronIcon : FlightIcon;
         clickMarker.setIcon({
           content: `<img src="${imageUrl}" alt="" style="transform: rotate(${clickMarker.gps.heading}deg)">`,
           origin: new naver.maps.Point(0, 0),
@@ -114,30 +114,32 @@ export const DronMarker = props => {
 
   //마커를 그린다.
   const addMarkers = (position, id, controlId, gps) => {
-    const iconOption = {};
-    const homePath = window.HOME_PATH || '.';
+    const markerOption = {};    
 
-    if (id.indexOf('PALDRONE') > -1) {
+    if (id.substring(0, 2) === 'PA') {
       const pal = controlGroupAuthInfo.find(
         prev => prev.idntfNum === gps.objectId
       );
-      iconOption.url = pal ? DronIcon : FlightIcon;
+      markerOption.url = pal ? DronIcon : FlightIcon;
+      markerOption.type = pal ? 'DRONE' : 'FLIGHT';
     } else {
-      iconOption.url = FlightIcon;
+      markerOption.url = FlightIcon;
+      markerOption.type = 'FLIGHT';
     }
-    // iconOption.url = id.indexOf('PALDRONE') > -1 ? DronIcon : FlightIcon;
-    iconOption.origin = new naver.maps.Point(0, 0);
-    iconOption.anchor = new naver.maps.Point(15, 15);
+    
+    markerOption.origin = new naver.maps.Point(0, 0);
+    markerOption.anchor = new naver.maps.Point(15, 15);
 
     const marker = new naver.maps.Marker({
       position: position,
       title: id,
       id: id,
       controlId: controlId,
+      type: markerOption.type,
       icon: {
-        content: `<img src="${iconOption.url}" alt="" style="transform: rotate(${gps.heading}deg)">`,
-        origin: iconOption.origin,
-        anchor: iconOption.anchor
+        content: `<img src="${markerOption.url}" alt="" style="transform: rotate(${gps.heading}deg)">`,
+        origin: markerOption.origin,
+        anchor: markerOption.anchor
       },
       gps: gps
     });
diff --git a/src/modules/control/gp/sagas/controlGpSaga.ts b/src/modules/control/gp/sagas/controlGpSaga.ts
index d86308b6..75d2c696 100644
--- a/src/modules/control/gp/sagas/controlGpSaga.ts
+++ b/src/modules/control/gp/sagas/controlGpSaga.ts
@@ -46,8 +46,11 @@ function* getControlGpSaga(
       const controlIds: any = [];
 
       data.forEach(gps => {
-        if (gps.controlId && gps.objectId.indexOf('PALDRONE') > -1)
-          controlIds.push(gps.controlId);
+        if (gps.controlId && gps.objectId.substring(0, 2) === 'PA') {
+          const arcrft = controlGroupAuthInfo.find(auth => auth.idntfNum === gps.objectId);
+
+          if (arcrft) controlIds.push(gps.controlId); 
+        }          
       });
 
       const param = controlIds.join(',');