pav
/
pav-fe-kac
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix/ 울산,제주 원추 색상 수정

master
junh_eee(이준희) 3 weeks ago
parent
19bae8b6ac
commit
eb7b807657
5 changed files with 67 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      src/components/map/geojson/flatJejuAirport.json
  2. 15
      src/components/map/geojson/flatUlsanAirArea.json
  3. 16
      src/components/map/mapbox/MapBoxMap.js
  4. 16
      src/utility/MapUtils.js
  5. 16
      src/views/control/setting/ControlSetting.js

27
src/components/map/geojson/flatJejuAirport.json
Unescape View File

@ -195,7 +195,8 @@
"name": "원추", "name": "원추",
"description": "9.3km", "description": "9.3km",
"type": "0003", "type": "0003",
"divCd": "원추" "divCd": "원추",
"airportNm": "제주"
} }
}, },
{ {
@ -293,7 +294,8 @@
"name": "수평", "name": "수평",
"description": "원추표면 오른쪽위 -> 왼쪽위", "description": "원추표면 오른쪽위 -> 왼쪽위",
"type": "0003", "type": "0003",
"divCd": "수평" "divCd": "수평",
"airportNm": "제주"
} }
}, },
{ {
@ -338,7 +340,8 @@
"name": "금지구역", "name": "금지구역",
"description": "수평표면 왼쪽하단", "description": "수평표면 왼쪽하단",
"type": "0003", "type": "0003",
"divCd": "금지" "divCd": "금지",
"airportNm": "제주"
} }
}, },
{ {
@ -382,7 +385,8 @@
"name": "금지구역", "name": "금지구역",
"description": "수평표면 오른쪽하단", "description": "수평표면 오른쪽하단",
"type": "0003", "type": "0003",
"divCd": "금지" "divCd": "금지",
"airportNm": "제주"
} }
}, },
{ {
@ -463,7 +467,8 @@
"name": "금지구역", "name": "금지구역",
"description": "수평표면 가운데상단", "description": "수평표면 가운데상단",
"type": "0003", "type": "0003",
"divCd": "금지" "divCd": "금지",
"airportNm": "제주"
} }
}, },
{ {
@ -488,7 +493,8 @@
"name": "금지구역", "name": "금지구역",
"description": "전입표면 왼쪽", "description": "전입표면 왼쪽",
"type": "0003", "type": "0003",
"divCd": "금지" "divCd": "금지",
"airportNm": "제주"
} }
}, },
{ {
@ -513,7 +519,8 @@
"name": "금지구역", "name": "금지구역",
"description": "전입표면 오른쪽", "description": "전입표면 오른쪽",
"type": "0003", "type": "0003",
"divCd": "금지" "divCd": "금지",
"airportNm": "제주"
} }
}, },
{ {
@ -534,7 +541,8 @@
"name": "금지구역", "name": "금지구역",
"description": "전입표면 위쪽", "description": "전입표면 위쪽",
"type": "0003", "type": "0003",
"divCd": "금지" "divCd": "금지",
"airportNm": "제주"
} }
}, },
{ {
@ -555,7 +563,8 @@
"name": "금지구역", "name": "금지구역",
"description": "전입표면 아래쪽", "description": "전입표면 아래쪽",
"type": "0003", "type": "0003",
"divCd": "금지" "divCd": "금지",
"airportNm": "제주"
} }
} }
] ]

15
src/components/map/geojson/flatUlsanAirArea.json
Unescape View File

@ -84,7 +84,8 @@
"name": "원추", "name": "원추",
"description": "9.3", "description": "9.3",
"type": "0003", "type": "0003",
"divCd": "원추" "divCd": "원추",
"airportNm": "울산"
} }
}, },
{ {
@ -178,7 +179,8 @@
"name": "수평", "name": "수평",
"description": "수평", "description": "수평",
"type": "0003", "type": "0003",
"divCd": "수평" "divCd": "수평",
"airportNm": "울산"
} }
}, },
@ -234,7 +236,8 @@
"name": "금지구역", "name": "금지구역",
"description": "", "description": "",
"type": "0003", "type": "0003",
"divCd": "금지" "divCd": "금지",
"airportNm": "울산"
} }
}, },
@ -258,7 +261,8 @@
"name": "금지구역", "name": "금지구역",
"description": "상단금지", "description": "상단금지",
"type": "0003", "type": "0003",
"divCd": "금지" "divCd": "금지",
"airportNm": "울산"
} }
}, },
{ {
@ -282,7 +286,8 @@
"name": "금지구역", "name": "금지구역",
"description": "하단금지", "description": "하단금지",
"type": "0003", "type": "0003",
"divCd": "금지" "divCd": "금지",
"airportNm": "울산"
} }
} }
] ]

16
src/components/map/mapbox/MapBoxMap.js
Unescape View File

@ -289,12 +289,22 @@ export default function MapBoxMap({ handlerDrawObjInit }) {
} else if (item.properties.type === '0003' && mapState.area0003) { } else if (item.properties.type === '0003' && mapState.area0003) {
let color = '#f5dcab'; let color = '#f5dcab';
let stroke = '#54797d'; let stroke = '#54797d';
let opacity = 0.3;
if (item.properties?.divCd) { if (item.properties?.divCd) {
const divCd = item.properties.divCd; const divCd = item.properties.divCd;
if (divCd === '원추') { if (divCd === '원추') {
color = '#f5dcab'; if (
stroke = '#54797d'; item.properties?.airportNm === '제주' ||
item.properties?.airportNm === '울산'
) {
color = '#f0c571';
stroke = '#54797d';
opacity = 0.5;
} else {
color = '#f5dcab';
stroke = '#54797d';
}
} else if (divCd === '수평') { } else if (divCd === '수평') {
color = '#a4edf5'; color = '#a4edf5';
stroke = '#54797d'; stroke = '#54797d';
@ -309,7 +319,7 @@ export default function MapBoxMap({ handlerDrawObjInit }) {
...item.properties, ...item.properties,
color: color, color: color,
stroke: stroke, stroke: stroke,
opacity: 0.3 opacity: opacity
} }
}); });
} else if (item.properties.type === '0004' && mapState.area0004) { } else if (item.properties.type === '0004' && mapState.area0004) {

16
src/utility/MapUtils.js
Unescape View File

@ -371,12 +371,22 @@ export const handlerCreateAirSpace = (
} else if (item.properties.type === '0003' && mapControl.area0003) { } else if (item.properties.type === '0003' && mapControl.area0003) {
let color = '#f5dcab'; let color = '#f5dcab';
let stroke = '#54797d'; let stroke = '#54797d';
let opacity = 0.3;
if (item.properties?.divCd) { if (item.properties?.divCd) {
const divCd = item.properties.divCd; const divCd = item.properties.divCd;
if (divCd === '원추') { if (divCd === '원추') {
color = '#f5dcab'; if (
stroke = '#54797d'; item.properties?.airportNm === '제주' ||
item.properties?.airportNm === '울산'
) {
color = '#f0c571';
stroke = '#54797d';
opacity = 0.5;
} else {
color = '#f5dcab';
stroke = '#54797d';
}
} else if (divCd === '수평') { } else if (divCd === '수평') {
color = '#a4edf5'; color = '#a4edf5';
stroke = '#54797d'; stroke = '#54797d';
@ -391,7 +401,7 @@ export const handlerCreateAirSpace = (
...item.properties, ...item.properties,
color: color, color: color,
stroke: stroke, stroke: stroke,
opacity: 0.3 opacity: opacity
} }
}); });
} else if (item.properties.type === '0004' && mapControl.area0004) { } else if (item.properties.type === '0004' && mapControl.area0004) {

16
src/views/control/setting/ControlSetting.js
Unescape View File

@ -74,12 +74,22 @@ const ControlSetting = props => {
} else if (item.properties.type === '0003' && mapState.area0003) { } else if (item.properties.type === '0003' && mapState.area0003) {
let color = '#f5dcab'; let color = '#f5dcab';
let stroke = '#54797d'; let stroke = '#54797d';
let opacity = 0.3;
if (item.properties?.divCd) { if (item.properties?.divCd) {
const divCd = item.properties.divCd; const divCd = item.properties.divCd;
if (divCd === '원추') { if (divCd === '원추') {
color = '#f5dcab'; if (
stroke = '#54797d'; item.properties?.airportNm === '제주' ||
item.properties?.airportNm === '울산'
) {
color = '#f0c571';
stroke = '#54797d';
opacity = 0.5;
} else {
color = '#f5dcab';
stroke = '#54797d';
}
} else if (divCd === '수평') { } else if (divCd === '수평') {
color = '#a4edf5'; color = '#a4edf5';
stroke = '#54797d'; stroke = '#54797d';
@ -94,7 +104,7 @@ const ControlSetting = props => {
...item.properties, ...item.properties,
color: color, color: color,
stroke: stroke, stroke: stroke,
opacity: 0.3 opacity: opacity
} }
}); });
} else if (item.properties.type === '0004' && mapState.area0004) { } else if (item.properties.type === '0004' && mapState.area0004) {

Write Preview
Loading…
Cancel
Save