Changeset 13733 in josm for trunk/src/org/openstreetmap/josm/data/imagery/WMSCachedTileLoaderJob.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/WMSCachedTileLoaderJob.java (modified) (2 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.imagery;
 
-import java.util.Map;
 import java.util.concurrent.ThreadPoolExecutor;
 
@@ -23 +22 @@
      * @param tile to load
      * @param cache to use (get/put)
-     * @param connectTimeout to tile source
-     * @param readTimeout to tile source
-     * @param headers to be sent with request
+     * @param options options for tile job
      * @param downloadExecutor that will execute the download task (if needed)
      */
-    public WMSCachedTileLoaderJob(TileLoaderListener listener, Tile tile,
-            ICacheAccess<String, BufferedImageCacheEntry> cache, int connectTimeout, int readTimeout,
-            Map<String, String> headers, ThreadPoolExecutor downloadExecutor) {
-        super(listener, tile, cache, connectTimeout, readTimeout, headers, downloadExecutor);
+    public WMSCachedTileLoaderJob(TileLoaderListener listener,
+            Tile tile,
+            ICacheAccess<String, BufferedImageCacheEntry> cache,
+            TileJobOptions options,
+            ThreadPoolExecutor downloadExecutor) {
+        super(listener, tile, cache, options, downloadExecutor);
     }