Changeset 35381 in osm for applications/editors/josm/plugins/reverter

Timestamp:

2020-03-19T17:10:04+01:00 (5 years ago)

Author:

gerdp

Message:

fix #josm18929: reverter doesn't allow to revert changes to "uninteristing" tags like gpx:ele

File:

• applications/editors/josm/plugins/reverter/src/reverter/DataSetCommandMerger.java (modified) (3 diffs)

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

@@ -6 +6 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 
 import org.openstreetmap.josm.command.ChangeCommand;
@@ -14 +16 @@
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
+import org.openstreetmap.josm.data.osm.AbstractPrimitive;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -50 +53 @@
 
     private void addChangeCommandIfNotEquals(OsmPrimitive target, OsmPrimitive newTarget, boolean nominal) {
-        if (!target.hasEqualSemanticAttributes(newTarget) || target.isDeleted() != newTarget.isDeleted() || target.isVisible() != newTarget.isVisible()) {
-            cmds.add(new ChangeCommand(target, newTarget));
-            if (nominal) {
-                nominalRevertedPrimitives.add(target);
-            }
-            Logging.debug("Reverting "+target+" to "+newTarget);
-        }
+                if (target.isIncomplete() != newTarget.isIncomplete() || target.isDeleted() != newTarget.isDeleted()
+                                || target.isVisible() != newTarget.isVisible()
+                                || !getNonDiscardableTags(target).equals(getNonDiscardableTags(newTarget))) {
+                        cmds.add(new ChangeCommand(target, newTarget));
+                        if (nominal) {
+                                nominalRevertedPrimitives.add(target);
+                        }
+                        Logging.debug("Reverting " + target + " to " + newTarget);
+                }
+    }
+
+    private static Map<String, String> getNonDiscardableTags(OsmPrimitive p) {
+        Map<String, String> result = new HashMap<>();
+        for (Map.Entry<String, String> e : p.getKeys().entrySet()) {
+                if (!AbstractPrimitive.getDiscardableKeys().contains(e.getKey()))
+                        result.put(e.getKey(), e.getValue());
+        }
+        return result;
     }