Changeset 9961 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-03-11T14:13:23+01:00 (9 years ago)

Author:

simon04

Message:

fix #12599 - Added/deleted "uninteresting" tags are "reverted" by downloading area again (unit test by Don-vip)

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• DataSetMerger.java (modified) (1 diff)
• OsmPrimitive.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

@@ -357 +357 @@
             // target is same as source but target is modified
             // => keep target and reset modified flag if target and source are semantically equal
-            if (target.hasEqualSemanticAttributes(source)) {
+            if (target.hasEqualSemanticAttributes(source, false)) {
                 target.setModified(false);
             }

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -1238 +1238 @@
      */
     public boolean hasEqualSemanticAttributes(OsmPrimitive other) {
+        return hasEqualSemanticAttributes(other, true);
+    }
+
+    boolean hasEqualSemanticAttributes(final OsmPrimitive other, final boolean testInterestingTagsOnly) {
         if (!isNew() &&  id != other.id)
             return false;
         if (isIncomplete() ^ other.isIncomplete()) // exclusive or operator for performance (see #7159)
             return false;
-        // can't do an equals check on the internal keys array because it is not ordered
-        //
-        return hasSameInterestingTags(other);
+        return testInterestingTagsOnly ? hasSameInterestingTags(other) : getKeys().equals(other.getKeys());
     }