Changeset 18200 in josm for trunk/src/org

Timestamp:

2021-09-08T01:02:58+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21256 - RemoteControl: Don't add empty changeset tags to the dataset (patch by taylor.smock):

• RemoteControl no longer adds "" to the dataset changesets (for changeset_ keys). Instead, it passes null to the map
• DataSet#addChangesetTag now accepts a null value, which removes the key from the map

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DataSet.java (modified) (1 diff)
• io/remotecontrol/handler/LoadAndZoomHandler.java (modified) (1 diff)

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

@@ -388 +388 @@
      */
     public void addChangeSetTag(String k, String v) {
-        this.changeSetTags.put(k, v);
+        if (v != null) {
+            this.changeSetTags.put(k, v);
+        } else {
+            this.changeSetTags.remove(k);
+        }
     }
 

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java

@@ -255 +255 @@
                     for (String tag : Arrays.asList("changeset_comment", "changeset_source", "changeset_hashtags")) {
                         if (args.containsKey(tag)) {
-                            ds.addChangeSetTag(tag.substring("changeset_".length()), args.get(tag));
+                            final String tagKey = tag.substring("changeset_".length());
+                            final String value = args.get(tag);
+                            if (!Utils.isStripEmpty(value)) {
+                                ds.addChangeSetTag(tagKey, value);
+                            } else {
+                                ds.addChangeSetTag(tagKey, null);
+                            }
                         }
                     }