From ba8a3f9945b309b4128b6187d40af5b81760d68c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?qkr7828=28=EB=B0=95=EC=9E=AC=EC=9A=B0=29?= Date: Tue, 10 Oct 2023 14:05:37 +0900 Subject: [PATCH 1/2] adex buffer --- .../controller/BasFlightController.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java b/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java index 4287d55..f8826fb 100644 --- a/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java +++ b/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java @@ -6,7 +6,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -15,8 +14,6 @@ import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; import org.locationtech.jts.geom.Coordinate; -import org.locationtech.proj4j.CRSFactory; -import org.locationtech.proj4j.CoordinateReferenceSystem; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.core.io.ClassPathResource; @@ -386,15 +383,15 @@ public class BasFlightController { } //test - @GetMapping("/test") - public void createCircleTest(@RequestParam double getX, @RequestParam double getY, @RequestParam double buffer) { - + @PostMapping("/adex/buffer") + public List createCircleTest(@RequestBody List coord, @RequestParam double buffer) { - Coordinate circleCoord = new Coordinate(getY, getX); + List transCoordList = utils.transform(coord, "EPSG:4326", "EPSG:5181"); + + List bufferList = utils.buffer(transCoordList, buffer); // buffer 영역 생성 + + List transBufferList = utils.transform(bufferList, "EPSG:5181", "EPSG:4326"); // buffer 영역 좌표계 변환 - List coordList = utils.createCircle(circleCoord, buffer); - for(Coordinate a : coordList) { - System.out.println("["+a.getX() + ", " + a.getY()+"],"); - } + return transBufferList; } } From aff921f8701745f81c4454639ea7d1b50f31f917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?qkr7828=28=EB=B0=95=EC=9E=AC=EC=9A=B0=29?= Date: Tue, 10 Oct 2023 17:35:31 +0900 Subject: [PATCH 2/2] =?UTF-8?q?buffer=20rq=20type=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flight/controller/BasFlightController.java | 12 +++++++++--- .../api/bas/flight/model/BasFlightCoordModel.java | 15 +++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightCoordModel.java diff --git a/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java b/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java index f8826fb..fd3190e 100644 --- a/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java +++ b/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java @@ -32,6 +32,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import com.palnet.biz.api.bas.flight.model.BasFlightAprovRq; +import com.palnet.biz.api.bas.flight.model.BasFlightCoordModel; import com.palnet.biz.api.bas.flight.model.BasFlightPlanArcrftModel; import com.palnet.biz.api.bas.flight.model.BasFlightPlanAreaModel; import com.palnet.biz.api.bas.flight.model.BasFlightPlanListRq; @@ -384,14 +385,19 @@ public class BasFlightController { //test @PostMapping("/adex/buffer") - public List createCircleTest(@RequestBody List coord, @RequestParam double buffer) { + public List adexBuffer(@RequestBody BasFlightCoordModel model) { - List transCoordList = utils.transform(coord, "EPSG:4326", "EPSG:5181"); + List transCoordList = utils.transform(model.getCoordinates(), "EPSG:4326", "EPSG:5181"); - List bufferList = utils.buffer(transCoordList, buffer); // buffer 영역 생성 + List bufferList = utils.buffer(transCoordList, model.getBuffer()); // buffer 영역 생성 List transBufferList = utils.transform(bufferList, "EPSG:5181", "EPSG:4326"); // buffer 영역 좌표계 변환 return transBufferList; } + + public void test3d(@RequestBody Coordinate coord, @RequestParam double buffer) { + + } + } diff --git a/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightCoordModel.java b/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightCoordModel.java new file mode 100644 index 0000000..7079caa --- /dev/null +++ b/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightCoordModel.java @@ -0,0 +1,15 @@ +package com.palnet.biz.api.bas.flight.model; + +import java.util.List; + +import org.locationtech.jts.geom.Coordinate; + +import lombok.Data; + +@Data +public class BasFlightCoordModel { + + private List coordinates; + + private Double buffer; +}