|
|
@ -162,8 +162,9 @@ public class AirspaceUtils { |
|
|
|
for (Resource resource : resources) { |
|
|
|
for (Resource resource : resources) { |
|
|
|
try (InputStream is = resource.getInputStream()) { |
|
|
|
try (InputStream is = resource.getInputStream()) { |
|
|
|
InputStreamReader isr = new InputStreamReader(is, StandardCharsets.UTF_8); |
|
|
|
InputStreamReader isr = new InputStreamReader(is, StandardCharsets.UTF_8); |
|
|
|
|
|
|
|
BufferedReader br = new BufferedReader(isr); |
|
|
|
JSONParser jsonParser = new JSONParser(); |
|
|
|
JSONParser jsonParser = new JSONParser(); |
|
|
|
JSONObject jsonObject = (JSONObject) jsonParser.parse(isr); |
|
|
|
JSONObject jsonObject = (JSONObject) jsonParser.parse(br); |
|
|
|
List<FeatureInfo> convertFeatureInfos = convertGeoJsonToGeometry(jsonObject); |
|
|
|
List<FeatureInfo> convertFeatureInfos = convertGeoJsonToGeometry(jsonObject); |
|
|
|
featureInfos.addAll(convertFeatureInfos); |
|
|
|
featureInfos.addAll(convertFeatureInfos); |
|
|
|
} catch (Exception e) { |
|
|
|
} catch (Exception e) { |
|
|
@ -171,38 +172,6 @@ public class AirspaceUtils { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// ClassPathResource resource = new ClassPathResource(CLASS_PATH);
|
|
|
|
|
|
|
|
// List<File> 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<FeatureInfo> 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<FeatureInfo> 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; |
|
|
|
this.airspaces = featureInfos; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|