From 7e47bba166f7e1d216c8a20c701a89533ff29c93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?= Date: Fri, 12 Aug 2022 18:22:55 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=EC=A0=95=EC=83=81=20=EC=83=81?= =?UTF-8?q?=ED=99=A9=20=EC=95=8C=EB=A6=BC=20=EC=B0=BD=20=EA=B3=A0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/map/naver/dron/DronMarker.js | 44 ++++++++++----------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/src/components/map/naver/dron/DronMarker.js b/src/components/map/naver/dron/DronMarker.js index f576757..e7af634 100644 --- a/src/components/map/naver/dron/DronMarker.js +++ b/src/components/map/naver/dron/DronMarker.js @@ -36,25 +36,21 @@ export const DronMarker = props => { if (controlGpList) { controlGpList.forEach(gps => { - if (gps.controlWarnCd && gps.controlWarnNotyCd) { - const marker = arrMarkers.find(marker => marker.id === gps.objectId); - - if(marker) { - toast.info( - , - { - // autoClose: 3000, - hideProgressBar: true, - position: toast.POSITION.BOTTOM_RIGHT, - onClick: props => { - if(marker) handlerDronClick(marker); - } + if (gps.controlWarnCd && gps.controlWarnNotyCd) { + toast.info( + , + { + // autoClose: 3000, + hideProgressBar: true, + position: toast.POSITION.BOTTOM_RIGHT, + onClick: props => { + handlerDronClick(gps.controlId, gps.objectId); } - ) - } + } + ) } }) } @@ -114,22 +110,22 @@ export const DronMarker = props => { markerInfo(marker); naver.maps.Event.addListener(marker, 'click', function (e) { - handlerDronClick(marker); + handlerDronClick(marker.controlId, marker.id); }); setArrMarkers(m => [...m, marker]); }; - const handlerDronClick = marker => { - const idntfNum = marker.id; - const contorlId = marker.controlId; + const handlerDronClick = (controlId, idntfNum) => { + // const idntfNum = marker.id; + // const contorlId = marker.controlId; // 클릭한 식별번호 정보를 가진 그룹 추출 // const group = controlGroupAuthInfo.find(group => group.idntfNum === idntfNum); //히스토리 불러오기 - dispatch(objectClickAction(contorlId)); - dispatch(controlGpDtlAction.request(contorlId)); + dispatch(objectClickAction(controlId)); + dispatch(controlGpDtlAction.request(controlId)); dispatch(controlGpFlightPlanAction.request(idntfNum)); };