diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/model/BasDosPlanAreaRs.java b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/model/BasDosPlanAreaRs.java index 4c26d4c5..e2a19deb 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/model/BasDosPlanAreaRs.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/model/BasDosPlanAreaRs.java @@ -71,4 +71,6 @@ public class BasDosPlanAreaRs { private String approvalCd; // buffer private List> bufferCoordList; + // req buffer + private List> reqBufferCoordList; } diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java index 82bdecf9..6ead5688 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java @@ -158,6 +158,7 @@ public class BasDosService { if (cptAuthCode != null) { Coordinate centerPoint = new Coordinate(area.getLon(), area.getLat()); if ("DF0002".equals(cptAuthCode)) { + // 검토신청한 건에 대해서 // 관제과(9.3km) AirspaceUtils airspaceUtils = AirspaceUtils.getInstance(); List airspaces = airspaceUtils.getAirspaces(AirspaceUtils.AirspaceType.GIMPO); @@ -183,9 +184,9 @@ public class BasDosService { } List> bufferCoordList = null; + List> reqBufferCoordList = null; if (type == PlanSelectType.LIST) { List coordBuffers = areaUtils.createCircle(new Coordinate(area.getLon(), area.getLat()), area.getBufferZone()); - if ("GIMPO".equalsIgnoreCase(rq.getSelectZone())) { AirspaceUtils airspaceUtils = AirspaceUtils.getInstance(); Geometry rqGeometry = airspaceUtils.createGeometryByCoordinate(coordBuffers); @@ -201,6 +202,12 @@ public class BasDosService { } } bufferCoordList = coordBuffers.stream().map(coord -> Map.of("lat", coord.y, "lon", coord.x)).collect(Collectors.toList()); + if(area.getReqRadius() != null && area.getReqRadius() > 0) { + List reqCoordBuffers = areaUtils.createCircle(new Coordinate(area.getLon(), area.getLat()), area.getReqRadius()); + reqBufferCoordList = reqCoordBuffers.stream().map(coord -> Map.of("lat", coord.y, "lon", coord.x)).collect(Collectors.toList()); + } + + } // TODO 추후 Utils 생성 @@ -266,6 +273,7 @@ public class BasDosService { .limitZoneCd(area.getLimitZone()) .limitZoneNm(limitZoneType != null ? limitZoneType.getMessage() : null) .bufferCoordList(bufferCoordList) + .reqBufferCoordList(reqBufferCoordList) .build(); areaRsList.add(areaRs); }