diff --git a/src/containers/flight/ControlApprovalsContainer.js b/src/containers/flight/ControlApprovalsContainer.js index 8037a4cf..86eab9a3 100644 --- a/src/containers/flight/ControlApprovalsContainer.js +++ b/src/containers/flight/ControlApprovalsContainer.js @@ -373,15 +373,13 @@ export default function ControlApprovalsContainer({ mode }) { controlLayer.features = []; let fitZoomPaths = []; - const radius = areas.bufferZone; - const circleCoords = handlerGetCircleCoord( - [areas.lon, areas.lat], - radius - ); + const bufferCoordList = areas?.bufferCoordList.map(coord => { + return [coord.lon, coord.lat]; + }); const circle = InitFeature('Polygon', 'CIRCLE'); circle.properties.center = [areas.lon, areas.lat]; - circle.geometry.coordinates = circleCoords; + circle.geometry.coordinates = [bufferCoordList]; controlLayer.features.push(circle); const point = InitFeature('Point', 'POINT'); @@ -389,17 +387,16 @@ export default function ControlApprovalsContainer({ mode }) { controlLayer.features.push(point); // 요청반경 도식화 - if (areas?.reqRadius) { - const reqCoords = handlerGetCircleCoord( - [areas.lon, areas.lat], - areas.reqRadius - ); + if (areas?.reqBufferCoordList) { + const reqBufferCoordList = areas.reqBufferCoordList.map(coord => { + return [coord.lon, coord.lat]; + }); const reqCircleLine = InitFeature('LineString', 'LINE'); - reqCircleLine.geometry.coordinates = reqCoords[0]; + reqCircleLine.geometry.coordinates = reqBufferCoordList; controlLayer.features.push(reqCircleLine); } - fitZoomPaths = circleCoords[0]; + fitZoomPaths = bufferCoordList; handlerFitBounds(mapObject, fitZoomPaths, 400, 'CIRCLE', 'flight'); handlerInfoWindow(areas); diff --git a/src/containers/flight/OperationApprovalsContainer.js b/src/containers/flight/OperationApprovalsContainer.js index e7186ce0..e2e0710e 100644 --- a/src/containers/flight/OperationApprovalsContainer.js +++ b/src/containers/flight/OperationApprovalsContainer.js @@ -433,11 +433,9 @@ export default function OperationApprovalsContainer({ mode }) { if (!areaCoordList[0]?.lon) return; areaCoordList.map((area, idx) => { - const radius = area.bufferZone; - const circleCoords = handlerGetCircleCoord( - [area.lon, area.lat], - radius - ); + const bufferCoordList = area?.bufferCoordList.map(coord => { + return [coord.lon, coord.lat]; + }); const circle = InitFeature('Polygon', 'CIRCLE'); circle.properties.center = [area.lon, area.lat]; @@ -446,7 +444,7 @@ export default function OperationApprovalsContainer({ mode }) { circle.properties.zoneNo = area.zoneNo; circle.properties.key = area?.planAreaSno; circle.properties.addr = area.addr; - circle.geometry.coordinates = circleCoords; + circle.geometry.coordinates = [bufferCoordList]; operationLayer.features.push(circle); const point = InitFeature('Point', 'POINT'); @@ -454,13 +452,12 @@ export default function OperationApprovalsContainer({ mode }) { operationLayer.features.push(point); // 요청반경 도식화 - if (area?.reqRadius) { - const reqCoords = handlerGetCircleCoord( - [area.lon, area.lat], - area.reqRadius - ); + if (area?.reqBufferCoordList) { + const reqBufferCoordList = area.reqBufferCoordList.map(coord => { + return [coord.lon, coord.lat]; + }); const reqCircleLine = InitFeature('LineString', 'LINE'); - reqCircleLine.geometry.coordinates = reqCoords[0]; + reqCircleLine.geometry.coordinates = reqBufferCoordList; operationLayer.features.push(reqCircleLine); } });