Changeset 34883 in osm for applications

Timestamp:

2019-02-07T11:19:20+01:00 (6 years ago)

Author:

gerdp

Message:

improve undelete performance: don't download data for each node twice

File:

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

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

@@ -19 +19 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.NodeData;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -87 +88 @@
 
                         if (visible) {
-                            // If the object is not deleted we get the real object
-                            DownloadPrimitivesTask download = new DownloadPrimitivesTask(layer, Collections.singletonList(pid), true);
-                            download.setZoom(false);
-                            download.run();
-
-                            primitive = layer.data.getPrimitiveById(id, type);
+                            if (type == OsmPrimitiveType.NODE) {
+                                // we have all needed information in the history object
+                                primitive = new Node(hPrimitive1.getId());
+                                HistoryNode hNode = (HistoryNode) hPrimitive1;
+                                primitive.load(hNode.fillPrimitiveData(new NodeData()));
+                                layer.data.addPrimitive(primitive);
+                            } else {
+                                // If the way or relation is not deleted we get the real object
+                                DownloadPrimitivesTask download = new DownloadPrimitivesTask(layer, Collections.singletonList(pid), true);
+                                download.setZoom(false);
+                                download.run();
+                                primitive = layer.data.getPrimitiveById(id, type);
+                            }
                             restored.add(primitive);
                         } else {