Changeset 16802 in josm for trunk

Timestamp:

2020-07-22T09:21:48+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19568: Don't complain about highway ending near other highway for railway platforms

• treat highway node that is connected to a railway=platform like one connected to a building.

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java (modified) (1 diff)
• test/data/regress/19568 (added)
• test/data/regress/19568/data.osm (added)
• test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java

@@ -102 +102 @@
                     || n.isKeyTrue("noexit")
                     || n.hasKey("entrance", "barrier")
-                    || n.getParentWays().stream().anyMatch(Test::isBuilding);
+                    || n.getParentWays().stream().anyMatch(p -> isBuilding(p) || p.hasTag(RAILWAY, "platform"));
         }
     }

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java

@@ -119 +119 @@
         }
     }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/19568">Bug #19568</a>.
+     * @throws IOException if any I/O error occurs
+     * @throws IllegalDataException if the OSM data cannot be parsed
+     * @throws FileNotFoundException if the data file cannot be found
+     */
+    @Test
+    public void testTicket19568() throws IOException, IllegalDataException, FileNotFoundException {
+        try (InputStream fis = TestUtils.getRegressionDataStream(19568, "data.osm")) {
+            final DataSet ds = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE);
+            MainApplication.getLayerManager().addLayer(new OsmDataLayer(ds, null, null));
+
+            bib.startTest(null);
+            bib.setBeforeUpload(false);
+            bib.visit(ds.allPrimitives());
+            bib.endTest();
+            assertThat(bib.getErrors(), isEmpty());
+        }
+    }
 }