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

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

@@ -44 +44 @@
                     TileLoaderListener.class,
                     ICacheAccess.class,
-                    int.class,
-                    int.class,
-                    Map.class);
+                    TileJobOptions.class
+                    );
         } catch (NoSuchMethodException | SecurityException e) {
             Logging.log(Logging.LEVEL_WARN, "Unable to initialize cache tile loader factory", e);
@@ -64 +63 @@
 
     @Override
-    public TileLoader makeTileLoader(TileLoaderListener listener, Map<String, String> inputHeaders) {
+    public TileLoader makeTileLoader(TileLoaderListener listener, Map<String, String> inputHeaders, long minimumExpiryTime) {
         Map<String, String> headers = new ConcurrentHashMap<>();
         headers.put("User-Agent", Version.getInstance().getFullAgentString());
@@ -72 +71 @@
 
         return getLoader(listener, cache,
-                (int) TimeUnit.SECONDS.toMillis(Config.getPref().getInt("socket.timeout.connect", 15)),
-                (int) TimeUnit.SECONDS.toMillis(Config.getPref().getInt("socket.timeout.read", 30)),
-                headers);
+                new TileJobOptions(
+                        (int) TimeUnit.SECONDS.toMillis(Config.getPref().getInt("socket.timeout.connect", 15)),
+                        (int) TimeUnit.SECONDS.toMillis(Config.getPref().getInt("socket.timeout.read", 30)),
+                        headers,
+                        minimumExpiryTime
+                        )
+                );
     }
 
     protected TileLoader getLoader(TileLoaderListener listener, ICacheAccess<String, BufferedImageCacheEntry> cache,
-            int connectTimeout, int readTimeout, Map<String, String> headers) {
+            TileJobOptions options) {
         try {
             return tileLoaderConstructor.newInstance(
                     listener,
                     cache,
-                    connectTimeout,
-                    readTimeout,
-                    headers);
+                    options
+                    );
         } catch (IllegalArgumentException e) {
             Logging.warn(e);