Changeset 17320 in josm for trunk

Timestamp:

2020-11-17T01:55:12+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #20066 - NPE with nodes without coordinates

File:

• trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java (modified) (2 diffs)

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

@@ -121 +121 @@
             LatLon ll = n.getCoor();
             if (ll != null) {
-                geomObj.add("coordinates", getCoorArray(null, n.getCoor()));
+                geomObj.add("coordinates", getCoorArray(null, ll));
             }
         }
@@ -154 +154 @@
                 final JsonArrayBuilder polygon = Json.createArrayBuilder();
                 Stream.concat(mp.a.stream(), mp.b.stream())
-                        .map(p -> getCoorsArray(p.getNodes())
-                                // since first node is not duplicated as last node
-                                .add(getCoorArray(null, p.getNodes().get(0).getCoor())))
+                        .map(p -> {
+                            JsonArrayBuilder array = getCoorsArray(p.getNodes());
+                            LatLon ll = p.getNodes().get(0).getCoor();
+                            // since first node is not duplicated as last node
+                            return ll != null ? array.add(getCoorArray(null, ll)) : array;
+                            })
                         .forEach(polygon::add);
                 geomObj.add("type", "MultiPolygon");