Changeset 11877 in josm for trunk

Timestamp:

2017-04-09T23:45:09+02:00 (7 years ago)

Author:

bastiK

Message:

see #7427 - WMTS: if no default layer specified, choose first available (fixes tests)

File:

• trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (modified) (1 diff)

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

@@ -282 +282 @@
         this.baseUrl = GetCapabilitiesParseHelper.normalizeCapabilitiesUrl(handleTemplate(info.getUrl()));
         this.layers = getCapabilities();
-        this.defaultLayer = info.getDefaultLayers().isEmpty() ? null : (WMTSDefaultLayer) info.getDefaultLayers().iterator().next();
+        if (info.getDefaultLayers().isEmpty()) {
+            Main.warn(tr("No default layer selected, choosing first layer."));
+            if (!layers.isEmpty()) {
+                Layer first = layers.iterator().next();
+                this.defaultLayer = new WMTSDefaultLayer(first.identifier, first.tileMatrixSet.identifier);
+            } else {
+                this.defaultLayer = null;
+            }
+        } else {
+            this.defaultLayer = (WMTSDefaultLayer) info.getDefaultLayers().iterator().next();
+        }
         if (this.layers.isEmpty())
             throw new IllegalArgumentException(tr("No layers defined by getCapabilities document: {0}", info.getUrl()));