diff --git a/src/components/map/naver/NaverMap.js b/src/components/map/naver/NaverMap.js
index 716b57d..8dbe69d 100644
--- a/src/components/map/naver/NaverMap.js
+++ b/src/components/map/naver/NaverMap.js
@@ -32,9 +32,7 @@ export const NaverCustomMap = () => {
NaverMapInit();
dispatch(controlGroupAuthAction.request());
}, []);
-
- useEffect(() => {
- }, [mapObject]);
+
const NaverMapInit = () => {
const mapOptions = {
@@ -80,8 +78,8 @@ export const NaverCustomMap = () => {
/>
-
-
+ {/* */}
+ {/* */}
>
) : null}
diff --git a/src/components/map/naver/dron/DronHistory.js b/src/components/map/naver/dron/DronHistory.js
index 3a46316..81b008e 100644
--- a/src/components/map/naver/dron/DronHistory.js
+++ b/src/components/map/naver/dron/DronHistory.js
@@ -14,9 +14,7 @@ export const DronHistory = props => {
const dispatch = useDispatch();
- useEffect(() => {
- // console.log('>>>', controlGpHistory);
- // polylineRemove();
+ useEffect(() => {
polylineInit();
}, [controlGpHistory]);
diff --git a/src/components/map/naver/dron/DronMarker.js b/src/components/map/naver/dron/DronMarker.js
index 9cc3885..e6e78c2 100644
--- a/src/components/map/naver/dron/DronMarker.js
+++ b/src/components/map/naver/dron/DronMarker.js
@@ -39,8 +39,8 @@ export const DronMarker = props => {
- , {
+ />,
+ {
autoClose: 3000,
hideProgressBar: true,
position: toast.POSITION.BOTTOM_RIGHT,
diff --git a/src/components/map/naver/search/NaverMapSearch.js b/src/components/map/naver/search/NaverMapSearch.js
index b152932..9998513 100644
--- a/src/components/map/naver/search/NaverMapSearch.js
+++ b/src/components/map/naver/search/NaverMapSearch.js
@@ -14,7 +14,7 @@ export const NaverMapSearch = props => {
var result = response.result, // 검색 결과의 컨테이너
items = result.items; // 검색 결과의 배열
- console.log(result);
+ // console.log(result);
// do Something
}
diff --git a/src/modules/control/gp/sagas/controlGpSaga.ts b/src/modules/control/gp/sagas/controlGpSaga.ts
index eb33d06..0fa2f7c 100644
--- a/src/modules/control/gp/sagas/controlGpSaga.ts
+++ b/src/modules/control/gp/sagas/controlGpSaga.ts
@@ -14,8 +14,7 @@ function* getControlGpSaga(
const data = action.payload;
const state = yield select();
const { objectId, isClickObject } = state.controlMapReducer;
- const { controlGroupAuthInfo } = state.controlGroupAuthState;
- const { controlGpFltPlanList } = state.controlGpFltPlanState;
+ const { controlGroupAuthInfo } = state.controlGroupAuthState;
const { controlGpHistory } = state.controlGpHisState;
let gpsData: ControlGpData[] = [];
@@ -38,7 +37,7 @@ function* getControlGpSaga(
yield put(
Actions.controlGpAction.success({
- controlGpList: data
+ controlGpList: gpsData
})
);
diff --git a/src/views/control/setting/ControlSetting.js b/src/views/control/setting/ControlSetting.js
index ae80e35..8cdad51 100644
--- a/src/views/control/setting/ControlSetting.js
+++ b/src/views/control/setting/ControlSetting.js
@@ -5,544 +5,274 @@ import { CgTrees } from 'react-icons/cg';
import { VscRadioTower } from 'react-icons/vsc';
import { useDispatch, useSelector } from 'react-redux';
import {
- Button,
- InputGroup,
- ButtonGroup,
- InputGroupAddon,
- Input,
- CustomInput
+ Button,
+ InputGroup,
+ ButtonGroup,
+ InputGroupAddon,
+ Input,
+ CustomInput
} from 'reactstrap';
import {
- areaClickAction, environmentClickAction,
- mapTypeChangeAction, sensorClickAction
+ areaClickAction, environmentClickAction,
+ mapTypeChangeAction, sensorClickAction
} from '../../../modules/control/map/actions/controlMapActions';
const ControlSetting = props => {
- const dispatch = useDispatch();
+ const dispatch = useDispatch();
- const mapControl = useSelector(state => state.controlMapReducer);
+ const mapControl = useSelector(state => state.controlMapReducer);
- // console.log('111111111111111');
- // useEffect(() => {
- // console.log('111111111111111');
- // }, []);
- useEffect(() => {
- console.log('>>>>', mapControl);
- }, [mapControl]);
+ const handlerMapType = val => {
+ dispatch(mapTypeChangeAction(val));
+ };
- const handlerMapType = val => {
- dispatch(mapTypeChangeAction(val));
- };
+ const handlerAreaClick = val => {
+ dispatch(areaClickAction(val));
+ };
- const handlerAreaClick = val => {
- dispatch(areaClickAction(val));
- };
+ const handlerSensorClick = (val, isChecked) => {
+ if (isChecked) {
+ dispatch(sensorClickAction(val));
+ } else {
+ dispatch(sensorClickAction(''));
+ }
+ };
- const handlerSensorClick = (val, isChecked) => {
- if(isChecked){
- dispatch(sensorClickAction(val));
- } else {
- dispatch(sensorClickAction(''));
- }
- };
-
- return (
-
-
-
-
지도유형
- {/* */}
-
-
-
-
-
-
-
-
-
- {/*
-
-
지역검색
-
-
-
-
-
-
-
-
-
-
-
드론 중량
-
-
-
-
- -
-
전체
-
- console.log(1111)}
- className='custom-control-primary'
- type='switch'
- id='test11'
- name='test02'
- inline
- />
-
-
- -
-
250g 이하
-
-
-
-
- -
-
250g 초과~2kg 이하
-
-
-
-
- -
-
2kg 초과~7kg 이하
-
-
-
-
- -
-
7kg 초과~25kg 이하
-
-
-
-
- -
-
25kg 초과~150kg 이하
-
-
-
-
-
-
-
-
-
-
-
드론 상태
-
-
-
-
- -
-
전체
-
-
-
-
- -
-
Arming
-
-
-
-
- -
-
Landing
-
-
-
-
- -
-
Take off
-
-
-
-
- -
-
Flight
-
-
-
-
-
-
-
-
*/}
-
-
-
공역 표출 정보
-
-
-
-
- -
-
- 비행금지구역
-
-
- handlerAreaClick('0001')}
- className='custom-control-primary'
- type='switch'
- id='test01'
- name='test01'
- inline
- defaultChecked={mapControl.area0001}
- />
-
-
- -
-
- 비행제한구역
-
-
- handlerAreaClick('0002')}
- className='custom-control-primary'
- type='switch'
- id='test02'
- name='test02'
- inline
- defaultChecked={mapControl.area0002}
- />
-
-
- -
-
- 관제권(공항)
-
-
- handlerAreaClick('0003')}
- className='custom-control-primary'
- type='switch'
- id='test03'
- name='test03'
- inline
- defaultChecked={mapControl.area0003}
- />
-
-
- -
-
- 비행장(군사)
-
-
- handlerAreaClick('0004')}
- className='custom-control-primary'
- type='switch'
- id='test04'
- name='test04'
- inline
- defaultChecked={mapControl.area0004}
- />
-
-
- -
-
- 이착륙장
-
-
- handlerAreaClick('0005')}
- className='custom-control-primary'
- type='switch'
- id='test05'
- name='test05'
- inline
- defaultChecked={mapControl.area0005}
- />
-
-
- -
-
-
- 초경량비행장치공역
-
-
- handlerAreaClick('0006')}
- className='custom-control-primary'
- type='switch'
- id='test06'
- name='test06'
- inline
- defaultChecked={mapControl.area0006}
- />
-
-
-
-
-
-
- {/*
-
-
장애물 표출 정보
-
-
-
-
- -
-
-
- 전체장애물
-
-
-
-
-
- -
-
-
- 고층 건물
-
-
-
-
-
- -
-
-
- 송전탑
-
-
-
-
-
- -
-
-
- 국립공원
-
-
-
-
-
-
-
-
-
-
*/}
-
-
-
환경지표
-
-
-
-
- -
-
- 미세먼지(DUST)
-
-
- handlerSensorClick('dust', e.target.checked)}
- className='custom-control-primary'
- type='switch'
- id='sensorDust'
- name='sensorDust'
- inline
- checked={mapControl.sensor === 'dust'}
- // defaultChecked={mapControl.sensor === 'dust'}
- />
-
-
- -
-
- 오존(O3)
-
-
- handlerSensorClick('o3', e.target.checked)}
- className='custom-control-primary'
- type='switch'
- id='sensorO3'
- name='sensorO3'
- inline
- checked={mapControl.sensor === 'o3'}
- // defaultChecked={mapControl.sensor === 'o3'}
- />
-
-
- -
-
- 이산화질소(No2)
-
-
- handlerSensorClick('no2', e.target.checked)}
- className='custom-control-primary'
- type='switch'
- id='sensorNo2'
- name='sensorNo2'
- inline
- checked={mapControl.sensor === 'no2'}
- // defaultChecked={mapControl.sensor === 'no2'}
- />
-
-
- -
-
- 일산화탄소(Co)
-
-
- handlerSensorClick('co', e.target.checked)}
- className='custom-control-primary'
- type='switch'
- id='sensorCo'
- name='sensorCo'
- inline
- checked={mapControl.sensor === 'co'}
- // defaultChecked={mapControl.sensor === 'co'}
- />
-
-
- -
-
- 아황산가스(So2)
-
-
- handlerSensorClick('so2', e.target.checked)}
- className='custom-control-primary'
- type='switch'
- id='sensorSo2'
- name='sensorSo2'
- inline
- checked={mapControl.sensor === 'so2'}
- // defaultChecked={mapControl.sensor === 'so2'}
- />
-
-
-
-
+ return (
+
+
+
+
지도유형
+ {/* */}
+
+
+
+
+
+
+
+
+
+
+
+
공역 표출 정보
+
+
+
+
+ -
+
+ 비행금지구역
+
+
+ handlerAreaClick('0001')}
+ className='custom-control-primary'
+ type='switch'
+ id='test01'
+ name='test01'
+ inline
+ defaultChecked={mapControl.area0001}
+ />
+
+
+ -
+
+ 비행제한구역
+
+
+ handlerAreaClick('0002')}
+ className='custom-control-primary'
+ type='switch'
+ id='test02'
+ name='test02'
+ inline
+ defaultChecked={mapControl.area0002}
+ />
+
+
+ -
+
+ 관제권(공항)
+
+
+ handlerAreaClick('0003')}
+ className='custom-control-primary'
+ type='switch'
+ id='test03'
+ name='test03'
+ inline
+ defaultChecked={mapControl.area0003}
+ />
+
+
+ -
+
+ 비행장(군사)
+
+
+ handlerAreaClick('0004')}
+ className='custom-control-primary'
+ type='switch'
+ id='test04'
+ name='test04'
+ inline
+ defaultChecked={mapControl.area0004}
+ />
+
+
+ -
+
+ 이착륙장
+
+
+ handlerAreaClick('0005')}
+ className='custom-control-primary'
+ type='switch'
+ id='test05'
+ name='test05'
+ inline
+ defaultChecked={mapControl.area0005}
+ />
+
+
+ -
+
+
+ 초경량비행장치공역
+
+
+ handlerAreaClick('0006')}
+ className='custom-control-primary'
+ type='switch'
+ id='test06'
+ name='test06'
+ inline
+ defaultChecked={mapControl.area0006}
+ />
+
+
+
+
+
+
+ {/*
+
+
환경지표
+
+
+
+
+ -
+
+ 미세먼지(DUST)
+
+
+ handlerSensorClick('dust', e.target.checked)}
+ className='custom-control-primary'
+ type='switch'
+ id='sensorDust'
+ name='sensorDust'
+ inline
+ checked={mapControl.sensor === 'dust'}
+ // defaultChecked={mapControl.sensor === 'dust'}
+ />
+
+
+ -
+
+ 오존(O3)
+
+
+ handlerSensorClick('o3', e.target.checked)}
+ className='custom-control-primary'
+ type='switch'
+ id='sensorO3'
+ name='sensorO3'
+ inline
+ checked={mapControl.sensor === 'o3'}
+ // defaultChecked={mapControl.sensor === 'o3'}
+ />
+
+
+ -
+
+ 이산화질소(No2)
+
+
+ handlerSensorClick('no2', e.target.checked)}
+ className='custom-control-primary'
+ type='switch'
+ id='sensorNo2'
+ name='sensorNo2'
+ inline
+ checked={mapControl.sensor === 'no2'}
+ // defaultChecked={mapControl.sensor === 'no2'}
+ />
+
+
+ -
+
+ 일산화탄소(Co)
+
+
+ handlerSensorClick('co', e.target.checked)}
+ className='custom-control-primary'
+ type='switch'
+ id='sensorCo'
+ name='sensorCo'
+ inline
+ checked={mapControl.sensor === 'co'}
+ // defaultChecked={mapControl.sensor === 'co'}
+ />
+
+
+ -
+
+ 아황산가스(So2)
+
+
+ handlerSensorClick('so2', e.target.checked)}
+ className='custom-control-primary'
+ type='switch'
+ id='sensorSo2'
+ name='sensorSo2'
+ inline
+ checked={mapControl.sensor === 'so2'}
+ // defaultChecked={mapControl.sensor === 'so2'}
+ />
+
+
+
+
+
+
*/}
-
-
- );
+ );
};
export default ControlSetting;