Ticket #7915: discard_tags.patch

src/org/openstreetmap/josm/actions/UploadAction.java

@@ -13 +13 @@
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.upload.ApiPreconditionCheckerHook;
+import org.openstreetmap.josm.actions.upload.DiscardTagsHook;
 import org.openstreetmap.josm.actions.upload.RelationUploadOrderHook;
 import org.openstreetmap.josm.actions.upload.UploadHook;
 import org.openstreetmap.josm.actions.upload.ValidateUploadHook;
@@ -60 +61 @@
          * Adjusts the upload order of new relations
          */
         uploadHooks.add(new RelationUploadOrderHook());
+
+        /**
+         * Removes discardable tags like created_by on modified objects
+         */
+        uploadHooks.add(new DiscardTagsHook());
     }
 
     /**

src/org/openstreetmap/josm/actions/upload/DiscardTagsHook.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.upload;
+
+import java.util.AbstractMap;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.ChangePropertyCommand;
+import org.openstreetmap.josm.data.APIDataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+
+/**
+ * Removes discardable tags such as created_by from all modified objects before upload
+ */
+public class DiscardTagsHook implements UploadHook {
+
+    public boolean checkUpload(APIDataSet apiDataSet) {
+        List<OsmPrimitive> objectsToUpload = apiDataSet.getPrimitives();
+
+        Collection<String> discardableKeys = OsmPrimitive.getDiscardableKeys();
+        AbstractMap<String, String> foo = new HashMap<String, String>();
+        for (String string : discardableKeys) {
+            foo.put(string, null);
+        }
+
+        ChangePropertyCommand removeKeys = new ChangePropertyCommand(objectsToUpload, foo);
+        Main.main.undoRedo.add(removeKeys);
+
+        return true;
+    }
+
+}

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

@@ -610 +610 @@
 
 
     private static volatile Collection<String> uninteresting = null;
+    private static volatile Collection<String> discardable = null;
     /**
      * Contains a list of "uninteresting" keys that do not make an object
      * "tagged".  Entries that end with ':' are causing a whole namespace to be considered
@@ -627 +628 @@
     }
 
     /**
+     * Returns a list of keys which have been deemed uninteresting to the point
+     * that they can be silently removed from data which is being edited.
+     * The first example of this is the "created_by" tag on map objects.
+     */
+    public static Collection<String> getDiscardableKeys() {
+        if(discardable == null) {
+            discardable = Main.pref.getCollection("tags.discardable",
+                    Arrays.asList(new String[]{"created_by",
+                            "tiger:upload_uuid", "tiger:tlid", "tiger:source", "tiger:separated",
+                            "geobase:datasetName", "geobase:uuid", "geobase:datasetName", "sub_sea:type"}));
+        }
+        return discardable;
+    }
+
+    /**
      * Returns true if key is considered "uninteresting".
      */
     public static boolean isUninterestingKey(String key) {

src/org/openstreetmap/josm/io/OsmWriter.java

@@ -218 +218 @@
             List<Entry<String, String>> entries = new ArrayList<Entry<String,String>>(osm.getKeys().entrySet());
             Collections.sort(entries, byKeyComparator);
             for (Entry<String, String> e : entries) {
-                if ((osm instanceof Changeset) || !("created_by".equals(e.getKey()))) {
-                    out.println("    <tag k='"+ XmlWriter.encode(e.getKey()) +
-                            "' v='"+XmlWriter.encode(e.getValue())+ "' />");
-                }
+                out.println("    <tag k='"+ XmlWriter.encode(e.getKey()) +
+                        "' v='"+XmlWriter.encode(e.getValue())+ "' />");
             }
             out.println("  </" + tagname + ">");
         } else if (tagOpen) {