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

Timestamp:

2012-01-21T11:27:17+01:00 (12 years ago)

Author:

simon04

Message:

fix #5324 - remotecontrol: add ways (e.g., /add_way?way=lat1,lon2;lat2,lon2)

Location:

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

Files:

• RequestProcessor.java (modified) (2 diffs)
• handler/AddNodeHandler.java (modified) (3 diffs)
• handler/AddWayHandler.java (added)
• handler/LoadObjectHandler.java (modified) (2 diffs)

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

@@ -16 +16 @@
 
 import org.openstreetmap.josm.io.remotecontrol.handler.AddNodeHandler;
+import org.openstreetmap.josm.io.remotecontrol.handler.AddWayHandler;
 import org.openstreetmap.josm.io.remotecontrol.handler.ImageryHandler;
 import org.openstreetmap.josm.io.remotecontrol.handler.ImportHandler;
@@ -116 +117 @@
         addRequestHandlerClass(ImageryHandler.command, ImageryHandler.class, true);
         addRequestHandlerClass(AddNodeHandler.command, AddNodeHandler.class, true);
+        addRequestHandlerClass(AddWayHandler.command, AddWayHandler.class, true);
         addRequestHandlerClass(ImportHandler.command, ImportHandler.class, true);
         addRequestHandlerClass(VersionHandler.command, VersionHandler.class, true);

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

@@ -5 +5 @@
 
 import java.util.HashMap;
-
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -38 +38 @@
 
     @Override
-    public PermissionPrefWithDefault getPermissionPref()
-    {
+    public PermissionPrefWithDefault getPermissionPref() {
         return new PermissionPrefWithDefault(permissionKey, permissionDefault,
                 "RemoteControl: creating objects forbidden by preferences");
@@ -62 +61 @@
         Main.main.undoRedo.add(new AddCommand(nnew));
         Main.main.getCurrentDataSet().setSelected(nnew);
-        Main.map.mapView.repaint();
+        if (Main.pref.getBoolean(LoadAndZoomHandler.changeViewportPermissionKey, LoadAndZoomHandler.changeViewportPermissionDefault)) {
+            new AutoScaleAction("selection").actionPerformed(null);
+        } else {
+            Main.map.mapView.repaint();
+        }
     }
 }

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

@@ -1 +1 @@
 package org.openstreetmap.josm.io.remotecontrol.handler;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.LinkedList;
@@ -38 +40 @@
     @Override
     public String getPermissionMessage() {
-        return "";
+        return tr("Remote Control has been asked to load objects (specified by their id) from the API.");
     }
 }