Changeset 35396 in osm for applications/editors/josm

Timestamp:

2020-03-26T08:24:51+01:00 (5 years ago)

Author:

gerdp

Message:

fix #josm16390: Can't undelete/restore a node when changeset contains multiple versions of it
When searching for the version that should be restored, ignore those which have visible=false

File:

• applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/UndeleteAction.java (modified) (3 diffs)

applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/UndeleteAction.java

@@ -83 +83 @@
 
                         HistoryOsmPrimitive hPrimitive1 = h.getLatest();
-                        HistoryOsmPrimitive hPrimitive2 = null;
 
                         boolean visible = hPrimitive1.isVisible();
@@ -103 +102 @@
                             restored.add(primitive);
                         } else {
-                            // We search n-1 version with redaction robustness
+                            // We search latest visible version < n with redaction robustness
                             long idx = 1;
                             long n = hPrimitive1.getVersion();
-                            while (hPrimitive2 == null && idx < n) {
+                            HistoryOsmPrimitive hPrimitive2 = null;
+                            while (idx < n) {
                                 hPrimitive2 = h.getByVersion(n - idx++);
+                                if (hPrimitive2 != null && hPrimitive2.isVisible()) {
+                                    // don't restore an invisible object
+                                    break;
+                                }
                             }
                             if (type == OsmPrimitiveType.NODE) {
                                 // We get version and user from the latest version,
-                                // coordinates and tags from n-1 version
+                                // coordinates and tags from latest visible version < n
                                 Node node = new Node(id, (int) hPrimitive1.getVersion());
 
@@ -122 +126 @@
                             } else if (type == OsmPrimitiveType.WAY) {
                                 // We get version and user from the latest version,
-                                // nodes and tags from n-1 version
+                                // nodes and tags from latest visible version < n
                                 hPrimitive1 = h.getLatest();