From 12308d063f1be28f907ba033274963893d57e5f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=B0=95=EC=9E=AC=EC=9A=B0?= <박재우@DESKTOP-EF7ECBO>
Date: Fri, 26 Aug 2022 17:32:07 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B3=B5=EC=97=AD=20=EC=9C=A0=ED=9A=A8?=
 =?UTF-8?q?=EC=84=B1=EA=B2=80=EC=82=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flight/model/BasFlightPlanResultMessageRq.java   | 12 ------------
 .../biz/api/bas/flight/service/BasFlightService.java |  6 ++++--
 src/main/java/com/palnet/comn/utils/AreaUtils.java   |  2 +-
 3 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanResultMessageRq.java

diff --git a/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanResultMessageRq.java b/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanResultMessageRq.java
deleted file mode 100644
index 9da2d4c..0000000
--- a/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanResultMessageRq.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.palnet.biz.api.bas.flight.model;
-
-import lombok.Data;
-
-@Data
-public class BasFlightPlanResultMessageRq {
-
-	private boolean dateCheck;
-	private boolean areaCheck;
-	private boolean finalCheck;
-	
-}
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 b4f60ff..5ddf37c 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
@@ -432,8 +432,10 @@ public class BasFlightService {
         for(BasFlightPlanAreaModel area : rq) {
             List<Coordinate> coordinates = areaUtils.convertCoordinates(area.getCoordList());
             if("LINE".equals(area.getAreaType())) {
-                List<Coordinate> buffer = areaUtils.buffer(coordinates, area.getBufferZone());
-                result = areaUtils.overlaps(buffer);
+            	List<Coordinate> transCoordList = areaUtils.transform(coordinates, "EPSG:4326", "EPSG:5181");
+                List<Coordinate> buffer = areaUtils.buffer(transCoordList, area.getBufferZone());
+                List<Coordinate> transBufferList = areaUtils.transform(buffer, "EPSG:5181", "EPSG:4326"); 
+                result = areaUtils.overlaps(transBufferList);
             }
 
             if("POLYGON".equals(area.getAreaType())) {
diff --git a/src/main/java/com/palnet/comn/utils/AreaUtils.java b/src/main/java/com/palnet/comn/utils/AreaUtils.java
index bd8ee43..9957910 100644
--- a/src/main/java/com/palnet/comn/utils/AreaUtils.java
+++ b/src/main/java/com/palnet/comn/utils/AreaUtils.java
@@ -81,7 +81,7 @@ public class AreaUtils {
                 Geometry overlabsGeometry = geometryFactory.createGeometry(polygon);
                 Geometry targetGeometry = geometryFactory.createGeometry(targetPolygon);
 
-                boolean over = targetGeometry.overlaps(overlabsGeometry);
+                boolean over = targetPolygon.overlaps(polygon);
 
                 if(over) {
                     result = true;