Changeset 15499 in josm

Timestamp:

2019-11-03T15:00:47+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #18287 - more robust parsing of GeoJSON coordinates

File:

• trunk/src/org/openstreetmap/josm/io/GeoJSONReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/GeoJSONReader.java

@@ -7 +7 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.TreeMap;
@@ -13 +14 @@
 import javax.json.Json;
 import javax.json.JsonArray;
+import javax.json.JsonNumber;
 import javax.json.JsonObject;
 import javax.json.JsonString;
@@ -197 +199 @@
     private LatLon getLatLon(final JsonArray coordinates) {
         return projection.eastNorth2latlon(new EastNorth(
-                coordinates.getJsonNumber(0).doubleValue(),
-                coordinates.getJsonNumber(1).doubleValue()));
+                parseCoordinate(coordinates.get(0)),
+                parseCoordinate(coordinates.get(1))));
+    }
+
+    private static double parseCoordinate(JsonValue coordinate) {
+        if (coordinate instanceof JsonString) {
+            return Double.parseDouble(((JsonString) coordinate).getString());
+        } else if (coordinate instanceof JsonNumber) {
+            return ((JsonNumber) coordinate).doubleValue();
+        } else {
+            throw new IllegalArgumentException(Objects.toString(coordinate));
+        }
     }