Index: trunk/test/data/regress/18385/data.osm
===================================================================
--- trunk/test/data/regress/18385/data.osm (revision 15555)
+++ trunk/test/data/regress/18385/data.osm (revision 15555)
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java (revision 15539)
+++ trunk/test/unit/org/openstreetmap/josm/actions/CombineWayActionTest.java (revision 15555)
@@ -3,4 +3,5 @@
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import java.io.IOException;
@@ -46,5 +47,5 @@
DataSet ds = OsmReader.parseDataSet(is, null);
NodeGraph graph = NodeGraph.createNearlyUndirectedGraphFromNodeWays(ds.getWays());
- List path = graph.buildSpanningPath();
+ List path = graph.buildSpanningPathNoRemove();
assertEquals(10, path.size());
Set firstAndLastObtained = new HashSet<>();
@@ -55,4 +56,19 @@
firstAndLastExpected.add(35213705L);
assertEquals(firstAndLastExpected, firstAndLastObtained);
+ }
+ }
+
+ /**
+ * Non-regression test for bug #1835 (combine way with overlapping ways)
+ * @throws IOException if any I/O error occurs
+ * @throws IllegalDataException if OSM parsing fails
+ */
+ @Test
+ public void testTicket18385() throws IOException, IllegalDataException {
+ try (InputStream is = TestUtils.getRegressionDataStream(18385, "data.osm")) {
+ DataSet ds = OsmReader.parseDataSet(is, null);
+ NodeGraph graph = NodeGraph.createNearlyUndirectedGraphFromNodeWays(ds.getWays());
+ List path = graph.buildSpanningPathNoRemove();
+ assertNull(path);
}
}