From 7327afeeba46376d28225cb42dc78c1f6691d61d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Thu, 20 Oct 2022 16:17:07 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EC=A0=9C=20prefix=20=ED=95=84?= =?UTF-8?q?=ED=84=B0=20=ED=91=9C=EC=B6=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../map/naver/draw/FlightPlanDraw.js | 12 +++++----- src/components/map/naver/dron/DronMarker.js | 24 ++++--------------- 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/src/components/map/naver/draw/FlightPlanDraw.js b/src/components/map/naver/draw/FlightPlanDraw.js index 0f55840..758ed6e 100644 --- a/src/components/map/naver/draw/FlightPlanDraw.js +++ b/src/components/map/naver/draw/FlightPlanDraw.js @@ -31,6 +31,8 @@ export const FlightPlanDraw_init = props => { desc: '' }); + const [radiusCircle, setRadiusCircle] = useState(); + const naver = props.naver; const map = props.map; let mode = props.mode; @@ -58,12 +60,6 @@ export const FlightPlanDraw_init = props => { let distanceMarker = []; - const handleBufferList = () => { - dispatch(Actions.FLIGHT_PLAN_AREA_BUFFER_LIST.request(areaDetail)); - }; - - const [radiusCircle, setRadiusCircle] = useState(); - useEffect(() => { setRadiusCircle(props.dragSize); }, [props.dragSize]); @@ -89,6 +85,10 @@ export const FlightPlanDraw_init = props => { } }, [areaDetail]); + const handleBufferList = () => { + dispatch(Actions.FLIGHT_PLAN_AREA_BUFFER_LIST.request(areaDetail)); + }; + const drawInit = () => { if (mapControl.drawType === 'LINE') { onClickButton('LINE'); diff --git a/src/components/map/naver/dron/DronMarker.js b/src/components/map/naver/dron/DronMarker.js index 981954f..dcb5928 100644 --- a/src/components/map/naver/dron/DronMarker.js +++ b/src/components/map/naver/dron/DronMarker.js @@ -115,30 +115,16 @@ export const DronMarker = props => { //마커를 그린다. const addMarkers = (position, id, controlId, gps) => { const iconOption = {}; + const homePath = window.HOME_PATH || '.'; if (id.indexOf('PALDRONE') > -1) { - iconOption.url = DronIcon; - // let tt = controlGroupAuthInfo.find(prev => { - // prev.idntfNum === gps.objectId; - // }); - // if (tt) { - // iconOption.url = DronIcon; - // } else { - // iconOption.url = FlightIcon; - // } - // controlGroupAuthInfo.forEach(prev => { - // if (prev.idntfNum === gps.objectId) { - // iconOption.url = DronIcon; - // } else { - // iconOption.url = FlightIcon; - // } - // }); - // iconOption.url = DronIcon; + const pal = controlGroupAuthInfo.find( + prev => prev.idntfNum === gps.objectId + ); + iconOption.url = pal ? DronIcon : FlightIcon; } else { iconOption.url = FlightIcon; } - - const homePath = window.HOME_PATH || '.'; // iconOption.url = id.indexOf('PALDRONE') > -1 ? DronIcon : FlightIcon; iconOption.origin = new naver.maps.Point(0, 0); iconOption.anchor = new naver.maps.Point(15, 15);