Changeset 24680 in osm for applications/editors

Timestamp:

2010-12-10T14:40:30+01:00 (14 years ago)

Author:

upliner

Message:

fix #j5718 - remember Bing zoomlevel

Location:

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery

Files:

• ImageryInfo.java (modified) (2 diffs)
• ImageryProvidersPanel.java (modified) (2 diffs)
• wms/WMSLayer.java (modified) (3 diffs)

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryInfo.java

@@ -67 +67 @@
         if(url != null && !url.isEmpty()) e2 = getFullURL();
         if(cookies != null && !cookies.isEmpty()) e3 = cookies;
-        if(imageryType == ImageryType.WMS) {
+        if(imageryType == ImageryType.WMS || imageryType == ImageryType.HTML) {
             if(pixelPerDegree != 0.0) e4 = String.valueOf(pixelPerDegree);
         } else {
@@ -88 +88 @@
         if(array.size() >= 2) setURL(array.get(1));
         if(array.size() >= 3) this.cookies=array.get(2);
-        if(imageryType == ImageryType.WMS && array.size() >= 4) this.pixelPerDegree=Double.valueOf(array.get(3));
-        if(imageryType == ImageryType.TMS && array.size() >= 4) this.maxZoom=Integer.valueOf(array.get(3));
+        if(array.size() >= 4) {
+            if (imageryType == ImageryType.WMS || imageryType == ImageryType.HTML) {
+                this.pixelPerDegree=Double.valueOf(array.get(3));
+            } else {
+                this.maxZoom=Integer.valueOf(array.get(3));
+            }
+        }
     }
 

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryProvidersPanel.java

@@ -193 +193 @@
                 return info.getFullURL();
             case 2:
-                return (info.imageryType == ImageryType.WMS) ? (info.pixelPerDegree == 0.0 ? "" : info.pixelPerDegree)
-                                                             : (info.maxZoom == 0 ? "" : info.maxZoom);
+                return (info.imageryType == ImageryType.WMS || info.imageryType == ImageryType.HTML) ?
+                        (info.pixelPerDegree == 0.0 ? "" : info.pixelPerDegree) :
+                            (info.maxZoom == 0 ? "" : info.maxZoom);
             default:
                 throw new ArrayIndexOutOfBoundsException();
@@ -214 +215 @@
                 info.maxZoom = 0;
                 try {
-                    if(info.imageryType == ImageryType.WMS)
+                    if(info.imageryType == ImageryType.WMS || info.imageryType == ImageryType.HTML)
                         info.pixelPerDegree = Double.parseDouble((String) o);
                     else

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java

@@ -139 +139 @@
     }
 
-
     @Override
     public void destroy() {
@@ -166 +165 @@
     }
 
+    @Override public ImageryInfo getInfo() {
+        return info;
+    }
+
     @Override public String getToolTipText() {
         if(autoDownloadEnabled)
@@ -171 +174 @@
         else
             return tr("WMS layer ({0}), downloading in zoom {1}", getName(), resolution);
-    }
-
-    @Override public boolean isMergable(Layer other) {
-        return false;
-    }
-
-    @Override public void mergeFrom(Layer from) {
     }