Changeset 16471 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java

Timestamp:

2020-05-21T00:29:28+02:00 (4 years ago)

Author:

simon04

Message:

fix #19269 - Remote control: addtags= broken

Regression of r16328.

File:

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

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

@@ -12 +12 @@
 import java.awt.event.MouseEvent;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -264 +265 @@
         if (args.containsKey("addtags")) {
             GuiHelper.executeByMainWorkerInEDT(() -> {
-                addTags(parseUrlTagsToKeyValues(args.get("addtags")), sender, primitives);
+                String[][] tags = parseUrlTagsToKeyValues(args.get("addtags"))
+                        .entrySet().stream()
+                        .map(e -> new String[]{e.getKey(), e.getValue()})
+                        .toArray(String[][]::new);
+                addTags(tags, sender, primitives);
             });
         }
@@ -276 +281 @@
      */
     public static Map<String, String> parseUrlTagsToKeyValues(String urlSection) {
-        return TextTagParser.readTagsByRegexp(urlSection, "\\|", "(.*?)=(.*?)", false);
+        Map<String, String> tags = TextTagParser.readTagsByRegexp(urlSection, "\\|", "(.*?)=(.*?)", false);
+        return tags == null ? Collections.emptyMap() : tags;
     }