Changeset 36233 in osm for applications/editors/josm/plugins/reverter/src

Timestamp:

2024-03-28T15:04:04+01:00 (14 months ago)

Author:

taylor.smock

Message:

Fix #23582: Reverter plugin reverts nodes that were not modified by the reverted changeset

File:

• applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java (modified) (4 diffs)

applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java

@@ -504 +504 @@
 
     public void fixNodesWithoutCoordinates(ProgressMonitor progressMonitor) throws OsmTransferException {
-        Collection<Node> nodes = nds.getNodes();
+        Collection<Node> nodes = new ArrayList<>(nds.getNodes());
         int num = nodes.size();
         progressMonitor.beginTask(addChangesetIdPrefix(
@@ -510 +510 @@
                 // downloads == num ticks, then we get the downloaded data (1 tick), then we process the nodes (num ticks)
                 2 * num + 1);
+
+        // Remove primitives where we already know the LatLon.
+        nodes.removeIf(n -> {
+            PrimitiveId id = n.getPrimitiveId();
+            OsmPrimitive p = ds.getPrimitiveById(id);
+            return !(p instanceof Node) || ((Node) p).isLatLonKnown();
+        });
+        progressMonitor.worked(num - nodes.size());
 
         // Do bulk version fetches first
@@ -526 +534 @@
                 versionMap.replaceAll((key, value) -> value - 1);
                 versionMap.values().removeIf(i -> i <= 0);
-                ds.update(() -> {
-                    for (Node n : nodes) {
-                        if (!n.isDeleted() && !n.isLatLonKnown()) {
-                            final Node historyNode = (Node) history.getPrimitiveById(n);
-                            if (historyNode != null && historyNode.isLatLonKnown()
-                                    && changeset.getClosedAt().isAfter(historyNode.getInstant())) {
-                                n.load(historyNode.save());
-                                versionMap.remove(n.getUniqueId());
-                                progressMonitor.worked(1);
-                            }
-                        }
-                        if (progressMonitor.isCanceled()) {
-                            break;
-                        }
-                    }
-                });
+                ds.update(() -> updateNodes(progressMonitor, nodes, versionMap, history));
                 if (progressMonitor.isCanceled()) {
                     break;
@@ -548 +541 @@
         } finally {
             progressMonitor.finishTask();
+        }
+    }
+
+    /**
+     * Update nodes lacking a lat/lon
+     * @param progressMonitor The monitor to update
+     * @param nodes The nodes to update
+     * @param versionMap The version map to update for the next round
+     * @param history The history dataset
+     */
+    private void updateNodes(ProgressMonitor progressMonitor, Collection<Node> nodes, Map<Long, Integer> versionMap, DataSet history) {
+        for (Node n : nodes) {
+            if (!n.isDeleted() && !n.isLatLonKnown()) {
+                final Node historyNode = (Node) history.getPrimitiveById(n);
+                if (historyNode != null && historyNode.isLatLonKnown()
+                        && changeset.getClosedAt().isAfter(historyNode.getInstant())) {
+                    n.load(historyNode.save());
+                    versionMap.remove(n.getUniqueId());
+                    progressMonitor.worked(1);
+                }
+            }
+            if (progressMonitor.isCanceled()) {
+                break;
+            }
         }
     }