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
; }