diff --git a/src/components/map/naver/dron/DronMarker.js b/src/components/map/naver/dron/DronMarker.js index 68ce39d0..6a743b70 100644 --- a/src/components/map/naver/dron/DronMarker.js +++ b/src/components/map/naver/dron/DronMarker.js @@ -40,25 +40,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); } - ) - } + } + ) } }) } @@ -115,25 +111,24 @@ export const DronMarker = props => { marker.setMap(props.map); // drone 정보 창 - naver.maps.Event.addListener(marker, 'click', function (e) { - handlerDronClick(marker); + handlerDronClick(marker.controlId, marker.id); }); setArrMarkers(m => [...m, marker]); // markerInfo(marker, position, id); }; - 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)); };