diff --git a/src/components/map/MapControl.js b/src/components/map/MapControl.js index 993c713..1aa4318 100644 --- a/src/components/map/MapControl.js +++ b/src/components/map/MapControl.js @@ -1,12 +1,5 @@ -import React from 'react'; -import { GoogleCustomMap } from './google/GoogleMap'; -import { NaverCustomMap } from './naver/NaverMap'; import MapBoxMap from './mapbox/MapBoxMap'; export const MapControl = props => { - return ( - // <>{props.mapType === 'google' ? : } - // - - ); + return ; }; diff --git a/src/components/map/mapbox/dron/DronMarker.js b/src/components/map/mapbox/dron/DronMarker.js index 8e82b72..b4450e2 100644 --- a/src/components/map/mapbox/dron/DronMarker.js +++ b/src/components/map/mapbox/dron/DronMarker.js @@ -304,32 +304,26 @@ export const DronMarker = props => { //마커에 위치를 이동한다. const moveMarkers = (marker, position, gps) => { - const getIcon = marker.icon; - marker.setLngLat(position); const warnList = controlGpArcrftWarnList?.filter( i => i.cntrlId === gps.controlId ); if (warnList?.length > 0) { + const el = document.getElementById(marker.id); if (warnList[0].controlWarnCd) { - // marker.setIcon({ - // content: ``, - // anchor: getIcon.anchor - // }); + el.style.filter = + 'invert(16%) sepia(79%) saturate(4975%) hue-rotate(359deg) brightness(104%) contrast(129%)'; + marker.setRotation(gps.heading); } else { + el.style.filter = ''; marker.setRotation(gps.heading); } return; } marker.setRotation(gps.heading); }; - // + const moveInfos = (info, position, item, idx) => { if (info) { info.setLngLat([position.lng, position.lat]); diff --git a/src/components/websocket/WebsocketClient.js b/src/components/websocket/WebsocketClient.js index 24cd1b1..6867db3 100644 --- a/src/components/websocket/WebsocketClient.js +++ b/src/components/websocket/WebsocketClient.js @@ -33,7 +33,7 @@ const WebsocketClient = () => { websocket.current.onmessage = e => { const data = e.data; const controlGpList = JSON.parse(data); - console.log(data); + dispatch(Actions.controlGpAction.request(controlGpList)); }; diff --git a/src/views/control/index.js b/src/views/control/index.js index cd5cb89..8282255 100644 --- a/src/views/control/index.js +++ b/src/views/control/index.js @@ -1,6 +1,4 @@ -import React, { useEffect, useState } from 'react'; import { MapControl } from '../../components/map/MapControl'; -// import { WebsocketClient } from '../../components/websocket/WebsocketClient'; import ControlMain from './main/ControlMain'; const ControlView = () => { @@ -9,7 +7,6 @@ const ControlView = () => {
- ); diff --git a/src/views/control/main/ControlMain.js b/src/views/control/main/ControlMain.js index e35f460..24fd640 100644 --- a/src/views/control/main/ControlMain.js +++ b/src/views/control/main/ControlMain.js @@ -15,14 +15,13 @@ import { Grid } from 'react-feather'; -import { AiOutlinePoweroff, AiOutlineExclamation } from 'react-icons/ai'; +import { AiOutlinePoweroff } from 'react-icons/ai'; import { IoAlertOutline } from 'react-icons/io5'; import { ReactComponent as DroneMenuIcon } from '../../../assets/images/drone_menu_icon.svg'; import { Card } from 'reactstrap'; import ControlAlarmNotice from '../alarm/ControlAlarmNotice'; import ControlReportList from '../report/ControlReportList'; import ControlReportDetail from '../report/ControlReportDetail'; -import WeatherList from '../weather/WeatherList'; import ControlAlarmList from '../alarm/ControlAlarmList'; import ControlSetting from '../setting/ControlSetting'; import WebsocketClient from '../../../components/websocket/WebsocketClient';