From 1b2e8e13fa5bf4d67891d1bfb535db4e4765f0d9 Mon Sep 17 00:00:00 2001
From: JANGHYUNn <kimjh2369@gmail.com>
Date: Mon, 4 Dec 2023 10:25:57 +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=EC=8B=9C=EC=8A=A4=ED=85=9C=20=EA=B2=BD=EB=A1=9C=20?=
 =?UTF-8?q?=EC=9D=B4=ED=83=88=20=EA=B8=B0=EC=B2=B4=20=EB=A7=88=EC=BB=A4=20?=
 =?UTF-8?q?=EC=83=89=EC=83=81=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20=EB=B6=88?=
 =?UTF-8?q?=ED=95=84=EC=9A=94=ED=95=9C=20import=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/map/MapControl.js             |  9 +--------
 src/components/map/mapbox/dron/DronMarker.js | 18 ++++++------------
 src/components/websocket/WebsocketClient.js  |  2 +-
 src/views/control/index.js                   |  3 ---
 src/views/control/main/ControlMain.js        |  3 +--
 5 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/src/components/map/MapControl.js b/src/components/map/MapControl.js
index 993c7138..1aa4318a 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' ? <GoogleCustomMap /> : <NaverCustomMap />}</>
-    // <NaverCustomMap />
-    <MapBoxMap />
-  );
+  return <MapBoxMap />;
 };
diff --git a/src/components/map/mapbox/dron/DronMarker.js b/src/components/map/mapbox/dron/DronMarker.js
index 8e82b725..b4450e2c 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: `<img ${getIcon.content.substr(
-        //     getIcon.content.indexOf('src'),
-        //     getIcon.content.indexOf('alt') - 6
-        //   )} alt="" style="transform: rotate(${
-        //     gps.heading
-        //   }deg); filter: invert(16%) sepia(79%) saturate(4975%) hue-rotate(359deg) brightness(104%) contrast(129%)" />`,
-        //   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 24cd1b17..6867db33 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 cd5cb897..82822558 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 = () => {
       <div className='map'>
         <MapControl />
       </div>
-
       <ControlMain />
     </div>
   );
diff --git a/src/views/control/main/ControlMain.js b/src/views/control/main/ControlMain.js
index e35f4600..24fd6401 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';