Changeset 24544 in osm for applications

Timestamp:

2010-12-03T04:37:35+01:00 (14 years ago)

Author:

yellowbkpk

Message:

Adding per-layer max zoom for TMS layers.

Location:

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

Files:

• ImageryInfo.java (modified) (5 diffs)
• ImageryPreferenceEditor.java (modified) (5 diffs)
• tms/TMSLayer.java (modified) (2 diffs)
• tms/TMSPreferences.java (modified) (1 diff)
• tms/TMSTileSource.java (modified) (1 diff)
• tms/TemplatedTMSTileSource.java (added)

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

@@ -31 +31 @@
     ImageryType imageryType = ImageryType.WMS;
     double pixelPerDegree = 0.0;
+    int maxZoom = 0;
 
     public ImageryInfo(String name) {
@@ -66 +67 @@
         if(url != null && !url.isEmpty()) e2 = getFullURL();
         if(cookies != null && !cookies.isEmpty()) e3 = cookies;
-        if(pixelPerDegree != 0.0) e4 = String.valueOf(pixelPerDegree);
+        if(imageryType == ImageryType.WMS) {
+            if(pixelPerDegree != 0.0) e4 = String.valueOf(pixelPerDegree);
+        } else {
+            if(maxZoom != 0) e4 = String.valueOf(maxZoom);
+        }
         if(e4 != null && e3 == null) e3 = "";
         if(e3 != null && e2 == null) e2 = "";
@@ -83 +88 @@
         if(array.size() >= 2) setURL(array.get(1));
         if(array.size() >= 3) this.cookies=array.get(2);
-        if(array.size() >= 4) this.pixelPerDegree=Double.valueOf(array.get(3));
+        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));
     }
 
@@ -148 +154 @@
     }
 
+    public int getMaxZoom() {
+        return this.maxZoom;
+    }
+
     public String getFullURL() {
         return imageryType.getUrlString() + ":" + url;
@@ -165 +175 @@
         if(pixelPerDegree != 0.0)
             res += " ("+pixelPerDegree+")";
+        else if(maxZoom != 0)
+            res += " (z"+maxZoom+")";
         return res;
     }

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

@@ -40 +40 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
+import org.openstreetmap.josm.plugins.imagery.ImageryInfo.ImageryType;
 import org.openstreetmap.josm.plugins.imagery.tms.TMSPreferences;
 import org.openstreetmap.josm.plugins.imagery.wms.AddWMSLayerPanel;
@@ -73 +74 @@
             public String getToolTipText(MouseEvent e) {
                 java.awt.Point p = e.getPoint();
-                return (String) model.getValueAt(rowAtPoint(p), columnAtPoint(p));
+                return model.getValueAt(rowAtPoint(p), columnAtPoint(p)).toString();
             }
         };
@@ -397 +398 @@
                 return info.getFullURL();
             case 2:
-                return info.pixelPerDegree == 0.0 ? "" : info.pixelPerDegree;
+                return (info.imageryType == ImageryType.WMS) ? (info.pixelPerDegree == 0.0 ? "" : info.pixelPerDegree)
+                                                             : (info.maxZoom == 0 ? "" : info.maxZoom);
             }
             return null;
@@ -410 +412 @@
             case 1:
                 info.setURL((String)o);
+            case 2:
+                if(info.imageryType == ImageryType.WMS)
+                    info.pixelPerDegree = Double.parseDouble((String) o);
+                else
+                    info.maxZoom = Integer.parseInt((String) o);
             }
         }
@@ -415 +422 @@
         @Override
         public boolean isCellEditable(int row, int column) {
-            return (column != 2);
+            return true;
         }
     }

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/tms/TMSLayer.java

@@ -183 +183 @@
 
         if (info.getImageryType() == ImageryType.TMS) {
-            initTileSource(new TMSTileSource(info.getName(),info.getURL()));
+            if(isUrlWithPatterns(info.getURL())) {
+                initTileSource(new TemplatedTMSTileSource(info.getName(), info.getURL(), info.getMaxZoom()));
+            } else {
+                initTileSource(new TMSTileSource(info.getName(),info.getURL(), info.getMaxZoom()));
+            }
         } else if (info.getImageryType() == ImageryType.BING) {
             initTileSource(new BingAerialTileSource());
@@ -358 +362 @@
             }
         });
+    }
+
+    public static boolean isUrlWithPatterns(String url) {
+        return url != null && url.contains("{") && url.contains("}");
     }
 

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/tms/TMSPreferences.java

@@ -59 +59 @@
             maxZoomLvl = PROP_MIN_ZOOM_LVL.get();
         }
-        if (ts != null && ts.getMaxZoom() < maxZoomLvl) {
-            System.err.println("decreasing maxZoomLvl to match tile source");
+        if (ts != null && ts.getMaxZoom() != 0) {
             maxZoomLvl = ts.getMaxZoom();
         }

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/tms/TMSTileSource.java

@@ -4 +4 @@
 
 public class TMSTileSource extends OsmTileSource.AbstractOsmTileSource {
-    public TMSTileSource(String name, String url) {
+    private int maxZoom;
+
+    public TMSTileSource(String name, String url, int maxZoom) {
         super(name, url);
+        this.maxZoom = maxZoom;
     }
+
+    @Override
+    public int getMaxZoom() {
+        return (maxZoom == 0) ? super.getMaxZoom() : maxZoom;
+    }
+
     @Override
     public TileUpdate getTileUpdate() {