Changeset 13733 in josm for trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java

Timestamp:

2018-05-12T14:18:57+02:00 (6 years ago)

Author:

wiktorn

Message:

Imagery definition refactor

Extend imagery definitions by:

• allowing setting default layers for WMS_ENDPOINT and WMTS
• allowing setting minimum expires time for tile for this imagery
• allowing setting custom headers that will be sent for all requests

(get map, get capabilities) for this imagery

Additional changes in code:

• use TileJobOptions to pass miscellaneous options to loaders
• refactor WMSImagery to use SAX parser

See: #15981, #7953, #16224, #15940, #16249

File:

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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.imagery;
 
-import java.util.Map;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
@@ -27 +26 @@
 
     protected final ICacheAccess<String, BufferedImageCacheEntry> cache;
-    protected final int connectTimeout;
-    protected final int readTimeout;
-    protected final Map<String, String> headers;
     protected final TileLoaderListener listener;
 
@@ -50 +46 @@
 
     private ThreadPoolExecutor downloadExecutor = DEFAULT_DOWNLOAD_JOB_DISPATCHER;
+    protected final TileJobOptions options;
 
     /**
      * Constructor
      * @param listener          called when tile loading has finished
-     * @param cache              of the cache
-     * @param connectTimeout    to remote resource
-     * @param readTimeout       to remote resource
-     * @param headers           HTTP headers to be sent along with request
+     * @param cache             of the cache
+     * @param options           tile job options
      */
     public TMSCachedTileLoader(TileLoaderListener listener, ICacheAccess<String, BufferedImageCacheEntry> cache,
-            int connectTimeout, int readTimeout, Map<String, String> headers) {
+           TileJobOptions options) {
         CheckParameterUtil.ensureParameterNotNull(cache, "cache");
         this.cache = cache;
-        this.connectTimeout = connectTimeout;
-        this.readTimeout = readTimeout;
-        this.headers = headers;
+        this.options = options;
         this.listener = listener;
     }
@@ -98 +91 @@
     @Override
     public TileJob createTileLoaderJob(Tile tile) {
-        return new TMSCachedTileLoaderJob(listener, tile, cache,
-                connectTimeout, readTimeout, headers, getDownloadExecutor());
+        return new TMSCachedTileLoaderJob(
+                listener,
+                tile,
+                cache,
+                options,
+                getDownloadExecutor());
     }