Changeset 17408 in josm

Timestamp:

2020-12-14T11:52:24+01:00 (3 years ago)

Author:

GerdP

Message:

fix #20238: update multipolygon on old-style multipolygon action cannot be fully undone

• make sure that a command to update the relation is generated
• add unit test

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (modified) (2 diffs)
• test/data/regress/20238 (added)
• test/data/regress/20238/data.osm (added)
• test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

@@ -339 +339 @@
             return null;
         }
-        boolean unchanged = rr.a == rr.b;
+        boolean changedMembers = rr.a != rr.b;
         final Relation existingRelation = rr.a;
-        final Relation relation = rr.b;
+        final Relation relation = changedMembers ? rr.b : new Relation(rr.a);
 
         final List<Command> list = removeTagsFromWaysIfNeeded(relation);
@@ -349 +349 @@
             commandName = getName(false);
         } else {
-            if (!unchanged) {
-                if (relation.getKeys().equals(existingRelation.getKeys()))
-                    list.add(new ChangeMembersCommand(existingRelation, new ArrayList<>(relation.getMembers())));
-                else
-                    list.add(new ChangeCommand(existingRelation, relation));
+            boolean changedKeys = !relation.getKeys().equals(existingRelation.getKeys());
+            if (changedKeys && changedMembers)
+                list.add(new ChangeCommand(existingRelation, relation));
+            else if (changedMembers) {
+                list.add(new ChangeMembersCommand(existingRelation, new ArrayList<>(relation.getMembers())));
+            } else if (changedKeys) {
+                list.add(ChangePropertyCommand.build(existingRelation, relation));
             }
             if (list.isEmpty()) {
-                if (unchanged) {
+                if (!changedMembers) {
                     MultipolygonTest mpTest = new MultipolygonTest();
                     mpTest.visit(existingRelation);

trunk/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.java

@@ -191 +191 @@
         assertEquals(0, ds.getWays().stream().filter(w -> w.hasTag("building", "yes")).count());
     }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/20238">Bug #20238</a>.
+     * @throws Exception if an error occurs
+     */
+    @Test
+    void testTicket20238() throws Exception {
+        DataSet ds = OsmReader.parseDataSet(TestUtils.getRegressionDataStream(20238, "data.osm"), null);
+        assertEquals(1, ds.getRelations().size());
+        Relation mp = ds.getRelations().iterator().next();
+        assertFalse(ds.getRelations().iterator().next().hasTag("building", "yes"));
+        assertEquals(1, ds.getWays().stream().filter(w -> w.hasTag("building", "yes")).count());
+        Pair<SequenceCommand, Relation> cmd = CreateMultipolygonAction.createMultipolygonCommand(ds.getWays(), mp);
+        assertNotNull(cmd);
+        cmd.a.executeCommand();
+        assertEquals(1, ds.getRelations().size());
+        assertTrue(ds.getRelations().iterator().next().hasTag("building", "yes"));
+        assertEquals(0, ds.getWays().stream().filter(w -> w.hasTag("building", "yes")).count());
+        cmd.a.undoCommand();
+        assertEquals(1, ds.getRelations().size());
+        assertFalse(ds.getRelations().iterator().next().hasTag("building", "yes"));
+        assertEquals(1, ds.getWays().stream().filter(w -> w.hasTag("building", "yes")).count());
+    }
 }