|
|
|
@ -287,7 +287,7 @@ public class BasDosService {
|
|
|
|
|
DosFltPlanArea area = optional.get(); |
|
|
|
|
|
|
|
|
|
area.setFltElev(planRq.getFltElev()); |
|
|
|
|
area.setBufferZone(planRq.getBufferZone()); |
|
|
|
|
area.setReqRadius(planRq.getReqRadius()); |
|
|
|
|
area.setDtl(planRq.getDtl()); |
|
|
|
|
area.setEra(planRq.getEra()); |
|
|
|
|
area.setRm(planRq.getRm()); |
|
|
|
@ -295,7 +295,7 @@ public class BasDosService {
|
|
|
|
|
area = dosFltPlanAreaRepository.save(area); |
|
|
|
|
|
|
|
|
|
// 재검증
|
|
|
|
|
if (planRq.getFltElev() != null || planRq.getBufferZone() != null) { |
|
|
|
|
if (planRq.getFltElev() != null || planRq.getReqRadius() != null) { |
|
|
|
|
Optional<DosFltPlanResult> optionalResult = dosFltPlanResultRepository.findById(area.getPlanAreaSno()); |
|
|
|
|
DosFltPlanResult dosFltPlanResult = null; |
|
|
|
|
if (optionalResult.isPresent()) { |
|
|
|
@ -303,12 +303,14 @@ public class BasDosService {
|
|
|
|
|
} |
|
|
|
|
// Circle만 체크
|
|
|
|
|
Double bufferZone = area.getBufferZone(); |
|
|
|
|
Long reqRadius = area.getReqRadius(); |
|
|
|
|
Double fltElev = area.getFltElev() != null ? area.getFltElev() : 0; |
|
|
|
|
|
|
|
|
|
// 좌표 추출 - 중심 좌표
|
|
|
|
|
Coordinate centerPoint = new Coordinate(area.getLon(), area.getLat()); |
|
|
|
|
|
|
|
|
|
DosApprovalResult approvalResult = dronOneStopService.getApprovalResult(bufferZone, fltElev, centerPoint); |
|
|
|
|
double radius = area.getReqRadius() != null ? area.getReqRadius() : area.getBufferZone(); |
|
|
|
|
DosApprovalResult approvalResult = dronOneStopService.getApprovalResult(radius, fltElev, centerPoint); |
|
|
|
|
|
|
|
|
|
// 재검증 수정
|
|
|
|
|
if (dosFltPlanResult != null) { |
|
|
|
|