공역파일 정리

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 => {
   // 지도

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(() =>

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';
 

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)초경량비행장치공역

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
             ]
           };

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
       ]
     };
 

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

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