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

Timestamp:

23.01.2012 18:37:24 (4 months ago)

Author:

bastiK

Message:

remotecontrol: add 'type' parameter for /imagery request (this should be extended further)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/ImageryInfo.java (modified) (3 diffs)
• io/remotecontrol/RemoteControl.java (modified) (1 diff)
• io/remotecontrol/handler/ImageryHandler.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -40 +40 @@
 
         private String urlString;
+
         ImageryType(String urlString) {
             this.urlString = urlString;
         }
+
         public String getUrlString() {
             return urlString;
+        }
+        
+        public static ImageryType fromUrlString(String s) {
+            for (ImageryType type : ImageryType.values()) {
+                if (type.getUrlString().equals(s)) {
+                    return type;
+                }
+            }
+            return null;
         }
     }
@@ -180 +191 @@
     }
 
+    public ImageryInfo(String name, String url, String type, String eulaAcceptanceRequired, String cookies) {
+        this.name=name;
+        setExtendedUrl(url);
+        ImageryType t = ImageryType.fromUrlString(type);
+        this.cookies=cookies;
+        if (t != null) {
+            this.imageryType = t;
+        }
+    }
+
     public ImageryInfo(String name, String url, String cookies, double pixelPerDegree) {
         this.name=name;
@@ -194 +215 @@
         cookies = e.cookies;
         eulaAcceptanceRequired = e.eula;
-        for (ImageryType type : ImageryType.values()) {
-            if (type.getUrlString().equals(e.type)) {
-                imageryType = type;
-                break;
-            }
-        }
+        imageryType = ImageryType.fromUrlString(e.type);
         if (imageryType == null) throw new IllegalArgumentException("unknown type");
         pixelPerDegree = e.pixel_per_eastnorth;

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

@@ -33 +33 @@
      */
     static final int protocolMajorVersion = 1;
-    static final int protocolMinorVersion = 2;
+    static final int protocolMinorVersion = 3;
 
     /**

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

@@ -44 +44 @@
         String url = args.get("url");
         String title = args.get("title");
+        String type = args.get("type");
         if((title == null) || (title.length() == 0))
         {
@@ -49 +50 @@
         }
         String cookies = args.get("cookies");
-        ImageryLayer imgLayer = ImageryLayer.create(new ImageryInfo(title, url, cookies));
+        ImageryLayer imgLayer = ImageryLayer.create(new ImageryInfo(title, url, type, null, cookies));
         Main.main.addLayer(imgLayer);
-
     }