diff --git a/src/components/map/geojson/airport/flatJejuAirport.json b/src/components/map/geojson/airport/flatJejuAirport.json
index 5fb271dd..b09f7be9 100644
--- a/src/components/map/geojson/airport/flatJejuAirport.json
+++ b/src/components/map/geojson/airport/flatJejuAirport.json
@@ -204,10 +204,10 @@
]
},
"properties": {
- "name": "금지",
+ "name": "",
"description": "",
"type": "0003",
- "divCd": "금지",
+ "divCd": "원추",
"airportNm": "제주"
}
},
@@ -348,7 +348,7 @@
"name": "최대 50m",
"description": "",
"type": "0003",
- "divCd": "금지",
+ "divCd": "원추",
"airportNm": "제주"
}
},
@@ -406,7 +406,7 @@
"name": "최대 60m",
"description": "",
"type": "0003",
- "divCd": "금지",
+ "divCd": "원추",
"airportNm": "제주"
}
}
diff --git a/src/components/map/geojson/airport/jejuAirArea.json b/src/components/map/geojson/airport/jejuAirArea.json
index 157b2810..0c6748f1 100644
--- a/src/components/map/geojson/airport/jejuAirArea.json
+++ b/src/components/map/geojson/airport/jejuAirArea.json
@@ -113,10 +113,10 @@
"styleUrl": "#line1",
"styleHash": "-1df1e618",
"description": "Unclassified Line Feature
ELEVATION = 57.86
ELEVATION = 57.86
KML_STYLE = line1
ELEVATION = 57.86",
- "stroke": "#FF3648",
+ "stroke": "#ff8040",
"stroke-opacity": 1,
"stroke-width": 2,
- "name": "금지(빨강)"
+ "name": ""
}
},
{
diff --git a/src/components/map/geojson/basis/_controlArea.json b/src/components/map/geojson/basis/_controlArea.json
index 335e4c6a..5ef7e825 100644
--- a/src/components/map/geojson/basis/_controlArea.json
+++ b/src/components/map/geojson/basis/_controlArea.json
@@ -1564,202 +1564,6 @@
"description": "",
"type": "0003"
}
- },
- {
- "type": "Feature",
- "geometry": {
- "type": "Polygon",
- "coordinates": [
- [
- [126.49302049999999, 33.59039132142311, 0],
- [126.49652058162755, 33.59034037989149, 0],
- [126.50001638656971, 33.590187617541375, 0],
- [126.50350364341215, 33.58993322103034, 0],
- [126.50697809127597, 33.58957750119874, 0],
- [126.51043548506864, 33.589120892686516, 0],
- [126.51387160071478, 33.58856395339761, 0],
- [126.5172822403602, 33.58790736381239, 0],
- [126.5206632375425, 33.58715192614909, 0],
- [126.52401046232163, 33.58629856337533, 0],
- [126.52731982636419, 33.58534831807094, 0],
- [126.53058728797429, 33.58430235114368, 0],
- [126.53380885706571, 33.58316194039911, 0],
- [126.53698060006784, 33.581928478966994, 0],
- [126.54009864476018, 33.580603473585704, 0],
- [126.54315918502891, 33.579188542747154, 0],
- [126.54615848553917, 33.577685414704426, 0],
- [126.5490928863181, 33.57609592534477, 0],
- [126.55195880724216, 33.5744220159305, 0],
- [126.55475275242301, 33.57266573071086, 0],
- [126.55747131448746, 33.57082921440762, 0],
- [126.560111178745, 33.56891470957784, 0],
- [126.56266912723858, 33.56692455385702, 0],
- [126.56514204267312, 33.564861177086, 0],
- [126.56752691221742, 33.56272709832555, 0],
- [126.56982083117447, 33.560524922761985, 0],
- [126.57202100651566, 33.558257338508106, 0],
- [126.57412476027481, 33.55592711330321, 0],
- [126.57612953279805, 33.55353709111648, 0],
- [126.57803288584508, 33.55109018865783, 0],
- [126.57983250553892, 33.54858939180082, 0],
- [126.58152620515982, 33.546037751921865, 0],
- [126.58311192778085, 33.543438382160524, 0],
- [126.58458774874148, 33.54079445360535, 0],
- [126.58595187795669, 33.53810919141017, 0],
- [126.58720266205871, 33.53538587084565, 0],
- [126.5883385863691, 33.532627813290844, 0],
- [126.58935827669922, 33.52983838217, 0],
- [126.59026050097637, 33.5270209788394, 0],
- [126.59104417069487, 33.524179038429466, 0],
- [126.59170834218978, 33.521316025647145, 0],
- [126.59225221773214, 33.51843543054392, 0],
- [126.59267514644503, 33.515540764254474, 0],
- [126.59297662503914, 33.51263555471136, 0],
- [126.59315629836732, 33.509723342340834, 0],
- [126.59321395979819, 33.50680767574528, 0],
- [126.59314955140785, 33.5038921073773, 0],
- [126.59296316399046, 33.500980189210985, 0],
- [126.59265503688769, 33.49807546841538, 0],
- [126.59222555763728, 33.495181483035644, 0],
- [126.59167526144195, 33.49230175768702, 0],
- [126.59100483045926, 33.48943979926686, 0],
- [126.59021509291357, 33.48659909268996, 0],
- [126.58930702203162, 33.48378309665219, 0],
- [126.58828173480302, 33.48099523942784, 0],
- [126.58714049056792, 33.47823891470537, 0],
- [126.58588468943306, 33.4755174774669, 0],
- [126.58451587051935, 33.47283423991618, 0],
- [126.58303571004225, 33.47019246746004, 0],
- [126.58144601922857, 33.46759537474809, 0],
- [126.57974874207153, 33.465046121775366, 0],
- [126.57794595292752, 33.46254781005271, 0],
- [126.57603985395761, 33.46010347884927, 0],
- [126.57403277241684, 33.457716101511735, 0],
- [126.5719271577949, 33.45538858186464, 0],
- [126.56972557881184, 33.45312375069598, 0],
- [126.56743072027234, 33.450924362332316, 0],
- [126.56504537978277, 33.4487930913075, 0],
- [126.56257246433478, 33.44673252912888, 0],
- [126.56001498675981, 33.44474518114478, 0],
- [126.55737606205882, 33.44283346351705, 0],
- [126.55465890361168, 33.44099970030218, 0],
- [126.55186681927076, 33.43924612064445, 0],
- [126.54900320734366, 33.437574856084375, 0],
- [126.54607155246953, 33.43598793798569, 0],
- [126.5430754213944, 33.43448729508376, 0],
- [126.54001845865007, 33.43307475115841, 0],
- [126.53690438214201, 33.431752022833884, 0],
- [126.53373697865167, 33.43052071750846, 0],
- [126.53052009925783, 33.42938233141609, 0],
- [126.52725765468338, 33.4283382478226, 0],
- [126.52395361057205, 33.427389735358084, 0],
- [126.52061198270147, 33.42653794648801, 0],
- [126.51723683213746, 33.42578391612426, 0],
- [126.51383226033576, 33.4251285603782, 0],
- [126.51040240419678, 33.42457267545686, 0],
- [126.50695143107885, 33.4241169367038, 0],
- [126.50348353377633, 33.42376189778553, 0],
- [126.50000292546788, 33.423507990024675, 0],
- [126.4965138346412, 33.42335552188039, 0],
- [126.49302049999999, 33.42330467857689, 0],
- [126.48952716535878, 33.42335552188039, 0],
- [126.4860380745321, 33.423507990024675, 0],
- [126.48255746622365, 33.42376189778553, 0],
- [126.47908956892114, 33.4241169367038, 0],
- [126.4756385958032, 33.42457267545686, 0],
- [126.47220873966423, 33.4251285603782, 0],
- [126.46880416786253, 33.42578391612426, 0],
- [126.46542901729852, 33.42653794648801, 0],
- [126.46208738942794, 33.427389735358084, 0],
- [126.4587833453166, 33.4283382478226, 0],
- [126.45552090074216, 33.42938233141609, 0],
- [126.45230402134831, 33.43052071750846, 0],
- [126.44913661785797, 33.431752022833884, 0],
- [126.44602254134992, 33.43307475115841, 0],
- [126.44296557860558, 33.43448729508376, 0],
- [126.43996944753046, 33.43598793798569, 0],
- [126.43703779265633, 33.437574856084375, 0],
- [126.43417418072923, 33.43924612064445, 0],
- [126.4313820963883, 33.44099970030218, 0],
- [126.42866493794115, 33.44283346351705, 0],
- [126.42602601324018, 33.44474518114478, 0],
- [126.4234685356652, 33.44673252912888, 0],
- [126.42099562021721, 33.4487930913075, 0],
- [126.41861027972764, 33.450924362332316, 0],
- [126.41631542118814, 33.45312375069598, 0],
- [126.41411384220508, 33.45538858186464, 0],
- [126.41200822758314, 33.457716101511735, 0],
- [126.41000114604238, 33.46010347884927, 0],
- [126.40809504707246, 33.46254781005271, 0],
- [126.40629225792846, 33.465046121775366, 0],
- [126.4045949807714, 33.46759537474809, 0],
- [126.40300528995773, 33.47019246746004, 0],
- [126.40152512948063, 33.47283423991618, 0],
- [126.40015631056693, 33.4755174774669, 0],
- [126.39890050943207, 33.47823891470537, 0],
- [126.39775926519695, 33.48099523942784, 0],
- [126.39673397796837, 33.48378309665219, 0],
- [126.39582590708642, 33.48659909268996, 0],
- [126.39503616954073, 33.48943979926686, 0],
- [126.39436573855804, 33.49230175768702, 0],
- [126.39381544236271, 33.495181483035644, 0],
- [126.3933859631123, 33.49807546841538, 0],
- [126.39307783600951, 33.500980189210985, 0],
- [126.39289144859214, 33.5038921073773, 0],
- [126.39282704020178, 33.50680767574528, 0],
- [126.39288470163265, 33.509723342340834, 0],
- [126.39306437496084, 33.51263555471136, 0],
- [126.39336585355495, 33.515540764254474, 0],
- [126.39378878226785, 33.51843543054392, 0],
- [126.39433265781021, 33.521316025647145, 0],
- [126.39499682930511, 33.524179038429466, 0],
- [126.39578049902362, 33.5270209788394, 0],
- [126.39668272330077, 33.52983838217, 0],
- [126.39770241363088, 33.532627813290844, 0],
- [126.39883833794127, 33.53538587084565, 0],
- [126.4000891220433, 33.53810919141017, 0],
- [126.4014532512585, 33.54079445360535, 0],
- [126.40292907221912, 33.543438382160524, 0],
- [126.40451479484017, 33.546037751921865, 0],
- [126.40620849446105, 33.54858939180082, 0],
- [126.4080081141549, 33.55109018865783, 0],
- [126.40991146720194, 33.55353709111648, 0],
- [126.41191623972517, 33.55592711330321, 0],
- [126.41401999348433, 33.558257338508106, 0],
- [126.4162201688255, 33.560524922761985, 0],
- [126.41851408778257, 33.56272709832555, 0],
- [126.42089895732687, 33.564861177086, 0],
- [126.4233718727614, 33.56692455385702, 0],
- [126.42592982125498, 33.56891470957784, 0],
- [126.42856968551253, 33.57082921440762, 0],
- [126.43128824757697, 33.57266573071086, 0],
- [126.43408219275783, 33.5744220159305, 0],
- [126.43694811368186, 33.57609592534477, 0],
- [126.43988251446082, 33.577685414704426, 0],
- [126.44288181497107, 33.579188542747154, 0],
- [126.4459423552398, 33.580603473585704, 0],
- [126.44906039993215, 33.581928478966994, 0],
- [126.45223214293428, 33.58316194039911, 0],
- [126.4554537120257, 33.58430235114368, 0],
- [126.4587211736358, 33.58534831807094, 0],
- [126.46203053767834, 33.58629856337533, 0],
- [126.46537776245749, 33.58715192614909, 0],
- [126.46875875963978, 33.58790736381239, 0],
- [126.4721693992852, 33.58856395339761, 0],
- [126.47560551493135, 33.589120892686516, 0],
- [126.47906290872402, 33.58957750119874, 0],
- [126.48253735658784, 33.58993322103034, 0],
- [126.48602461343027, 33.590187617541375, 0],
- [126.48952041837244, 33.59034037989149, 0],
- [126.49302049999999, 33.59039132142311, 0]
- ]
- ]
- },
- "properties": {
- "name": "제주국제공항",
- "description": "",
- "type": "0003"
- }
}
]
}
diff --git a/src/components/map/mapbox/MapBoxMap.js b/src/components/map/mapbox/MapBoxMap.js
index 09593830..5d5c6ccd 100644
--- a/src/components/map/mapbox/MapBoxMap.js
+++ b/src/components/map/mapbox/MapBoxMap.js
@@ -31,19 +31,20 @@ import FeatureAirZone from './feature/FeatureAirZone';
import { basisArea } from '../geojson/basis';
// 김포 격자 공역
-import gimPoGrid from '../../../components/map/geojson/airport/airportAirArea.json';
+import gimPoGrid from '../geojson/airport/airportAirArea.json';
// 3d 공역
-import gimPo from '../../map/geojson/airport/gimpoAirportAirArea.json';
-import ulsan from '../../map/geojson/airport/ulsanAirArea.json';
-import jeju from '../../map/geojson/airport/jejuAirArea.json';
+import gimPo from '../geojson/airport/gimpoAirportAirArea.json';
+import ulsan from '../geojson/airport/ulsanAirArea.json';
+import jeju from '../geojson/airport/jejuAirArea.json';
// 선형(flat) 공역
-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 flatGimpo from '../geojson/airport/flatGimpoAirportAirArea.json';
+import flatUlsan from '../geojson/airport/flatUlsanAirArea.json';
+import flatJeju from '../geojson/airport/flatJejuAirport.json';
-import competentBorder from '../../map/geojson/competentBorder.json';
+// 항공청 관할지역
+// import { competentBorder } from '../geojson/competent';
import { clientMapInit } from '@src/redux/features/control/map/mapSlice';
import { getDraw } from '@src/utility/MapUtils';
@@ -138,13 +139,13 @@ export default function MapBoxMap({ handlerDrawObjInit }) {
...basisArea,
...flatGimpo,
...flatUlsan,
- // ...flatJeju,
+ ...flatJeju,
features: [
// ...geoJson.features,
...basisArea.features,
...flatGimpo.features,
- ...flatUlsan.features
- // ...flatJeju.features
+ ...flatUlsan.features,
+ ...flatJeju.features
]
}
) => {
@@ -156,13 +157,13 @@ export default function MapBoxMap({ handlerDrawObjInit }) {
...basisArea,
...flatGimpo,
...flatUlsan,
- // ...flatJeju,
+ ...flatJeju,
features: [
// ...geoJson.features,
...basisArea.features,
...flatGimpo.features,
- ...flatUlsan.features
- // ...flatJeju.features
+ ...flatUlsan.features,
+ ...flatJeju.features
]
}
: {
@@ -517,19 +518,19 @@ export default function MapBoxMap({ handlerDrawObjInit }) {
tb.add(line);
}
// 제주
- // for (let i = 0; i < jeju.features.length; i++) {
- // let line;
- // const options = {
- // path: jeju.features[i].geometry.coordinates
- // };
- // let lineGeometry = options.path;
- // line = tb.line({
- // geometry: lineGeometry,
- // width: jeju.features[i].properties['stroke-width'],
- // color: jeju.features[i].properties.stroke
- // });
- // tb.add(line);
- // }
+ for (let i = 0; i < jeju.features.length; i++) {
+ let line;
+ const options = {
+ path: jeju.features[i].geometry.coordinates
+ };
+ let lineGeometry = options.path;
+ line = tb.line({
+ geometry: lineGeometry,
+ width: jeju.features[i].properties['stroke-width'],
+ color: jeju.features[i].properties.stroke
+ });
+ tb.add(line);
+ }
},
render: function () {
tb.update();
@@ -585,27 +586,27 @@ export default function MapBoxMap({ handlerDrawObjInit }) {
});
});
// 제주
- // jeju.features.map((i, idx) => {
- // map.addSource(`lineRoute_jeju${idx}`, {
- // type: 'geojson',
- // data: {
- // ...i
- // }
- // });
- // map.addLayer({
- // id: `lineRoute_jeju${idx}`,
- // type: 'line',
- // source: `lineRoute_jeju${idx}`,
- // layout: {
- // 'line-join': 'round',
- // 'line-cap': 'round'
- // },
- // paint: {
- // 'line-color': i.properties.stroke,
- // 'line-width': i.properties['stroke-width']
- // }
- // });
- // });
+ jeju.features.map((i, idx) => {
+ map.addSource(`lineRoute_jeju${idx}`, {
+ type: 'geojson',
+ data: {
+ ...i
+ }
+ });
+ map.addLayer({
+ id: `lineRoute_jeju${idx}`,
+ type: 'line',
+ source: `lineRoute_jeju${idx}`,
+ layout: {
+ 'line-join': 'round',
+ 'line-cap': 'round'
+ },
+ paint: {
+ 'line-color': i.properties.stroke,
+ 'line-width': i.properties['stroke-width']
+ }
+ });
+ });
}
// 지형 높이 표시
@@ -732,8 +733,8 @@ export default function MapBoxMap({ handlerDrawObjInit }) {
// source: 'competentBorder',
// layout: {},
// paint: {
- // 'fill-color': '#000000',
- // 'fill-opacity': 0.2
+ // 'fill-color': ['get', 'color'],
+ // 'fill-opacity': 0.7
// }
// });