Changeset 17408 in josm for trunk/src

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

File:

• trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (modified) (2 diffs)

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);