Changeset 33374 in osm for applications/editors/josm/plugins

Timestamp:

2017-06-06T00:23:42+02:00 (7 years ago)

Author:

donvip

Message:

fix #josm12640 - undelete plugin does not work if an object has redactions in its history

File:

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

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

@@ -71 +71 @@
 
                         HistoryOsmPrimitive hPrimitive1 = h.getLatest();
-                        HistoryOsmPrimitive hPrimitive2;
+                        HistoryOsmPrimitive hPrimitive2 = null;
 
                         boolean visible = hPrimitive1.isVisible();
@@ -82 +82 @@
                             primitive = layer.data.getPrimitiveById(id, type);
                         } else {
+                            // We search n-1 version with redaction robustness
+                            int idx = 1;
+                            int n = h.getNumVersions();
+                            while (hPrimitive2 == null && idx < n) {
+                                hPrimitive2 =  h.getByVersion(n - idx++);
+                            }
                             if (type.equals(OsmPrimitiveType.NODE)) {
                                 // We get version and user from the latest version,
                                 // coordinates and tags from n-1 version
-                                hPrimitive2 = h.getByVersion(h.getNumVersions() - 1);
-
                                 Node node = new Node(id, (int) hPrimitive1.getVersion());
 
@@ -99 +103 @@
                                 // nodes and tags from n-1 version
                                 hPrimitive1 = h.getLatest();
-                                hPrimitive2 = h.getByVersion(h.getNumVersions() - 1);
 
                                 Way way = new Way(id, (int) hPrimitive1.getVersion());
@@ -119 +122 @@
                                 primitive = new Relation();
                                 hPrimitive1 = h.getLatest();
-                                hPrimitive2 = h.getByVersion(h.getNumVersions() - 1);
 
                                 Relation rel = new Relation(id, (int) hPrimitive1.getVersion());