Changeset 13109 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java

Timestamp:

2017-11-11T02:03:41+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15537 - Support changeset hashtags (hashtags changeset tag, extracted from comment at upload, or set by remote control through new changeset_hashtags parameter)

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java (modified) (3 diffs)

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

@@ -6 +6 @@
 import java.awt.geom.Area;
 import java.awt.geom.Rectangle2D;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -77 +78 @@
     @Override
     public String[] getOptionalParams() {
-        return new String[] {"new_layer", "layer_name", "addtags", "select", "zoom_mode", "changeset_comment", "changeset_source", "search"};
+        return new String[] {"new_layer", "layer_name", "addtags", "select", "zoom_mode",
+                "changeset_comment", "changeset_source", "changeset_hashtags", "search"};
     }
 
@@ -213 +215 @@
 
         // add changeset tags after download if necessary
-        if (args.containsKey("changeset_comment") || args.containsKey("changeset_source")) {
+        if (args.containsKey("changeset_comment") || args.containsKey("changeset_source") || args.containsKey("changeset_hashtags")) {
             MainApplication.worker.submit(() -> {
-                if (MainApplication.getLayerManager().getEditDataSet() != null) {
-                    if (args.containsKey("changeset_comment")) {
-                        MainApplication.getLayerManager().getEditDataSet().addChangeSetTag("comment", args.get("changeset_comment"));
-                    }
-                    if (args.containsKey("changeset_source")) {
-                        MainApplication.getLayerManager().getEditDataSet().addChangeSetTag("source", args.get("changeset_source"));
+                DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+                if (ds != null) {
+                    for (String tag : Arrays.asList("changeset_comment", "changeset_source", "changeset_hashtags")) {
+                        if (args.containsKey(tag)) {
+                            ds.addChangeSetTag(tag.substring("changeset_".length()), args.get(tag));
+                        }
                     }
                 }