Changeset 5095 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2012-03-17T21:45:59+01:00 (12 years ago)

Author:

simon04

Message:

fix #7518 - Remote Control "load_object" doesn't work with addtags

Location:

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

Files:

• LoadAndZoomHandler.java (modified) (4 diffs)
• LoadObjectHandler.java (modified) (1 diff)

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

@@ -9 +9 @@
 import java.net.URLDecoder;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.concurrent.Future;
 
@@ -181 +182 @@
         }
 
-        /*
-         * parse addtags parameters
-         * Example URL (part):
-         * addtags=wikipedia:de%3DResidenzschloss Dresden|name:en%3DDresden Castle
-         */
+        addTags(args);
+
+    }
+
+    /*
+     * parse addtags parameters Example URL (part):
+     * addtags=wikipedia:de%3DResidenzschloss Dresden|name:en%3DDresden Castle
+     */
+    static void addTags(final Map<String, String> args) {
         if (args.containsKey("addtags")) {
             Main.worker.execute(new Runnable() {
+
                 public void run() {
                     String[] tags = null;
@@ -196 +202 @@
                     }
                     String[][] keyValue = new String[tags.length][2];
-                    for (int i = 0; i<tags.length; i++) {
+                    for (int i = 0; i < tags.length; i++) {
                         keyValue[i] = tags[i].split("=");
 
@@ -207 +213 @@
             });
         }
-
     }
 

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

@@ -36 +36 @@
         boolean relationMembers = Boolean.parseBoolean(args.get("relation_members"));
         DownloadPrimitiveAction.processItems(newLayer, ps, true, relationMembers);
+        LoadAndZoomHandler.addTags(args);
     }