Ticket #11310: 11310.patch

src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java

@@ -40 +40 @@
      * changes.
      */
     static final int protocolMajorVersion = 1;
-    static final int protocolMinorVersion = 8;
+    static final int protocolMinorVersion = 9;
 
     /**
      * Starts the remote control server

src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java

@@ -11 +11 @@
 
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadTask;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.io.remotecontrol.AddTagsDialog;
 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
@@ -48 +50 @@
                     task.loadUrl(getDownloadParams(), url.toExternalForm(), null);
                 }
             }
+            if (args.containsKey("changeset_tags")) {
+                MainApplication.worker.submit(() -> {
+                    DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+                    if (ds != null) {
+                        for (String[] key : AddTagsDialog.parseUrlTagsToKeyValues(args.get("changeset_tags"))) {
+                            if (!ds.getChangeSetTags().containsKey(key[0])) {
+                                ds.addChangeSetTag(key[0], key[1]);
+                            }
+                        }
+                    }
+                });
+            }
         } catch (RuntimeException ex) { // NOPMD
             Logging.warn("RemoteControl: Error parsing import remote control request:");
             Logging.error(ex);
@@ -62 +76 @@
 
     @Override
     public String[] getOptionalParams() {
-        return new String[] {"new_layer", "layer_name", "layer_locked", "download_policy", "upload_policy"};
+        return new String[] {"new_layer", "layer_name", "layer_locked", "download_policy", "upload_policy", "changeset_tags"};
     }
 
     @Override

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

@@ -87 +87 @@
     public String[] getOptionalParams() {
         return new String[] {"new_layer", "layer_name", "addtags", "select", "zoom_mode",
                 "changeset_comment", "changeset_source", "changeset_hashtags", "search",
-                "layer_locked", "download_policy", "upload_policy"};
+                "layer_locked", "download_policy", "upload_policy", "changeset_tags"};
     }
 
     @Override