support format with no height values

yankee42 · Apr 11, 2019 · 2fc8ad8 · 2fc8ad8
1 parent dac5017
commit 2fc8ad8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/src/main/java/com/github/yankee42/courseconvert/CourseOsmConverter.java b/src/main/java/com/github/yankee42/courseconvert/CourseOsmConverter.java
@@ -90,15 +90,18 @@ private static Node toOsmNode(final CourseWaypoint waypoint) {
                 toMap(entry -> COURSE_PREFIX + entry.getKey(), Map.Entry::getValue)
             )
         );
-        node.getTags().put("height", String.valueOf(waypoint.getHeight()));
+        if (waypoint.getHeight() != null) {
+            node.getTags().put("height", String.valueOf(waypoint.getHeight()));
+        }
         return node;
     }
 
     public static CourseWaypoint toCourseWaypoint(final Node node) {
+        final String height = node.getTags().get("height");
         return new CourseWaypoint(
             degreeToMeter(node.getLon()),
             degreeToMeter(node.getLat() * -1),
-            Double.parseDouble(node.getTags().get("height")),
+            height == null ? null : Double.parseDouble(height),
             node.getTags().entrySet()
                 .stream()
                 .filter(entry -> entry.getKey().startsWith(COURSE_PREFIX))

diff --git a/src/main/java/com/github/yankee42/courseconvert/CourseWaypoint.java b/src/main/java/com/github/yankee42/courseconvert/CourseWaypoint.java
@@ -16,30 +16,33 @@ public class CourseWaypoint {
     }
     private double x;
     private double y;
-    private double height;
-    private Map<String, String> properties = new HashMap<>();
+    private Double height;
+    private Map<String, String> properties;
 
-    public CourseWaypoint(final double x, final double y, final double height, final Map<String, String> properties) {
+    public CourseWaypoint(final double x, final double y, final Double height, final Map<String, String> properties) {
         this.x = x;
         this.y = y;
         this.height = height;
         this.properties = properties;
     }
 
     public static CourseWaypoint fromElement(final Element element) {
-        double x = 0, y = 0, height = 0;
+        double x = 0, y = 0;
+        Double height = null;
         final Map<String, String> properties = new HashMap<>();
         for (final Attribute attribute : element.getAttributes()) {
             if (attribute.getName().equals("pos")) {
                 final String[] values = attribute.getValue().split(" ");
-                if (values.length != 3) {
+                if (values.length != 2 && values.length != 3) {
                     throw new RuntimeException(
                         "Cannot parse position <" + attribute.getValue() + "> in element <" + element.getName() + ">"
                     );
                 }
                 x = Double.parseDouble(values[0]);
-                y = Double.parseDouble(values[2]);
-                height = Double.parseDouble(values[1]);
+                y = Double.parseDouble(values[values.length - 1]);
+                if (values.length == 3) {
+                    height = Double.parseDouble(values[1]);
+                }
             } else {
                 properties.put(attribute.getName(), attribute.getValue());
             }
@@ -63,11 +66,11 @@ public void setY(final double y) {
         this.y = y;
     }
 
-    public double getHeight() {
+    public Double getHeight() {
         return height;
     }
 
-    public void setHeight(final double height) {
+    public void setHeight(final Double height) {
         this.height = height;
     }
 
@@ -81,7 +84,11 @@ public void setProperties(final Map<String, String> properties) {
 
     public Element toJdom(final long number) {
         final Element element = new Element("waypoint" + number);
-        element.setAttribute("pos", String.format(Locale.US, "%1$.2f %2$.2f %3$.2f", x, height, y));
+        if (height == null) {
+            element.setAttribute("pos", String.format(Locale.US, "%1$.2f %2$.2f", x, y));
+        } else {
+            element.setAttribute("pos", String.format(Locale.US, "%1$.2f %2$.2f %3$.2f", x, height, y));
+        }
         properties.forEach(element::setAttribute);
         return element;
     }