Changeset 15456 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2019-10-13T22:10:29+02:00 (5 years ago)

Author:

wiktorn

Message:

Allow zoom in TMS layer up to 24.

See: #18064

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• AbstractTileSourceLayer.java (modified) (1 diff)
• TMSLayer.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -150 +150 @@
     /** maximum zoom level supported */
     public static final int MAX_ZOOM = 30;
-    /** minium zoom level supported */
+    /** minimum zoom level supported */
     public static final int MIN_ZOOM = 2;
     private static final Font InfoFont = new Font("sansserif", Font.BOLD, 13);

trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

@@ -7 +7 @@
 
 import org.apache.commons.jcs.access.CacheAccess;
+import org.openstreetmap.gui.jmapviewer.JMapViewer;
 import org.openstreetmap.gui.jmapviewer.OsmMercator;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
@@ -12 +13 @@
 import org.openstreetmap.gui.jmapviewer.tilesources.ScanexTileSource;
 import org.openstreetmap.gui.jmapviewer.tilesources.TMSTileSource;
-import org.openstreetmap.gui.jmapviewer.tilesources.TemplatedTMSTileSource;
 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
 import org.openstreetmap.josm.data.imagery.CachedAttributionBingAerialTileSource;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
+import org.openstreetmap.josm.data.imagery.JosmTemplatedTMSTileSource;
 import org.openstreetmap.josm.data.imagery.TMSCachedTileLoader;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
@@ -45 +46 @@
     public static final BooleanProperty PROP_ADD_TO_SLIPPYMAP_CHOOSER = new BooleanProperty(PREFERENCE_PREFIX + ".add_to_slippymap_chooser",
             true);
+    /** override minimum/maximum zoom level with those supported by JMapViewer, as these might be used in slippymap chooser */
+    public static final int MAX_ZOOM = JMapViewer.MAX_ZOOM;
+    public static final int MIN_ZOOM = JMapViewer.MIN_ZOOM;
 
     private static final ScaleList nativeScaleList = initNativeScaleList();
@@ -112 +116 @@
     public static TMSTileSource getTileSourceStatic(ImageryInfo info, Runnable attributionLoadedTask) {
         if (info.getImageryType() == ImageryType.TMS) {
-            TemplatedTMSTileSource.checkUrl(info.getUrl());
-            TMSTileSource t = new TemplatedTMSTileSource(info);
+            JosmTemplatedTMSTileSource.checkUrl(info.getUrl());
+            TMSTileSource t = new JosmTemplatedTMSTileSource(info);
             info.setAttribution(t);
             return t;