Changeset 16324 in josm for trunk

Timestamp:

2020-04-17T21:04:57+02:00 (4 years ago)

Author:

simon04

Message:

fix #11310 - Support setting changeset tags during /import call

Location:

trunk/src/org/openstreetmap/josm/io/remotecontrol

Files:

• RemoteControl.java (modified) (1 diff)
• handler/ImportHandler.java (modified) (2 diffs)
• handler/LoadAndZoomHandler.java (modified) (3 diffs)

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

@@ -32 +32 @@
      */
     static final int protocolMajorVersion = 1;
-    static final int protocolMinorVersion = 8;
+    static final int protocolMinorVersion = 9;
 
     /**

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

@@ -49 +49 @@
                 }
             }
+            LoadAndZoomHandler.parseChangesetTags(args);
         } catch (RuntimeException ex) { // NOPMD
             Logging.warn("RemoteControl: Error parsing import remote control request:");
@@ -63 +64 @@
     @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"};
     }
 

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

@@ -10 +10 @@
 import java.util.Collections;
 import java.util.LinkedHashSet;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Future;
@@ -226 +227 @@
 
         // This comes before the other changeset tags, so that they can be overridden
-        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"))) {
-                        ds.addChangeSetTag(key[0], key[1]);
-                    }
-                }
-            });
-        }
+        parseChangesetTags(args);
 
         // add changeset tags after download if necessary
@@ -272 +264 @@
     }
 
+    static void parseChangesetTags(Map<String, String> args) {
+        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"))) {
+                        ds.addChangeSetTag(key[0], key[1]);
+                    }
+                }
+            });
+        }
+    }
+
     protected void zoom(Collection<OsmPrimitive> primitives, final Bounds bbox) {
         if (!PermissionPrefWithDefault.CHANGE_VIEWPORT.isAllowed()) {