Changeset 5700 in josm for trunk/src

Timestamp:

2013-02-08T12:12:23+01:00 (12 years ago)

Author:

stoecker

Message:

remove hardcoded created_by

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/DuplicateWay.java (modified) (5 diffs)
• gui/conflict/tags/CombinePrimitiveResolverDialog.java (modified) (1 diff)
• gui/conflict/tags/TagConflictResolutionUtil.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java

@@ -35 +35 @@
 {
 
+    /**
+      * Class to store a way reduced to coordinates and keys. Essentially this is used to call the
+      * <code>equals{}</code> function.
+      */
     private static class WayPair {
         public List<LatLon> coor;
@@ -57 +61 @@
     }
 
+    /**
+      * Class to store a way reduced to coordinates. Essentially this is used to call the
+      * <code>equals{}</code> function.
+      */
     private static class WayPairNoTags {
         public List<LatLon> coor;
@@ -74 +82 @@
     }
 
+    /** Test identification for exactly identical ways (coordinates and tags). */
     protected static final int DUPLICATE_WAY = 1401;
+    /** Test identification for identical ways (coordinates only). */
     protected static final int SAME_WAY = 1402;
 
@@ -93 +103 @@
                 tr("This test checks that there are no ways with same node coordinates and optionally also same tags."));
     }
-
 
     @Override
@@ -145 +154 @@
 
     /**
-     * Remove uninteresting keys, like created_by to normalize the tags
+     * Remove uninteresting discardable keys to normalize the tags
      * @param wkeys The tags of the way, obtained by {@code Way#getKeys}
      */
     public void removeUninterestingKeys(Map<String, String> wkeys) {
-        wkeys.remove("created_by");
+        for(String key : OsmPrimitive.getDiscardableKeys()) {
+            wkeys.remove(key);
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

@@ -253 +253 @@
             cmds.addAll(buildTagChangeCommand(targetPrimitive, allResolutions));
         }
-        if (targetPrimitive.get("created_by") != null) {
-            cmds.add(new ChangePropertyCommand(targetPrimitive, "created_by", null));
+        for(String p : targetPrimitive.getDiscardableKeys()) {
+            if (targetPrimitive.get(p) != null) {
+                cmds.add(new ChangePropertyCommand(targetPrimitive, p, null));
+            }
         }
 

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java

@@ -33 +33 @@
         // remove irrelevant tags
         //
-        tc.removeByKey("created_by");
+        for(String key : OsmPrimitive.getDiscardableKeys()) {
+            tc.removeByKey(key);
+        }
 
         int numNodesWithTags = 0;