From 4bd71f2795b5614ca5e93fab4ca2dce4ccaecdc1 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: Wed, 16 Nov 2022 15:57:58 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=9A=B4=EC=98=81=20console=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=A1=A4=EB=B0=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 2 +- src/components/map/naver/dron/DronMarker.js | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/App.js b/src/App.js index 2cb77b2..535ee4c 100644 --- a/src/App.js +++ b/src/App.js @@ -1,6 +1,6 @@ // ** Router Import import Router from './router/Router'; -// if (process.env.NODE_ENV === 'production') console.log = function () {}; +if (process.env.NODE_ENV === 'production') console.log = function () {}; const App = props => ; export default App; diff --git a/src/components/map/naver/dron/DronMarker.js b/src/components/map/naver/dron/DronMarker.js index 516a10d..212b44d 100644 --- a/src/components/map/naver/dron/DronMarker.js +++ b/src/components/map/naver/dron/DronMarker.js @@ -133,28 +133,21 @@ export const DronMarker = props => { //마커를 그린다. const addMarkers = (position, id, controlId, gps) => { const markerOption = {}; - console.log(gps, 'gps'); - console.log(id, 'idntfNum'); if (id.substring(0, 2) === 'PA') { const pal = controlGroupAuthInfo?.find( prev => prev.idntfNum === gps.objectId ); - console.log(pal, '등록된 식별장치'); if (pal) { - console.log('맞음'); markerOption.url = DronIcon; markerOption.type = 'DRONE'; } else { - console.log('아님'); if (user.authId === 'SUPER' || user.authId === 'ADMIN') { console.log('super, admin'); markerOption.url = FlightIcon; markerOption.type = 'FLIGHT'; } else { - console.log('user'); const terminal = joinList?.find(prev => prev.trmnlId === gps.trmnlId); - console.log(terminal, 'trmnlId 일치 있음'); if ( terminal?.groupAuthCd === 'MASTER' || terminal?.groupAuthCd === 'LEADER' From 20e3ab63e5e1c944048c42cac30ce4af5e8ce008 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: Wed, 16 Nov 2022 16:36:24 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EA=B4=80=EC=A0=9C=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=EB=B8=94=EB=A1=9D=20custom=20overlay?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/map/naver/dron/DronMarker.js | 26 +++++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/components/map/naver/dron/DronMarker.js b/src/components/map/naver/dron/DronMarker.js index 212b44d..ad4e9e1 100644 --- a/src/components/map/naver/dron/DronMarker.js +++ b/src/components/map/naver/dron/DronMarker.js @@ -37,7 +37,7 @@ export const DronMarker = props => { const { joinList } = useSelector(state => state.groupState); const [arrMarkers, setArrMarkers] = useState([]); - // const [arrInfos, setArrInfos] = useState([]); + const [arrInfos, setArrInfos] = useState([]); let naver = props.naver; let map = props.map; @@ -95,6 +95,12 @@ export const DronMarker = props => { ); }, []); + useEffect(() => { + if (arrMarkers.length != 0) { + markerInfo(arrMarkers); + } + }, [arrMarkers]); + useEffect(() => { markerInit(); }, [controlGpList]); @@ -302,6 +308,16 @@ export const DronMarker = props => { const arrData = arrMarkers.filter(item => item.id != marker.id); removeArrMarkers(arrData); + dispatch(objectUnClickAction()); + } + }); + arrInfos.map(info => { + const isExists = controlGpList.find(item => item.objectId === info._id); + if (!isExists) { + removeInfos(info); + const arrData = arrInfos.filter(item => item.id != info._id); + removeArrInfos(arrData); + dispatch(objectUnClickAction()); } }); @@ -317,10 +333,10 @@ export const DronMarker = props => { if (arrMarkers) { const isExists = arrMarkers.find(ele => ele.id === item.objectId); - // const isInfos = arrInfos.find( info => info._id === item.objectId ) + const isInfos = arrInfos.find(info => info._id === item.objectId); if (isExists) { moveMarkers(isExists, position, item); - // moveInfos(isInfos, position); + moveInfos(isInfos, position); } else { addMarkers(position, item.objectId, item.controlId, item); } @@ -440,9 +456,9 @@ export const DronMarker = props => { setArrInfos(arrData); }; - const markerInfo = () => { + const markerInfo = arrMarkers => { arrMarkers.forEach((marker, idx) => { - // infoInit(marker, controlGpList[idx], idx); + infoInit(marker, controlGpList[idx], idx); if (controlGpList.length != 0) { const info = new CustomOverlay({