diff --git a/src/components/map/mapbox/MapBoxMap.js b/src/components/map/mapbox/MapBoxMap.js
index b57a323..ec7d967 100644
--- a/src/components/map/mapbox/MapBoxMap.js
+++ b/src/components/map/mapbox/MapBoxMap.js
@@ -362,7 +362,7 @@ export default function MapBoxMap() {
const labelLayerId = layers.find(
layer => layer.type === 'symbol' && layer.layout['text-field']
).id;
-
+ console.log('?@?@?@');
// 지형 3d start
map.addSource('mapbox-dem', {
type: 'raster-dem',
diff --git a/src/views/control/main/ControlMain.js b/src/views/control/main/ControlMain.js
index 2cac9ef..d40740d 100644
--- a/src/views/control/main/ControlMain.js
+++ b/src/views/control/main/ControlMain.js
@@ -1,9 +1,7 @@
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
import { useHistory } from 'react-router-dom';
import '../../../assets/css/custom.css';
import logo from '../../../assets/images/logo/kac_logo_ icon.svg';
-import tp_logo from '../../../assets/images/tplogo_wh.png';
-import kac_logo from '../../../assets/images/kac_logo_wh.png';
import {
Sun,
@@ -183,16 +181,7 @@ const ControlMain = () => {
- {/*
-
- */}
- {/*
-
- */}
+
- {/* -
-
-
- -
-
-
- -
-
-
*/}
- {/* -
-
-
- -
-
-
*/}
-
{
*/}
-
-
-
- LAANC 시스템
-
-
-
- history.push('laanc')}>
- 승인요청 바로가기
-
-
- {/*
- handlerDrawType('RESET')}>초기화
-
*/}
-
-
-
{oepnReportList ? (
{
const dispatch = useDispatch();
-
+ const history = useHistory();
const mapControl = useSelector(state => state.controlMapReducer);
const handlerMapType = val => {
if (val === mapControl.mapType) return;
- if (val === 'NORMAL') {
- mapControl.map.setStyle('mapbox://styles/mapbox/streets-v12');
- mapControl.map.removeSource('mapbox-dem');
- } else if (val === 'TERRAIN') {
- // props.map.setMapTypeId(naver.maps.MapTypeId.TERRAIN);
+ if (val === 'TERRAIN') {
+ mapControl.map.setTerrain({
+ source: 'mapbox-dem',
+ exaggeration: 1
+ });
+ mapControl.map.setMaxPitch(85);
+ mapControl.map.dragRotate.enable();
+ } else if (val === 'NORMAL') {
+ mapControl.map.setTerrain();
+ mapControl.map.setMaxPitch(85);
+ mapControl.map.dragRotate.enable();
} else if (val === '2D') {
- mapControl.map.setStyle('mapbox://styles/mapbox/satellite-streets-v11');
+ console.log(mapControl.map);
+ mapControl.map.setMaxPitch(0);
+ mapControl.map.setBearing(0);
+ mapControl.map.dragRotate.disable();
}
dispatch(mapTypeChangeAction(val));
};
@@ -193,18 +188,53 @@ const ControlSetting = props => {
LAANC 신청하기
- 승인요청 바로가기
+
{/*
diff --git a/src/views/laanc/LaancView.js b/src/views/laanc/LaancView.js
index 7e10690..2bc0a81 100644
--- a/src/views/laanc/LaancView.js
+++ b/src/views/laanc/LaancView.js
@@ -2,7 +2,7 @@ import '@styles/react/libs/flatpickr/flatpickr.scss';
import '@styles/react/libs/tables/react-dataTable-component.scss';
import React from 'react';
import LaancContainer from '../../containers/basis/flight/laanc/LaancContainer';
-
+import '../../assets/css/custom.css';
const LaancView = props => {
return ;
};