|
|
|
@ -1,6 +1,7 @@
|
|
|
|
|
package com.palnet.comn.utils; |
|
|
|
|
|
|
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
|
import lombok.Builder; |
|
|
|
|
import lombok.Data; |
|
|
|
|
import lombok.NoArgsConstructor; |
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
@ -312,7 +313,7 @@ public class AirspaceUtils {
|
|
|
|
|
BigDecimal lf = new BigDecimal(String.valueOf(lastCoords.get(0))); |
|
|
|
|
BigDecimal ll = new BigDecimal(String.valueOf(lastCoords.get(1))); |
|
|
|
|
if (!ff.equals(lf) || !fl.equals(ll)) { |
|
|
|
|
JSONObject propertiesObject = (JSONObject) feature.get("properties"); |
|
|
|
|
// JSONObject propertiesObject = (JSONObject) feature.get("properties");
|
|
|
|
|
// String nameObject = String.valueOf(propertiesObject.get("name"));
|
|
|
|
|
// String descriptionObject = String.valueOf(propertiesObject.get("description"));
|
|
|
|
|
// log.info("coords first and last coords not eqauls : name/descriion = {}/{}", nameObject, descriptionObject);
|
|
|
|
@ -328,21 +329,21 @@ public class AirspaceUtils {
|
|
|
|
|
if (use) { |
|
|
|
|
String name = String.valueOf(simpleFeature.getAttribute("name")); |
|
|
|
|
String description = String.valueOf(simpleFeature.getAttribute("description")); |
|
|
|
|
String propType = String.valueOf(simpleFeature.getAttribute("type")); |
|
|
|
|
Double lowElev = Double.parseDouble(String.valueOf(simpleFeature.getAttribute("lowElev"))); |
|
|
|
|
|
|
|
|
|
Object t1 = simpleFeature.getAttribute("highElev"); |
|
|
|
|
// log.info("t1: {} :: {}", t1, t1.getClass().getName());
|
|
|
|
|
String t2 = String.valueOf(simpleFeature.getAttribute("highElev")); |
|
|
|
|
// log.info("t2: {} :: {}", t2, t2.getClass().getName());
|
|
|
|
|
Double t3 = Double.parseDouble(String.valueOf(simpleFeature.getAttribute("highElev"))); |
|
|
|
|
// log.info("t3: {} :: {}", t3, t3.getClass().getName());
|
|
|
|
|
Double highElev = Double.parseDouble(String.valueOf(simpleFeature.getAttribute("highElev"))); |
|
|
|
|
Geometry geometry = (Geometry) simpleFeature.getDefaultGeometry(); |
|
|
|
|
// log.debug(">>> name, description, use, lowElev, highElev : {}, {}, {}, {}, {}", name, description, use, lowElev, highElev);
|
|
|
|
|
FeatureInfo info = new FeatureInfo(name, description, lowElev, highElev, geometry); |
|
|
|
|
FeatureInfo info = FeatureInfo.builder() |
|
|
|
|
.name(name) |
|
|
|
|
.description(description) |
|
|
|
|
.type(propType) |
|
|
|
|
.lowElev(lowElev) |
|
|
|
|
.highElev(highElev) |
|
|
|
|
.geometry(geometry) |
|
|
|
|
.build(); |
|
|
|
|
featureInfos.add(info); |
|
|
|
|
} |
|
|
|
|
} catch (IOException e) { |
|
|
|
|
} catch (Exception e) { |
|
|
|
|
log.error("geometry json read error : {}", e.getMessage()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
@ -354,10 +355,18 @@ public class AirspaceUtils {
|
|
|
|
|
if (use) { |
|
|
|
|
String name = String.valueOf(simpleFeature.getAttribute("name")); |
|
|
|
|
String description = String.valueOf(simpleFeature.getAttribute("description")); |
|
|
|
|
String propType = String.valueOf(simpleFeature.getAttribute("type")); |
|
|
|
|
Double lowElev = Double.parseDouble(String.valueOf(simpleFeature.getAttribute("lowElev"))); |
|
|
|
|
Double highElev = Double.parseDouble(String.valueOf(simpleFeature.getAttribute("highElev"))); |
|
|
|
|
Geometry geometry = (Geometry) simpleFeature.getDefaultGeometry(); |
|
|
|
|
FeatureInfo info = new FeatureInfo(name, description, lowElev, highElev, geometry); |
|
|
|
|
FeatureInfo info = FeatureInfo.builder() |
|
|
|
|
.name(name) |
|
|
|
|
.description(description) |
|
|
|
|
.type(propType) |
|
|
|
|
.lowElev(lowElev) |
|
|
|
|
.highElev(highElev) |
|
|
|
|
.geometry(geometry) |
|
|
|
|
.build(); |
|
|
|
|
featureInfos.add(info); |
|
|
|
|
} |
|
|
|
|
} catch (IOException e) { |
|
|
|
@ -368,7 +377,9 @@ public class AirspaceUtils {
|
|
|
|
|
GeometryJSON geoJson = new GeometryJSON(); |
|
|
|
|
try { |
|
|
|
|
Geometry geometry = geoJson.read(jsonObject.toJSONString()); |
|
|
|
|
FeatureInfo info = new FeatureInfo(null, null, null, null, geometry); |
|
|
|
|
FeatureInfo info = FeatureInfo.builder() |
|
|
|
|
.geometry(geometry) |
|
|
|
|
.build(); |
|
|
|
|
} catch (IOException e) { |
|
|
|
|
log.error("geometry json read error : {}", e.getMessage()); |
|
|
|
|
} |
|
|
|
@ -389,9 +400,11 @@ public class AirspaceUtils {
|
|
|
|
|
@Data |
|
|
|
|
@NoArgsConstructor |
|
|
|
|
@AllArgsConstructor |
|
|
|
|
@Builder |
|
|
|
|
public static class FeatureInfo { |
|
|
|
|
private String name; |
|
|
|
|
private String description; |
|
|
|
|
private String type; |
|
|
|
|
private Double lowElev; |
|
|
|
|
private Double highElev; |
|
|
|
|
private Geometry geometry; |
|
|
|
|