Changeset 17375 in josm

Timestamp:

2020-11-29T10:57:33+01:00 (3 years ago)

Author:

GerdP

Message:

fix #20163: Split way corrupts relation when splitting via way

• if via way in turn restriction is split we have to insert new member

Location:

trunk

Files:

• src/org/openstreetmap/josm/command/SplitWayCommand.java (modified) (3 diffs)
• test/data/regress/20163 (added)
• test/data/regress/20163/data-20163.osm (added)
• test/unit/org/openstreetmap/josm/command/SplitWayCommandTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/SplitWayCommand.java

@@ -467 +467 @@
                         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 +473 @@
                         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 +818 @@
                     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;

trunk/test/unit/org/openstreetmap/josm/command/SplitWayCommandTest.java

@@ -396 +396 @@
         }
     }
+
+    /**
+     * 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<SplitWayCommand> 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());
+        }
+    }
+
 }