Changeset 17054 in josm

Timestamp:

2020-09-23T09:11:16+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19833: Duplicated way nodes after GeoJSON import

• filter duplicated nodes before creating an OSM way

File:

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

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

@@ -11 +11 @@
 import java.io.StringReader;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -295 +296 @@
         if (size > 1) {
             if (latlons.get(0).equals(latlons.get(size - 1))) {
-                // Remove last coordinate, but later add first node to the end
-                latlons.remove(size - 1);
-                doAutoclose = true;
+                doAutoclose = false; // already closed
             } else {
                 doAutoclose = autoClose;
@@ -307 +306 @@
         final Way way = new Way();
         getDataSet().addPrimitive(way);
-        way.setNodes(latlons.stream().map(this::createNode).collect(Collectors.toList()));
+        final List<Node> rawNodes = latlons.stream().map(this::createNode).collect(Collectors.toList());
         if (doAutoclose) {
-            way.addNode(way.getNode(0));
-        }
+            rawNodes.add(rawNodes.get(0));
+        }
+        // see #19833: remove duplicated references to the same node
+        final List<Node> wayNodes = new ArrayList<>(rawNodes.size());
+        Node last = null;
+        for (Node curr : rawNodes) {
+            if (last != curr)
+                wayNodes.add(curr);
+            last = curr;
+        }
+        way.setNodes(wayNodes);
 
         return Optional.of(way);