Changeset 5445 in josm for trunk

Timestamp:

2012-08-15T15:06:01+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7963 - remotecontrol v1.4 : Add min_zoom and max_zoom parameters for /imagery command

Location:

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

Files:

• RemoteControl.java (modified) (2 diffs)
• handler/ImageryHandler.java (modified) (1 diff)

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

@@ -25 +25 @@
      */
     static final int protocolMajorVersion = 1;
-    static final int protocolMinorVersion = 3;
+    static final int protocolMinorVersion = 4;
 
     /**
-     * Returns an array of int values with major and minor API version
-     * and major and minor HTTP protocol version.
-     *
-     * The function returns an int[4] instead of an object with fields
-     * to avoid ClassNotFound errors with old versions of remotecontrol.
-     *
-     * @return array of integer version numbers:
-     *    apiMajorVersion (obsolete), apiMinorVersion (obsolete), protocolMajorVersion, protocolMajorVersion
-     */
-    @Deprecated
-    public int[] getVersion()
-    {
-        int versions[] = {1, 0, protocolMajorVersion, protocolMajorVersion};
-        return versions;
-    }
-
-    /**
-     * Start the remote control server
+     * Starts the remote control server
      */
     public static void start() {
@@ -52 +35 @@
 
     /**
-     * Add external external request handler.
+     * Adds external request handler.
      * Can be used by plugins that want to use remote control.
-     *
-     * @param handler The additional request handler.
+     * 
+     * @param command The command name.
+     * @param handlerClass The additional request handler.
      */
     public void addRequestHandler(String command, Class<? extends RequestHandler> handlerClass)

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

@@ -49 +49 @@
         String title = args.get("title");
         String type = args.get("type");
-        if ((title == null) || (title.length() == 0)) {
+        if ((title == null) || (title.isEmpty())) {
             title = tr("Remote imagery");
         }
         String cookies = args.get("cookies");
-        ImageryLayer imgLayer = ImageryLayer.create(new ImageryInfo(title, url, type, null, cookies));
-        Main.main.addLayer(imgLayer);
+        ImageryInfo imgInfo = new ImageryInfo(title, url, type, null, cookies);
+        String min_zoom = args.get("min_zoom");
+        if (min_zoom != null && !min_zoom.isEmpty()) {
+            try {
+                imgInfo.setDefaultMinZoom(Integer.parseInt(min_zoom));
+            } catch (NumberFormatException e) {
+                System.err.println(e.getMessage());
+            }
+        }
+        String max_zoom = args.get("max_zoom");
+        if (max_zoom != null && !max_zoom.isEmpty()) {
+            try {
+                imgInfo.setDefaultMaxZoom(Integer.parseInt(max_zoom));
+            } catch (NumberFormatException e) {
+                System.err.println(e.getMessage());
+            }
+        }
+        Main.main.addLayer(ImageryLayer.create(imgInfo));
     }