Index: /trunk/src/org/openstreetmap/josm/command/SplitWayCommand.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/command/SplitWayCommand.java (revision 17374)
+++ /trunk/src/org/openstreetmap/josm/command/SplitWayCommand.java (revision 17375)
@@ -467,5 +467,5 @@
if (rValue.warnme) warnings.add(WarningType.GENERIC);
insert = rValue.insert;
- c = rValue.relation;
+ c = rValue.relation; // Value.relation is null or contains a modified copy
} else if (!isOrderedRelation) {
// Warn the user when relations that are not a route or multipolygon are modified as a result
@@ -473,9 +473,9 @@
warnings.add(WarningType.GENERIC);
}
- if (c == null) {
- c = new Relation(r);
- }
if (insert) {
+ if (c == null) {
+ c = new Relation(r);
+ }
if (rm.hasRole() && !nowarnroles.contains(rm.getRole())) {
warnings.add(WarningType.ROLE);
@@ -818,11 +818,10 @@
c.addMember(new RelationMember(role, res));
c.removeMembersFor(way);
- relationInformation.insert = false;
}
- } else {
- relationInformation.insert = false;
}
} else if (!"via".equals(role)) {
relationInformation.warnme = true;
+ } else {
+ relationInformation.insert = true;
}
relationInformation.relation = c;
Index: /trunk/test/data/regress/20163/data-20163.osm
===================================================================
--- /trunk/test/data/regress/20163/data-20163.osm (revision 17375)
+++ /trunk/test/data/regress/20163/data-20163.osm (revision 17375)
@@ -0,0 +1,443 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/test/unit/org/openstreetmap/josm/command/SplitWayCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/SplitWayCommandTest.java (revision 17374)
+++ /trunk/test/unit/org/openstreetmap/josm/command/SplitWayCommandTest.java (revision 17375)
@@ -396,3 +396,41 @@
}
}
+
+ /**
+ * Non-regression test for issue #20163 (Split way corrupts relation when splitting via way)
+ *
+ * @throws IOException if any I/O error occurs
+ * @throws IllegalDataException if OSM parsing fails
+ */
+ @Test
+ void testTicket20163() throws IOException, IllegalDataException {
+ try (InputStream is = TestUtils.getRegressionDataStream(20163, "data-20163.osm")) {
+ DataSet ds = OsmReader.parseDataSet(is, null);
+
+ Way splitWay = (Way) ds.getPrimitiveById(757606841L, OsmPrimitiveType.WAY);
+ Node splitNode = splitWay.getNode(1);
+ Relation r = (Relation) ds.getPrimitiveById(10452821L, OsmPrimitiveType.RELATION);
+ assertEquals(3, r.getMembersCount());
+ assertFalse(r.getMembersFor(Collections.singleton(splitWay)).isEmpty());
+ assertEquals(1, r.getMembers().stream().filter(rm -> "via".equals(rm.getRole())).count());
+ assertEquals("via", r.getMembersFor(Collections.singleton(splitWay)).iterator().next().getRole());
+ final Optional result = SplitWayCommand.splitWay(
+ splitWay,
+ SplitWayCommand.buildSplitChunks(splitWay, Collections.singletonList(splitNode)),
+ new ArrayList<>(),
+ Strategy.keepLongestChunk(),
+ // This split requires additional downloads but problem occured before the download
+ SplitWayCommand.WhenRelationOrderUncertain.SPLIT_ANYWAY
+ );
+
+ // Should not result in aborting the split.
+ assertTrue(result.isPresent());
+ result.get().executeCommand();
+
+ assertTrue(r.isModified());
+ assertEquals(4, r.getMembersCount());
+ assertEquals(2, r.getMembers().stream().filter(rm -> "via".equals(rm.getRole())).count());
+ }
+ }
+
}