From 33aa24b01fbc2103244c25e42bbebdb53a78fefa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?kimjh=28=EA=B9=80=EC=9E=A5=ED=98=84=29?= Date: Thu, 3 Nov 2022 19:12:20 +0900 Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=EA=B8=B0=EC=B2=B4=20dipatch=20=EC=8B=9C=EC=A0=90?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/map/naver/NaverMap.js | 2 -- src/components/map/naver/dron/DronMarker.js | 10 ++++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/components/map/naver/NaverMap.js b/src/components/map/naver/NaverMap.js index 6c5733c..9207c84 100644 --- a/src/components/map/naver/NaverMap.js +++ b/src/components/map/naver/NaverMap.js @@ -6,7 +6,6 @@ import NaverMapControl from './NaverMapControl'; import { NaverMapSearch } from './search/NaverMapSearch'; import { FeatureAirZone } from './feature/FeatureAirZone'; import geoJson from '../geojson/airArea.json'; -import { controlGroupAuthAction } from '../../../modules/control/gp'; import DronPlan from './dron/DronPlan'; import DronToast from './dron/DronToast'; import SensorZone from './sensor/SensorZone'; @@ -22,7 +21,6 @@ export const NaverCustomMap = () => { useEffect(() => { NaverMapInit(); - dispatch(controlGroupAuthAction.request()); }, []); const NaverMapInit = () => { diff --git a/src/components/map/naver/dron/DronMarker.js b/src/components/map/naver/dron/DronMarker.js index 401ee27..fb664da 100644 --- a/src/components/map/naver/dron/DronMarker.js +++ b/src/components/map/naver/dron/DronMarker.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import { useEffect, useState } from 'react'; +import { useEffect, useState, useLayoutEffect } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import '../../../../assets/css/custom.css'; import FlightIcon from '../../../../assets/images/airplan_org.svg'; @@ -15,6 +15,7 @@ import { objectClickAction, objectUnClickAction } from '../../../../modules/control/map/actions/controlMapActions'; +import { controlGroupAuthAction } from '../../../../modules/control/gp'; export const DronMarker = props => { const dispatch = useDispatch(); @@ -76,6 +77,10 @@ export const DronMarker = props => { infoWindow.open(props.map, data.coord); }; + useLayoutEffect(() => { + dispatch(controlGroupAuthAction.request()); + }, [controlGpList]); + useEffect(() => { markerInit(); }, [controlGpList]); @@ -114,7 +119,8 @@ export const DronMarker = props => { //마커를 그린다. const addMarkers = (position, id, controlId, gps) => { const markerOption = {}; - + console.log(controlGroupAuthInfo); + console.log(gps.objectId); if (id.substring(0, 2) === 'PA') { const pal = controlGroupAuthInfo?.find( prev => prev.idntfNum === gps.objectId