Changeset 4188 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2011-07-01T09:27:15+02:00 (13 years ago)

Author:

stoecker

Message:

improve TMS zoom handling

File:

• trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (modified) (6 diffs)

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

@@ -4 +4 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.openstreetmap.josm.io.OsmApi;
@@ -38 +40 @@
     double pixelPerDegree = 0.0;
     int maxZoom = 0;
+    int defaultMaxZoom = 0;
+    int defaultMinZoom = 0;
 
     public ImageryInfo(String name) {
@@ -135 +139 @@
         this.cookies=i.cookies;
         this.imageryType=i.imageryType;
+        this.defaultMaxZoom=i.defaultMaxZoom;
         this.pixelPerDegree=i.pixelPerDegree;
         this.eulaAcceptanceRequired = null;
@@ -169 +174 @@
         
         for (ImageryType type : ImageryType.values()) {
-            if (url.startsWith(type.getUrlString() + ":")) {
-                this.url = url.substring(type.getUrlString().length() + 1);
+            Matcher m = Pattern.compile(type.getUrlString()+"(?:\\[(?:(\\d+),)?(\\d+)\\])?:(.*)").matcher(url);
+            if(m.matches()) {
+                this.url = m.group(3);
                 this.imageryType = type;
+                if(m.group(2) != null) {
+                    defaultMaxZoom = Integer.valueOf(m.group(2));
+                    maxZoom = defaultMaxZoom;
+                }
+                if(m.group(1) != null) {
+                    defaultMinZoom = Integer.valueOf(m.group(1));
+                }
                 return;
             }
@@ -205 +218 @@
     }
 
+    public int getMinZoom() {
+        return this.defaultMinZoom;
+    }
+
     public String getFullUrl() {
-        return imageryType.getUrlString() + ":" + url;
+        return imageryType.getUrlString() + (defaultMaxZoom != 0
+            ? "["+(defaultMinZoom != 0 ? defaultMinZoom+",":"")+defaultMaxZoom+"]" : "") + ":" + url;
     }
 
@@ -223 +241 @@
         if(pixelPerDegree != 0.0) {
             res += " ("+pixelPerDegree+")";
-        } else if(maxZoom != 0) {
+        } else if(maxZoom != 0 && maxZoom != defaultMaxZoom) {
             res += " (z"+maxZoom+")";
         }