From 79d079f492c4b1ac5cb828681a0ff6869cd2bee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?junh=5Feee=28=EC=9D=B4=EC=A4=80=ED=9D=AC=29?= Date: Wed, 11 Sep 2024 15:31:13 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B3=B5=EC=97=AD=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simulation/AnalysisSimulationMap.js | 2 +- src/components/laanc/map/LaancMap.js | 2 +- src/components/laanc/map/LaancMapDetail.js | 2 +- .../geojson/{ => airport}/airportAirArea.json | 0 .../flatGimpoAirportAirArea.json | 0 .../{ => airport}/flatJejuAirport.json | 0 .../{ => airport}/flatUlsanAirArea.json | 0 .../{ => airport}/gimpoAirportAirArea.json | 0 .../geojson/{ => airport}/jejuAirArea.json | 0 .../geojson/{ => airport}/ulsanAirArea.json | 0 .../geojson/{ => basis}/_aerodromeArea.json | 0 .../geojson/{ => basis}/_airFieldArea.json | 0 .../map/geojson/{ => basis}/_controlArea.json | 0 .../geojson/{ => basis}/_prohibitedArea.json | 0 .../geojson/{ => basis}/_restrictedArea.json | 0 .../{ => basis}/_ultraLightVehicleArea.json | 0 .../geojson/{_AirArea.js => basis/index.js} | 2 +- src/components/map/mapbox/MapBoxMap.js | 34 +++++++++++-------- .../map/mapbox/feature/FeatureAirZone.js | 7 ++-- src/utility/MapUtils.js | 13 ++++--- src/views/control/setting/ControlSetting.js | 16 ++++----- 21 files changed, 39 insertions(+), 39 deletions(-) rename src/components/map/geojson/{ => airport}/airportAirArea.json (100%) rename src/components/map/geojson/{ => airport}/flatGimpoAirportAirArea.json (100%) rename src/components/map/geojson/{ => airport}/flatJejuAirport.json (100%) rename src/components/map/geojson/{ => airport}/flatUlsanAirArea.json (100%) rename src/components/map/geojson/{ => airport}/gimpoAirportAirArea.json (100%) rename src/components/map/geojson/{ => airport}/jejuAirArea.json (100%) rename src/components/map/geojson/{ => airport}/ulsanAirArea.json (100%) rename src/components/map/geojson/{ => basis}/_aerodromeArea.json (100%) rename src/components/map/geojson/{ => basis}/_airFieldArea.json (100%) rename src/components/map/geojson/{ => basis}/_controlArea.json (100%) rename src/components/map/geojson/{ => basis}/_prohibitedArea.json (100%) rename src/components/map/geojson/{ => basis}/_restrictedArea.json (100%) rename src/components/map/geojson/{ => basis}/_ultraLightVehicleArea.json (100%) rename src/components/map/geojson/{_AirArea.js => basis/index.js} (96%) diff --git a/src/components/analysis/simulation/AnalysisSimulationMap.js b/src/components/analysis/simulation/AnalysisSimulationMap.js index d6fbd521..a05895a0 100644 --- a/src/components/analysis/simulation/AnalysisSimulationMap.js +++ b/src/components/analysis/simulation/AnalysisSimulationMap.js @@ -6,7 +6,7 @@ import mapboxgl from 'mapbox-gl'; import 'mapbox-gl/dist/mapbox-gl.css'; import { Threebox } from 'threebox-plugin'; -import gimPo from '../../map/geojson/gimpoAirportAirArea.json'; +import gimPo from '../../map/geojson/airport/gimpoAirportAirArea.json'; export const AnalysisSimulationMap = props => { // 지도 diff --git a/src/components/laanc/map/LaancMap.js b/src/components/laanc/map/LaancMap.js index 2ad07d6a..3d1919fe 100644 --- a/src/components/laanc/map/LaancMap.js +++ b/src/components/laanc/map/LaancMap.js @@ -24,7 +24,7 @@ import { import { clientMapInit } from '@src/redux/features/control/map/mapSlice'; import { clientSetIsMapLoading } from '@src/redux/features/laanc/laancSlice'; // geojson -import gimpo from '../../map/geojson/gimpoAirportAirArea.json'; +import gimpo from '../../map/geojson/airport/gimpoAirportAirArea.json'; // components import LaancMapModal from './LaancMapModal'; const FeatureAirZone = lazy(() => diff --git a/src/components/laanc/map/LaancMapDetail.js b/src/components/laanc/map/LaancMapDetail.js index 12bda87b..600b75ba 100644 --- a/src/components/laanc/map/LaancMapDetail.js +++ b/src/components/laanc/map/LaancMapDetail.js @@ -17,7 +17,7 @@ import { handlerGetCircleCoord, handlerCreateAirSpace } from '../../../utility/MapUtils'; -import gimpo from '../../map/geojson/gimpoAirportAirArea.json'; +import gimpo from '../../map/geojson/airport/gimpoAirportAirArea.json'; import { openModal } from '@src/redux/features/comn/message/messageSlice'; import { ERROR_TITLE } from '@src/configs/msgConst'; diff --git a/src/components/map/geojson/airportAirArea.json b/src/components/map/geojson/airport/airportAirArea.json similarity index 100% rename from src/components/map/geojson/airportAirArea.json rename to src/components/map/geojson/airport/airportAirArea.json diff --git a/src/components/map/geojson/flatGimpoAirportAirArea.json b/src/components/map/geojson/airport/flatGimpoAirportAirArea.json similarity index 100% rename from src/components/map/geojson/flatGimpoAirportAirArea.json rename to src/components/map/geojson/airport/flatGimpoAirportAirArea.json diff --git a/src/components/map/geojson/flatJejuAirport.json b/src/components/map/geojson/airport/flatJejuAirport.json similarity index 100% rename from src/components/map/geojson/flatJejuAirport.json rename to src/components/map/geojson/airport/flatJejuAirport.json diff --git a/src/components/map/geojson/flatUlsanAirArea.json b/src/components/map/geojson/airport/flatUlsanAirArea.json similarity index 100% rename from src/components/map/geojson/flatUlsanAirArea.json rename to src/components/map/geojson/airport/flatUlsanAirArea.json diff --git a/src/components/map/geojson/gimpoAirportAirArea.json b/src/components/map/geojson/airport/gimpoAirportAirArea.json similarity index 100% rename from src/components/map/geojson/gimpoAirportAirArea.json rename to src/components/map/geojson/airport/gimpoAirportAirArea.json diff --git a/src/components/map/geojson/jejuAirArea.json b/src/components/map/geojson/airport/jejuAirArea.json similarity index 100% rename from src/components/map/geojson/jejuAirArea.json rename to src/components/map/geojson/airport/jejuAirArea.json diff --git a/src/components/map/geojson/ulsanAirArea.json b/src/components/map/geojson/airport/ulsanAirArea.json similarity index 100% rename from src/components/map/geojson/ulsanAirArea.json rename to src/components/map/geojson/airport/ulsanAirArea.json diff --git a/src/components/map/geojson/_aerodromeArea.json b/src/components/map/geojson/basis/_aerodromeArea.json similarity index 100% rename from src/components/map/geojson/_aerodromeArea.json rename to src/components/map/geojson/basis/_aerodromeArea.json diff --git a/src/components/map/geojson/_airFieldArea.json b/src/components/map/geojson/basis/_airFieldArea.json similarity index 100% rename from src/components/map/geojson/_airFieldArea.json rename to src/components/map/geojson/basis/_airFieldArea.json diff --git a/src/components/map/geojson/_controlArea.json b/src/components/map/geojson/basis/_controlArea.json similarity index 100% rename from src/components/map/geojson/_controlArea.json rename to src/components/map/geojson/basis/_controlArea.json diff --git a/src/components/map/geojson/_prohibitedArea.json b/src/components/map/geojson/basis/_prohibitedArea.json similarity index 100% rename from src/components/map/geojson/_prohibitedArea.json rename to src/components/map/geojson/basis/_prohibitedArea.json diff --git a/src/components/map/geojson/_restrictedArea.json b/src/components/map/geojson/basis/_restrictedArea.json similarity index 100% rename from src/components/map/geojson/_restrictedArea.json rename to src/components/map/geojson/basis/_restrictedArea.json diff --git a/src/components/map/geojson/_ultraLightVehicleArea.json b/src/components/map/geojson/basis/_ultraLightVehicleArea.json similarity index 100% rename from src/components/map/geojson/_ultraLightVehicleArea.json rename to src/components/map/geojson/basis/_ultraLightVehicleArea.json diff --git a/src/components/map/geojson/_AirArea.js b/src/components/map/geojson/basis/index.js similarity index 96% rename from src/components/map/geojson/_AirArea.js rename to src/components/map/geojson/basis/index.js index f38f6265..a8dff363 100644 --- a/src/components/map/geojson/_AirArea.js +++ b/src/components/map/geojson/basis/index.js @@ -5,7 +5,7 @@ import aerodromeArea from './_aerodromeArea.json'; import airFieldArea from './_airFieldArea.json'; import ultraLightVehicleArea from './_ultraLightVehicleArea.json'; -export const airArea = { +export const basisArea = { type: 'FeatureCollection', features: [ ...ultraLightVehicleArea.features, // (UA)초경량비행장치공역 diff --git a/src/components/map/mapbox/MapBoxMap.js b/src/components/map/mapbox/MapBoxMap.js index 01d2421b..0fc07d7c 100644 --- a/src/components/map/mapbox/MapBoxMap.js +++ b/src/components/map/mapbox/MapBoxMap.js @@ -28,25 +28,25 @@ import { DronPlan } from './dron/DronPlan'; import FeatureAirZone from './feature/FeatureAirZone'; // v월드 공역 -import { airArea } from '../geojson/_AirArea'; +import { basisArea } from '../geojson/basis'; // 김포 격자 공역 -import gimPoGrid from '../../../components/map/geojson/airportAirArea.json'; +import gimPoGrid from '../../../components/map/geojson/airport/airportAirArea.json'; // 3d 공역 -import gimPo from '../../map/geojson/gimpoAirportAirArea.json'; -import ulsan from '../../map/geojson/ulsanAirArea.json'; -import jeju from '../../map/geojson/jejuAirArea.json'; +import gimPo from '../../map/geojson/airport/gimpoAirportAirArea.json'; +import ulsan from '../../map/geojson/airport/ulsanAirArea.json'; +import jeju from '../../map/geojson/airport/jejuAirArea.json'; // 선형(flat) 공역 -import flatGimpo from '../../map/geojson/flatGimpoAirportAirArea.json'; -import flatUlsan from '../../map/geojson/flatUlsanAirArea.json'; -import flatJeju from '../../map/geojson/flatJejuAirport.json'; +import flatGimpo from '../../map/geojson/airport/flatGimpoAirportAirArea.json'; +import flatUlsan from '../../map/geojson/airport/flatUlsanAirArea.json'; +import flatJeju from '../../map/geojson/airport/flatJejuAirport.json'; import { clientMapInit } from '@src/redux/features/control/map/mapSlice'; import { getDraw } from '@src/utility/MapUtils'; -// import { AreaBufferList } from '@src/redux/features/laanc/laancThunk'; +// import { handlerCoordTest } from '@src/utility/airAreaUtil'; let gridCoords = []; let altitudeMarker = []; @@ -112,6 +112,10 @@ export default function MapBoxMap({ handlerDrawObjInit }) { features: [] }); + // useEffect(() => { + // handlerCoordTest(); + // }, []); + // 지도 초기 셋팅 useLayoutEffect(() => { mapBoxMapInit(); @@ -129,13 +133,13 @@ export default function MapBoxMap({ handlerDrawObjInit }) { map, useGeoJson = { // ...geoJson, - ...airArea, + ...basisArea, ...flatGimpo, ...flatUlsan, // ...flatJeju, features: [ // ...geoJson.features, - ...airArea.features, + ...basisArea.features, ...flatGimpo.features, ...flatUlsan.features // ...flatJeju.features @@ -147,13 +151,13 @@ export default function MapBoxMap({ handlerDrawObjInit }) { mapState.areaType === 'linear' ? { // ...geoJson, - ...airArea, + ...basisArea, ...flatGimpo, ...flatUlsan, // ...flatJeju, features: [ // ...geoJson.features, - ...airArea.features, + ...basisArea.features, ...flatGimpo.features, ...flatUlsan.features // ...flatJeju.features @@ -161,11 +165,11 @@ export default function MapBoxMap({ handlerDrawObjInit }) { } : { // ...geoJson, - ...airArea, + ...basisArea, ...gimPoGrid, features: [ // ...geoJson.features, - ...airArea.features, + ...basisArea.features, ...gimPoGrid.features ] }; diff --git a/src/components/map/mapbox/feature/FeatureAirZone.js b/src/components/map/mapbox/feature/FeatureAirZone.js index 79c81285..0042de76 100644 --- a/src/components/map/mapbox/feature/FeatureAirZone.js +++ b/src/components/map/mapbox/feature/FeatureAirZone.js @@ -1,9 +1,8 @@ import '../../../../assets/css/custom.css'; import { useEffect } from 'react'; -import geoJson from '../../geojson/airArea.json'; // v월드 공역 -import { airArea } from '../../geojson/_AirArea'; +import { basisArea } from '../../geojson/basis'; import { useSelector } from '@src/redux/store'; import { airSquareLine } from './FeatureAirSquare'; @@ -181,10 +180,10 @@ export default function FeatureAirZone(props) { const featureAirZoneInit = () => { const useGeoJson = { // ...geoJson, - ...airArea, + ...basisArea, features: [ // ...geoJson.features - ...airArea.features + ...basisArea.features ] }; diff --git a/src/utility/MapUtils.js b/src/utility/MapUtils.js index 4b2caa76..d0de8702 100644 --- a/src/utility/MapUtils.js +++ b/src/utility/MapUtils.js @@ -11,12 +11,11 @@ import { import 'mapbox-gl/dist/mapbox-gl.css'; // v월드 공역 -import { airArea } from '../components/map/geojson/_AirArea'; +import { basisArea } from '../components/map/geojson/basis'; -import geoJson from '../components/map/geojson/airArea.json'; -import flatGimpo from '../components/map/geojson/flatGimpoAirportAirArea.json'; -import flatUlsan from '../components/map/geojson/flatUlsanAirArea.json'; -import flatJeju from '../components/map/geojson/flatJejuAirport.json'; +import flatGimpo from '../components/map/geojson/airport/flatGimpoAirportAirArea.json'; +import flatUlsan from '../components/map/geojson/airport/flatUlsanAirArea.json'; +import flatJeju from '../components/map/geojson/airport/flatJejuAirport.json'; /** * geojson Feature 형식으로 반환 @@ -333,13 +332,13 @@ export const handlerCreateAirSpace = ( mapControl, useGeoJson = { // ...geoJson, - ...airArea, + ...basisArea, ...flatGimpo, ...flatUlsan, // ...flatJeju, features: [ // ...geoJson.features, - ...airArea.features, + ...basisArea.features, ...flatGimpo.features, ...flatUlsan.features // ...flatJeju.features diff --git a/src/views/control/setting/ControlSetting.js b/src/views/control/setting/ControlSetting.js index e54dc0c6..89e79bea 100644 --- a/src/views/control/setting/ControlSetting.js +++ b/src/views/control/setting/ControlSetting.js @@ -12,16 +12,14 @@ import { import { clientDispatchTopMenu } from '@src/redux/features/layout/layoutSlice'; // v월드 공역 -import { airArea } from '../../../components/map/geojson/_AirArea'; +import { basisArea } from '../../../components/map/geojson/basis'; -import geoJson from '../../../components/map/geojson/airArea.json'; -import gimPo from '../../../components/map/geojson/gimpoAirportAirArea.json'; // 김포 격자 공역 -import gimPoGrid from '../../../components/map/geojson/airportAirArea.json'; +import gimPoGrid from '../../../components/map/geojson/airport/airportAirArea.json'; // 김포 선형 공역 -import flatGimpo from '../../../components/map/geojson/flatGimpoAirportAirArea.json'; -import flatUlsan from '../../../components/map/geojson/flatUlsanAirArea.json'; -import flatJeju from '../../../components/map/geojson/flatJejuAirport.json'; +import flatGimpo from '../../../components/map/geojson/airport/flatGimpoAirportAirArea.json'; +import flatUlsan from '../../../components/map/geojson/airport/flatUlsanAirArea.json'; +import flatJeju from '../../../components/map/geojson/airport/flatJejuAirport.json'; const ControlSetting = props => { const [setMapType] = useMapType(); @@ -40,13 +38,13 @@ const ControlSetting = props => { if (source) { const useGeoJson = { // ...geoJson, - ...airArea, + ...basisArea, ...flatGimpo, ...flatUlsan, // ...flatJeju, features: [ // ...geoJson.features, - ...airArea.features, + ...basisArea.features, ...flatGimpo.features, ...flatUlsan.features // ...flatJeju.features