From 164a393ca80727c6627205e8caadae1c3e06e847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Thu, 5 Oct 2023 14:24:35 +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 --- .../com/palnet/comn/utils/AirspaceUtils.java | 35 ++----------------- 1 file changed, 2 insertions(+), 33 deletions(-) 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 5eb872af..5fb7fcf7 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 @@ -162,8 +162,9 @@ public class AirspaceUtils { for (Resource resource : resources) { try (InputStream is = resource.getInputStream()) { InputStreamReader isr = new InputStreamReader(is, StandardCharsets.UTF_8); + BufferedReader br = new BufferedReader(isr); JSONParser jsonParser = new JSONParser(); - JSONObject jsonObject = (JSONObject) jsonParser.parse(isr); + JSONObject jsonObject = (JSONObject) jsonParser.parse(br); List convertFeatureInfos = convertGeoJsonToGeometry(jsonObject); featureInfos.addAll(convertFeatureInfos); } catch (Exception e) { @@ -171,38 +172,6 @@ public class AirspaceUtils { } } -// ClassPathResource resource = new ClassPathResource(CLASS_PATH); -// List geoJsonFiles = new ArrayList<>(); -// try { -// 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); -// } -// } -// } catch (IOException e) { -// throw new RuntimeException(e); -// } - - -// List featureInfos = new ArrayList<>(); -// for (File file : geoJsonFiles) { -// try (InputStreamReader isr = new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8)) { -// JSONParser jsonParser = new JSONParser(); -// JSONObject jsonObject = (JSONObject) jsonParser.parse(isr); -// List convertFeatureInfos = convertGeoJsonToGeometry(jsonObject); -// featureInfos.addAll(convertFeatureInfos); -// } catch (Exception e) { -// log.error("ERROR : ", e); -// featureInfos = null; -// } -// if (featureInfos != null && featureInfos.isEmpty()) { -// featureInfos = null; -// } -// } - this.airspaces = featureInfos; }