Changeset 13733 in josm for trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

Timestamp:

2018-05-12T14:18:57+02:00 (8 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/gui/layer/AbstractTileSourceLayer.java (modified) (4 diffs)

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

@@ -203 +203 @@
     // prepared to be moved to the painter
     protected TileCoordinateConverter coordinateConverter;
+    private final long minimumTileExpire;
 
     /**
@@ -214 +215 @@
         getFilterSettings().addFilterChangeListener(this);
         getDisplaySettings().addSettingsChangeListener(this);
+        this.minimumTileExpire = info.getMinimumTileExpire();
     }
 
@@ -274 +276 @@
         Map<String, String> headers = getHeaders(tileSource);
 
-        tileLoader = getTileLoaderFactory().makeTileLoader(this, headers);
+        tileLoader = getTileLoaderFactory().makeTileLoader(this, headers, minimumTileExpire);
 
         try {
@@ -1759 +1761 @@
         public PrecacheTask(ProgressMonitor progressMonitor) {
             this.progressMonitor = progressMonitor;
-            this.tileLoader = getTileLoaderFactory().makeTileLoader(this, getHeaders(tileSource));
+            this.tileLoader = getTileLoaderFactory().makeTileLoader(this, getHeaders(tileSource), minimumTileExpire);
             if (this.tileLoader instanceof TMSCachedTileLoader) {
                 ((TMSCachedTileLoader) this.tileLoader).setDownloadExecutor(