Changeset 36142 in osm for applications/editors/josm/plugins/reltoolbox/src

Timestamp:

2023-09-18T19:27:57+02:00 (14 months ago)

Author:

taylor.smock

Message:

See #23170: Better behavior around undo/redo, only delete ways with one referrer

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java (modified) (3 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java

@@ -64 +64 @@
         boolean wont = false;
         for (RelationMember m : r.getMembers()) {
-            if (m.isWay() && m.getWay().getReferrers().size() == 1) {
+            if (m.isWay()) {
                 ways.add(m.getWay());
             } else {
@@ -157 +157 @@
             tags.remove("type");
 
-            // then delete ways that are not relevant (do not take part in other relations of have strange tags)
+            // then delete ways that are not relevant (do not take part in other relations or have strange tags)
             Way candidateWay = null;
             for (Way w : p.ways) {
-                if (w.getReferrers().equals(relations)) {
+                if (w.getReferrers().size() == 1) {
                     // check tags that remain
                     Set<String> keys = new HashSet<>(w.keySet());
@@ -192 +192 @@
         // only delete the relation if it hasn't been re-used
         if (!relationReused) {
-            commands.add(relationDeleteCommand);
+            // The relation needs to be deleted first, so that undo/redo continue to work properly
+            commands.add(0, relationDeleteCommand);
         }