식별장치 prefix 변경으로 인한 작업

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 markerOption = {};    
-    const homePath = window.HOME_PATH || '.';
 
-    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);
+    markerOption.origin = new naver.maps.Point(0, 0);
-    iconOption.anchor = new naver.maps.Point(15, 15);
+    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)">`,
+        content: `<img src="${markerOption.url}" alt="" style="transform: rotate(${gps.heading}deg)">`,
-        origin: iconOption.origin,
+        origin: markerOption.origin,
-        anchor: iconOption.anchor
+        anchor: markerOption.anchor
       },
       gps: gps
     });

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)
+        if (gps.controlId && gps.objectId.substring(0, 2) === 'PA') {
-          controlIds.push(gps.controlId);
+          const arcrft = controlGroupAuthInfo.find(auth => auth.idntfNum === gps.objectId);
+
+          if (arcrft) controlIds.push(gps.controlId); 
+        }          
       });
 
       const param = controlIds.join(',');