Changeset 16311 in josm for trunk

Timestamp:

2020-04-15T22:40:32+02:00 (4 years ago)

Author:

simon04

Message:

fix #19041 - GeoJSONReader: reuse node on same at same position to

Avoids multiple nodes on top of each other. Avoid creating unconnected polygons.

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/GeoJSONReader.java (modified) (4 diffs)
• test/data/geo.json (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/GeoJSONReaderTest.java (modified) (3 diffs)

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

@@ -24 +24 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.BBox;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -267 +268 @@
 
     private Node createNode(final LatLon latlon) {
+        final List<Node> existingNodes = getDataSet().searchNodes(new BBox(latlon, latlon));
+        if (!existingNodes.isEmpty()) {
+            // reuse existing node, avoid multiple nodes on top of each other
+            return existingNodes.get(0);
+        }
         final Node node = new Node(latlon);
         getDataSet().addPrimitive(node);
@@ -277 +283 @@
         }
 
-        final List<LatLon> latlons = coordinates.stream().map(
-                coordinate -> getLatLon(coordinate.asJsonArray())).collect(Collectors.toList());
+        final List<LatLon> latlons = coordinates.stream()
+                .map(coordinate -> getLatLon(coordinate.asJsonArray()))
+                .collect(Collectors.toList());
 
         final int size = latlons.size();
@@ -295 +302 @@
 
         final Way way = new Way();
-        way.setNodes(latlons.stream().map(Node::new).collect(Collectors.toList()));
+        getDataSet().addPrimitive(way);
+        way.setNodes(latlons.stream().map(this::createNode).collect(Collectors.toList()));
         if (doAutoclose) {
             way.addNode(way.getNode(0));
         }
-
-        way.getNodes().stream().distinct().forEach(it -> getDataSet().addPrimitive(it));
-        getDataSet().addPrimitive(way);
 
         return Optional.of(way);

trunk/test/data/geo.json

@@ -22 +22 @@
                     [
                         102.0,
-                        0.0
+                        0.5
                     ],
                     [

trunk/test/unit/org/openstreetmap/josm/io/GeoJSONReaderTest.java

@@ -46 +46 @@
                 .doParseDataSet(in, null)
                 .getPrimitives(it -> true));
-            assertEquals(21, primitives.size());
+            assertEquals(20, primitives.size());
 
             final Node node1 = new Node(new LatLon(0.5, 102.0));
@@ -56 +56 @@
 
             final Way way1 = new Way();
-            way1.addNode(new Node(new LatLon(0, 102)));
+            way1.addNode(new Node(new LatLon(0.5, 102.0)));
             way1.addNode(new Node(new LatLon(1, 103)));
             way1.addNode(new Node(new LatLon(0, 104)));
@@ -66 +66 @@
             assertEquals("valueB", foundWay1.get().get("propB"));
             assertEquals("0.0", foundWay1.get().get("propB2"));
+            assertEquals(foundNode1.get(), ((Way) foundWay1.get()).firstNode());
+            assertEquals("valueA", ((Way) foundWay1.get()).firstNode().get("propA"));
 
             final Way way2 = new Way();