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

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

@@ -13 +13 @@
 import org.openstreetmap.josm.data.imagery.WMSCachedTileLoader;
 import org.openstreetmap.josm.data.imagery.WMTSTileSource;
+import org.openstreetmap.josm.data.imagery.WMTSTileSource.WMTSGetCapabilitiesException;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -64 +65 @@
             }
             return null;
-        } catch (IOException e) {
+        } catch (IOException | WMTSGetCapabilitiesException e) {
             Logging.warn(e);
             throw new IllegalArgumentException(e);