diff --git a/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java b/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java index e396b2b..55583a3 100644 --- a/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java +++ b/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java @@ -272,6 +272,10 @@ public class BasFlightService { // 비행계획서 수정 public boolean updatePlan(BasFlightPlanModel rq) { + + // 비행계획서 유효성 검사. + this.planValid(rq); + if (rq != null && rq.getPlanSno() != null) { String userId = jwtTokenUtil.getCstmrSnoByToken().toString(); Integer planSno = rq.getPlanSno(); diff --git a/src/main/java/com/palnet/comn/utils/AreaUtils.java b/src/main/java/com/palnet/comn/utils/AreaUtils.java index 7a73f1c..499a034 100644 --- a/src/main/java/com/palnet/comn/utils/AreaUtils.java +++ b/src/main/java/com/palnet/comn/utils/AreaUtils.java @@ -103,17 +103,10 @@ public class AreaUtils { public boolean overlaps(List targetCoordList, List effectiveCoordList) { targetCoordList.add(targetCoordList.get(0)); Polygon targetPolygon = geometryFactory.createPolygon(targetCoordList.toArray(new Coordinate[] {})); - Coordinate[] coords = targetPolygon.getCoordinates(); - for(Coordinate coord : coords) { - System.out.println(coord.x + "," + coord.y); - } + effectiveCoordList.add(effectiveCoordList.get(0)); Polygon effectivePolygon = geometryFactory.createPolygon(effectiveCoordList.toArray(new Coordinate[] {})); - System.out.println("ㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡ"); - Coordinate[] coords2 = effectivePolygon.getCoordinates(); - for(Coordinate coord : coords2) { - System.out.println(coord.x + "," + coord.y); - } + return targetPolygon.overlaps(effectivePolygon); }