From b70de5b021075bfb5bfde33ef130f88ff48b8a72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= <dhji@palnet.co.kr>
Date: Thu, 5 Oct 2023 13:30:43 +0900
Subject: [PATCH] =?UTF-8?q?resource=20=ED=8C=8C=EC=9D=BC=20=EB=AA=BB?=
 =?UTF-8?q?=EC=9D=BD=EC=9D=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bas/laanc/service/BasLaancService.java    |  2 +-
 .../com/palnet/comn/utils/AirspaceUtils.java  | 23 +++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancService.java b/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancService.java
index aa5a8b3e..b739ed5a 100644
--- a/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancService.java
+++ b/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancService.java
@@ -325,7 +325,7 @@ public class BasLaancService {
                         String targetFltElev = basLaancAreaModel.getFltElev();
                         // TODO 추후 특정 고도 범위 확인
                         boolean isEqualsFltElev = effectiveFltElev.equals(targetFltElev);
-                        //rq로 들어온 좌표로 버퍼좌표 생성
+                        // rq로 들어온 좌표로 버퍼좌표 생성
                         List<Coordinate> targetCoords = basLaancAreaModel.getCoordList().stream().map(coord -> new Coordinate(coord.getLon(), coord.getLat())).collect(Collectors.toList());
                         List<Coordinate> targetBufferCoords = new ArrayList<>();
                         if ("LINE".equals(basLaancAreaModel.getAreaType())) {
diff --git a/pav-server/src/main/java/com/palnet/comn/utils/AirspaceUtils.java b/pav-server/src/main/java/com/palnet/comn/utils/AirspaceUtils.java
index 7285d7dd..a9857a14 100644
--- a/pav-server/src/main/java/com/palnet/comn/utils/AirspaceUtils.java
+++ b/pav-server/src/main/java/com/palnet/comn/utils/AirspaceUtils.java
@@ -12,6 +12,9 @@ import org.json.simple.parser.JSONParser;
 import org.locationtech.jts.geom.*;
 import org.opengis.feature.simple.SimpleFeature;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.ResourcePatternUtils;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -146,12 +149,24 @@ public class AirspaceUtils {
 
     // 파일에서 공역 데이터 가져와서 geometry로 변환 - 초기화.
     private void getResourceAirspace() {
-        ClassPathResource resource = new ClassPathResource(CLASS_PATH);
+//        ClassPathResource resource = new ClassPathResource(CLASS_PATH);
         List<File> geoJsonFiles = new ArrayList<>();
         try {
-            File folder = resource.getFile();
-            File[] files = folder.listFiles();
-            for (File file : files) {
+        Resource[] resources = ResourcePatternUtils
+                .getResourcePatternResolver(new DefaultResourceLoader())
+                .getResources("classpath*:air/elev2d/**");
+
+
+//            File folder = resource.getFile();
+//            File[] files = folder.listFiles();
+//            for (File file : files) {
+//                if (file.isFile() && file.getName().endsWith("elev.json")) {
+//                    log.debug(">>> {}", file.getName());
+//                    geoJsonFiles.add(file);
+//                }
+//            }
+            for(Resource resource: resources) {
+                File file = resource.getFile();
                 if (file.isFile() && file.getName().endsWith("elev.json")) {
                     log.debug(">>> {}", file.getName());
                     geoJsonFiles.add(file);