Changeset 8602 in josm for trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java

Timestamp:

2015-07-14T21:58:01+02:00 (11 years ago)

Author:

wiktorn

Message:

Properly handle file based tile sources.

• move getThreadFactory(String name) to Utils class, so it's easily usable across JOSM
• rollback changes in [8485]
• detect that we are working with filesystem TileSource in AbstractTileSourceLayer and if so, do not use JCS as caching mechanism, as tiles are already local
• change return value of getTileSourceInfo in AbstractTileSourceLayer to AbstractTMSTileSource, as this is anyway - lowest we can work with
• add test data for testing file base tile sources

closes: #11548

File:

• trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java (modified) (2 diffs)

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

@@ -8 +8 @@
 import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
-import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
+import org.openstreetmap.gui.jmapviewer.tilesources.AbstractTMSTileSource;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
@@ -48 +48 @@
 
     @Override
-    protected TileSource getTileSource(ImageryInfo info) {
+    protected AbstractTMSTileSource getTileSource(ImageryInfo info) {
         try {
             if (info.getImageryType() == ImageryType.WMTS && info.getUrl() != null) {