diff --git a/src/components/map/naver/dron/DronMarker.js b/src/components/map/naver/dron/DronMarker.js
index dcb5928..84e0e08 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: ``,
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: ``,
- origin: iconOption.origin,
- anchor: iconOption.anchor
+ content: ``,
+ 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 d86308b..75d2c69 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(',');