Browse Source

fix/ 비행구역 반경 좌표 서버 데이터로 교체

master
junh_eee(이준희) 1 month ago
parent
commit
886def3c5b
  1. 23
      src/containers/flight/ControlApprovalsContainer.js
  2. 21
      src/containers/flight/OperationApprovalsContainer.js

23
src/containers/flight/ControlApprovalsContainer.js

@ -373,15 +373,13 @@ export default function ControlApprovalsContainer({ mode }) {
controlLayer.features = []; controlLayer.features = [];
let fitZoomPaths = []; let fitZoomPaths = [];
const radius = areas.bufferZone; const bufferCoordList = areas?.bufferCoordList.map(coord => {
const circleCoords = handlerGetCircleCoord( return [coord.lon, coord.lat];
[areas.lon, areas.lat], });
radius
);
const circle = InitFeature('Polygon', 'CIRCLE'); const circle = InitFeature('Polygon', 'CIRCLE');
circle.properties.center = [areas.lon, areas.lat]; circle.properties.center = [areas.lon, areas.lat];
circle.geometry.coordinates = circleCoords; circle.geometry.coordinates = [bufferCoordList];
controlLayer.features.push(circle); controlLayer.features.push(circle);
const point = InitFeature('Point', 'POINT'); const point = InitFeature('Point', 'POINT');
@ -389,17 +387,16 @@ export default function ControlApprovalsContainer({ mode }) {
controlLayer.features.push(point); controlLayer.features.push(point);
// 요청반경 도식화 // 요청반경 도식화
if (areas?.reqRadius) { if (areas?.reqBufferCoordList) {
const reqCoords = handlerGetCircleCoord( const reqBufferCoordList = areas.reqBufferCoordList.map(coord => {
[areas.lon, areas.lat], return [coord.lon, coord.lat];
areas.reqRadius });
);
const reqCircleLine = InitFeature('LineString', 'LINE'); const reqCircleLine = InitFeature('LineString', 'LINE');
reqCircleLine.geometry.coordinates = reqCoords[0]; reqCircleLine.geometry.coordinates = reqBufferCoordList;
controlLayer.features.push(reqCircleLine); controlLayer.features.push(reqCircleLine);
} }
fitZoomPaths = circleCoords[0]; fitZoomPaths = bufferCoordList;
handlerFitBounds(mapObject, fitZoomPaths, 400, 'CIRCLE', 'flight'); handlerFitBounds(mapObject, fitZoomPaths, 400, 'CIRCLE', 'flight');
handlerInfoWindow(areas); handlerInfoWindow(areas);

21
src/containers/flight/OperationApprovalsContainer.js

@ -433,11 +433,9 @@ export default function OperationApprovalsContainer({ mode }) {
if (!areaCoordList[0]?.lon) return; if (!areaCoordList[0]?.lon) return;
areaCoordList.map((area, idx) => { areaCoordList.map((area, idx) => {
const radius = area.bufferZone; const bufferCoordList = area?.bufferCoordList.map(coord => {
const circleCoords = handlerGetCircleCoord( return [coord.lon, coord.lat];
[area.lon, area.lat], });
radius
);
const circle = InitFeature('Polygon', 'CIRCLE'); const circle = InitFeature('Polygon', 'CIRCLE');
circle.properties.center = [area.lon, area.lat]; circle.properties.center = [area.lon, area.lat];
@ -446,7 +444,7 @@ export default function OperationApprovalsContainer({ mode }) {
circle.properties.zoneNo = area.zoneNo; circle.properties.zoneNo = area.zoneNo;
circle.properties.key = area?.planAreaSno; circle.properties.key = area?.planAreaSno;
circle.properties.addr = area.addr; circle.properties.addr = area.addr;
circle.geometry.coordinates = circleCoords; circle.geometry.coordinates = [bufferCoordList];
operationLayer.features.push(circle); operationLayer.features.push(circle);
const point = InitFeature('Point', 'POINT'); const point = InitFeature('Point', 'POINT');
@ -454,13 +452,12 @@ export default function OperationApprovalsContainer({ mode }) {
operationLayer.features.push(point); operationLayer.features.push(point);
// 요청반경 도식화 // 요청반경 도식화
if (area?.reqRadius) { if (area?.reqBufferCoordList) {
const reqCoords = handlerGetCircleCoord( const reqBufferCoordList = area.reqBufferCoordList.map(coord => {
[area.lon, area.lat], return [coord.lon, coord.lat];
area.reqRadius });
);
const reqCircleLine = InitFeature('LineString', 'LINE'); const reqCircleLine = InitFeature('LineString', 'LINE');
reqCircleLine.geometry.coordinates = reqCoords[0]; reqCircleLine.geometry.coordinates = reqBufferCoordList;
operationLayer.features.push(reqCircleLine); operationLayer.features.push(reqCircleLine);
} }
}); });

Loading…
Cancel
Save