From d4dcf0b1d5a734ddfa5707cafb16d2d05a9821dd 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: Fri, 17 Nov 2023 15:32:02 +0900 Subject: [PATCH] =?UTF-8?q?=EB=93=9C=EB=A1=A0=EA=B5=90=ED=86=B5=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EB=B9=84=EC=A0=95=EC=83=81=20=ED=86=A0=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=ED=91=9C=EC=B6=9C=20=EB=B0=8F=20=EC=95=8C=EB=A6=BC?= =?UTF-8?q?=EC=9D=8C=20=EC=9E=AC=EC=83=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/map/mapbox/MapBoxMap.js | 13 +++++-------- src/components/map/mapbox/dron/DronToast.js | 13 ++++++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/components/map/mapbox/MapBoxMap.js b/src/components/map/mapbox/MapBoxMap.js index bdd77b9..76735c7 100644 --- a/src/components/map/mapbox/MapBoxMap.js +++ b/src/components/map/mapbox/MapBoxMap.js @@ -27,6 +27,7 @@ import flatGimpo from '../../map/geojson/flatGimpoAirportAirArea.json'; import { mapInitAction } from '../../../modules/control/map/actions/controlMapActions'; import DronPlan from './dron/DronPlan'; +import DronToast from './dron/DronToast'; const uamPosition = { type: 'FeatureCollection', @@ -269,10 +270,10 @@ export default function MapBoxMap() { const dispatch = useDispatch(); const mapControl = useSelector(state => state.controlMapReducer); - const planGeo = { + const [planGeo, setPlanGeo] = useState({ type: 'FeatureCollection', features: [] - }; + }); useLayoutEffect(() => { mapBoxMapInit(); @@ -807,10 +808,8 @@ export default function MapBoxMap() { {isMapLoaded && mapObject ? ( <> - - - {/* - */} + + {/* */} @@ -827,8 +826,6 @@ export default function MapBoxMap() { handleHistoryInit={handleHistoryInit} /> */} - {/* */} - {/* */} {/* */} diff --git a/src/components/map/mapbox/dron/DronToast.js b/src/components/map/mapbox/dron/DronToast.js index ecbe155..6f86c63 100644 --- a/src/components/map/mapbox/dron/DronToast.js +++ b/src/components/map/mapbox/dron/DronToast.js @@ -9,6 +9,8 @@ import { controlGpDtlAction, controlGpFlightPlanAction } from '../../../../modules/control/gp'; +import Avatar from '../../../../@core/components/avatar'; +import { Info } from 'react-feather'; export default function DronToast() { const dispatch = useDispatch(); @@ -25,7 +27,7 @@ export default function DronToast() { if (!toastId) { for (let i = 0; i < controlGpArcrftWarnList.length; i++) { if (controlGpArcrftWarnList[i].controlWarnCd) { - const id = toast.info( + const id = toast.warning( toastRender( `${controlGpArcrftWarnList[i].idntfNum} 비정상 상황 알림`, `경로 상에 비행 구역을 이탈했습니다.` @@ -73,8 +75,11 @@ export default function DronToast() {
- } /> -
+ } /> +
{title}
@@ -88,6 +93,4 @@ export default function DronToast() { }; return null; - - return
DronToast
; }