Changeset 5876 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/handler

Timestamp:

2013-04-17T20:14:32+02:00 (11 years ago)

Author:

akks

Message:

Remote control: allow adding tags without confirmation for current session (add_tags), see #8612
added parsing of request headers and detecting request sender by IP and "referer" HTTP header

Location:

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

Files:

• AddNodeHandler.java (modified) (2 diffs)
• AddWayHandler.java (modified) (2 diffs)
• LoadAndZoomHandler.java (modified) (2 diffs)
• LoadObjectHandler.java (modified) (2 diffs)
• RequestHandler.java (modified) (2 diffs)

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

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.remotecontrol.AddTagsDialog;
 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
 import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
@@ -90 +91 @@
         }
         // parse parameter addtags=tag1=value1|tag2=vlaue2
-        LoadAndZoomHandler.addTags(args);
+        AddTagsDialog.addTags(args, sender);        
     }
 

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

@@ -20 +20 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.remotecontrol.AddTagsDialog;
 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
 import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
@@ -53 +54 @@
         });
         // parse parameter addtags=tag1=value1|tag2=value2
-        LoadAndZoomHandler.addTags(args);        
+        AddTagsDialog.addTags(args, sender);        
     }
 

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

@@ -6 +6 @@
 import java.awt.geom.Area;
 import java.awt.geom.Rectangle2D;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Future;
@@ -191 +188 @@
         }
 
-        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")) {
-            GuiHelper.executeByMainWorkerInEDT(new Runnable() {
-
-                public void run() {
-                    String[] tags = null;
-                    try {
-                        tags = URLDecoder.decode(args.get("addtags"), "UTF-8").split("\\|");
-                    } catch (UnsupportedEncodingException e) {
-                        throw new RuntimeException();
-                    }
-                    Set<String> tagSet = new HashSet<String>();
-                    for (String tag : tags) {
-                        if (!tag.trim().isEmpty() && tag.contains("=")) {
-                            tagSet.add(tag.trim());
-                        }
-                    }
-                    if (!tagSet.isEmpty()) {
-                        String[][] keyValue = new String[tagSet.size()][2];
-                        int i = 0;
-                        for (String tag : tagSet) {
-                            // support a  =   b===c as "a"="b===c"
-                            String [] pair = tag.split("\\s*=\\s*",2); 
-                            keyValue[i][0] = pair[0];
-                            keyValue[i][1] = pair.length<2 ? "": pair[1];
-                            i++;
-                        }
-    
-                        new AddTagsDialog(keyValue).showDialog();
-                    }
-                }
-            });
-        }
+        AddTagsDialog.addTags(args, sender);
     }
 

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

@@ -10 +10 @@
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.remotecontrol.AddTagsDialog;
 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
 
@@ -48 +49 @@
                 public void run() {
                     Main.main.getCurrentDataSet().setSelected(ps);
-                    LoadAndZoomHandler.addTags(args);
+                    AddTagsDialog.addTags(args, sender);        
                     ps.clear();
                 }

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

@@ -43 +43 @@
     /** will be filled with the command assigned to the subclass */
     protected String myCommand;
+    
+    /**
+     * who send th request?
+     * the host from refrerer header or IP of request sender
+     */
+    protected String sender;
 
     /**
@@ -242 +248 @@
     }
 
+    public void setSender(String sender) {
+        this.sender = sender;
+    }
+ 
     public static class RequestHandlerException extends Exception {