From 5af1866075db57e3eb01921deb912348fcebe3fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?kimjh=28=EA=B9=80=EC=9E=A5=ED=98=84=29?= Date: Tue, 25 Oct 2022 11:16:49 +0900 Subject: [PATCH] =?UTF-8?q?=EB=93=9C=EB=A1=A0=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/map/naver/dron/DronMarker.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/components/map/naver/dron/DronMarker.js b/src/components/map/naver/dron/DronMarker.js index b5aeb67..689832a 100644 --- a/src/components/map/naver/dron/DronMarker.js +++ b/src/components/map/naver/dron/DronMarker.js @@ -4,8 +4,8 @@ import { useDispatch, useSelector } from 'react-redux'; import '../../../../assets/css/custom.css'; import FlightIcon from '../../../../assets/images/airplan_org.svg'; import FlightDetailIcon from '../../../../assets/images/airplan_pp.svg'; -import DronIcon from '../../../../assets/images/new_drone_icon_org.svg'; -import DronDetailIcon from '../../../../assets/images/new_drone_icon_pp.svg'; +import DronIcon from '../../../../assets/images/drone-marker-icon.png'; +import DronDetailIcon from '../../../../assets/images/drone-marker-icon-pulple.png'; import { IoMdAirplane } from 'react-icons/io'; import { controlGpDtlAction, @@ -136,7 +136,7 @@ export const DronMarker = props => { controlId: controlId, type: markerOption.type, icon: { - content: ``, + content: ``, origin: markerOption.origin, anchor: markerOption.anchor }, @@ -192,6 +192,7 @@ export const DronMarker = props => { const getIcon = marker.getIcon(); marker.setPosition(position); + if ( controlGpArcrftWarnList?.filter(i => i.cntrlId === gps.controlId).length > 0 @@ -200,7 +201,7 @@ export const DronMarker = props => { marker.setIcon({ content: ``, @@ -210,12 +211,20 @@ export const DronMarker = props => { marker.setIcon({ content: ``, anchor: getIcon.anchor }); } + return; } + marker.setIcon({ + content: ``, + anchor: getIcon.anchor + }); }; const moveInfos = (info, position) => {