Changeset 8598 in josm for trunk/src/org/openstreetmap/josm/data/imagery/CachedTileLoaderFactory.java

Timestamp:

2015-07-12T23:55:18+02:00 (9 years ago)

Author:

wiktorn

Message:

TileSource:

• added method - getTileId that returns unique identifier for the tile, that should not collide with other tile sources
• added JavaDocs

JCSCacheManager:

• moved from object count limit to object size limit
• fixed bug with unnecessary re-creation of auxilary cache, that could result in cache corruption/loss of current cache data

CachedTileLoaderFactory, WMSCachedTileLoader, TMSCachedTileLoader

• un-abstract CachedTileLoaderFactory, use reflection to create TileLoaders
• adjust constructors

TMSCachedTileLoader, AbstractCachedTileSourceLayer:

• move cache related settings to AbstractCachedTileSourceLayer
• move cache instation to AbstractCachedTileSourceLayer
• make "flush tile cache" command clear only one tile source

TMSCachedTileLoaderJob:

• make "flush tile cache" command clear only one tile source
• reorder methods

TemplatedWMSTileSource:

• java docs
• inline of private methods: getTileXMax, getTileYMax
• fix sonar issues
• make WMS layer zoom levels closer to TMS (addresses: #11459)

WMTSTileSource:

• fix Sonar issues
• use topLeftCorner in X/Y tile max calculations instead of world bounds (fixes issues with WMTS-es, for which topLeftCorner lies outside projection world bounds)

AbstractTileSourceLayer:

• draw warning, when min-zoom-level is set, and tiles are not loaded due to too many tiles on screen

TMSLayer, WMSLayer, WMTSLayer:

• expose access to cache object for ImageryPreferences

CacheContentsPanel:

• add panel for managing cache regions and tile sources within the regions

CommonSettingsPanel, TMSSettingsPanel:

• move settings common to all imagery layers from TMSSettingsPanel to CommonSettingsPanel

File:

• trunk/src/org/openstreetmap/josm/data/imagery/CachedTileLoaderFactory.java (modified) (4 diffs)

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

@@ -3 +3 @@
 
 import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
+import org.apache.commons.jcs.access.behavior.ICacheAccess;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
 import org.openstreetmap.josm.data.preferences.StringProperty;
 
@@ -19 +22 @@
  * @since 8526
  */
-public abstract class CachedTileLoaderFactory implements TileLoaderFactory {
+public class CachedTileLoaderFactory implements TileLoaderFactory {
     /**
      * Keeps the cache directory where
      */
     public static final StringProperty PROP_TILECACHE_DIR = getTileCacheDir();
-    private String cacheName;
+    private ICacheAccess<String, BufferedImageCacheEntry> cache;
+    private Constructor<? extends TileLoader> tileLoaderConstructor;
 
     /**
-     * @param cacheName name of the cache region, that the created loader will use
+     * @param cache cache instance which will be used by tile loaders created by this tile loader
+     * @param tileLoaderClass tile loader class that will be created
+     *
      */
-    public CachedTileLoaderFactory(String cacheName) {
-        this.cacheName = cacheName;
+    public CachedTileLoaderFactory(ICacheAccess<String, BufferedImageCacheEntry> cache, Class<? extends TileLoader> tileLoaderClass) {
+        this.cache = cache;
+        try {
+            tileLoaderConstructor = tileLoaderClass.getConstructor(
+                    TileLoaderListener.class,
+                    ICacheAccess.class,
+                    int.class,
+                    int.class,
+                    Map.class);
+        } catch (NoSuchMethodException | SecurityException e) {
+            Main.warn(e);
+            throw new RuntimeException(e);
+        }
     }
 
@@ -50 +67 @@
     @Override
     public TileLoader makeTileLoader(TileLoaderListener listener, Map<String, String> inputHeaders) {
-        Map<String, String> headers = new HashMap<>();
+        Map<String, String> headers = new ConcurrentHashMap<>();
         headers.put("User-Agent", Version.getInstance().getFullAgentString());
         headers.put("Accept", "text/html, image/png, image/jpeg, image/gif, */*");
@@ -56 +73 @@
             headers.putAll(inputHeaders);
 
-        try {
-            return getLoader(listener, cacheName,
-                    Main.pref.getInteger("socket.timeout.connect", 15) * 1000,
-                    Main.pref.getInteger("socket.timeout.read", 30) * 1000,
-                    headers,
-                    PROP_TILECACHE_DIR.get());
-        } catch (IOException e) {
-            Main.warn(e);
-        }
-        return null;
+        return getLoader(listener, cache,
+                Main.pref.getInteger("socket.timeout.connect", 15) * 1000,
+                Main.pref.getInteger("socket.timeout.read", 30) * 1000,
+                headers);
     }
 
-    protected abstract TileLoader getLoader(TileLoaderListener listener, String cacheName, int connectTimeout, int readTimeout,
-            Map<String, String> headers, String cacheDir) throws IOException;
+    protected TileLoader getLoader(TileLoaderListener listener, ICacheAccess<String, BufferedImageCacheEntry> cache,
+            int connectTimeout, int readTimeout, Map<String, String> headers) {
+        try {
+            return tileLoaderConstructor.newInstance(
+                    listener,
+                    cache,
+                    connectTimeout,
+                    readTimeout,
+                    headers);
+        } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+            Main.warn(e);
+            throw new RuntimeException(e);
+        }
+    }
 }