Changeset 26235 in osm for applications/viewer/jmapviewer/src/org/openstreetmap

Timestamp:

2011-07-01T09:30:04+02:00 (13 years ago)

Author:

stoecker

Message:

improve TMS zoom handling

Location:

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources

Files:

• TMSTileSource.java (modified) (1 diff)
• TemplatedTMSTileSource.java (modified) (2 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TMSTileSource.java

@@ -3 +3 @@
 
 public class TMSTileSource extends AbstractOsmTileSource {
-    private int maxZoom;
+    protected int maxZoom;
+    protected int minZoom = 0;
 
     public TMSTileSource(String name, String url, int maxZoom) {
         super(name, url);
         this.maxZoom = maxZoom;
+    }
+
+    public TMSTileSource(String name, String url, int minZoom, int maxZoom) {
+        super(name, url);
+        this.minZoom = minZoom;
+        this.maxZoom = maxZoom;
+    }
+
+    @Override
+    public int getMinZoom() {
+        return (minZoom == 0) ? super.getMinZoom() : minZoom;
     }
 

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java

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