Changeset 11257 in josm for trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

Timestamp:

2016-11-15T21:46:24+01:00 (7 years ago)

Author:

wiktorn

Message:

Make DefaultLayer a type that can have layerName and tileMatrixSet

As WMTS specification gives possibility to have many tileMatrixSet's for
one layer and projection, default layer must specify both - layerName
and tileMatrixSet.

Accommodate to that fact layer selection dialogs and internal
computations in WMTS TileSource.

Closes: #13975

File:

• trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (modified) (3 diffs)

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

@@ -195 +195 @@
     private boolean isEpsg4326To3857Supported;
     /** which layers should be activated by default on layer addition. **/
-    private Collection<String> defaultLayers = Collections.emptyList();
+    private Collection<DefaultLayer> defaultLayers = Collections.emptyList();
     // when adding a field, also adapt the ImageryInfo(ImageryInfo)
     // and ImageryInfo(ImageryPreferenceEntry) constructor, equals method, and ImageryPreferenceEntry
@@ -1156 +1156 @@
      * @return Collection of the layer names
      */
-    public Collection<String> getDefaultLayers() {
+    public Collection<DefaultLayer> getDefaultLayers() {
         return defaultLayers;
     }
@@ -1164 +1164 @@
      * @param layers set the list of default layers
      */
-    public void setDefaultLayers(Collection<String> layers) {
+    public void setDefaultLayers(Collection<DefaultLayer> layers) {
+        if (ImageryType.WMTS.equals(this.imageryType)) {
+            CheckParameterUtil.ensureThat(layers == null ||
+                    layers.isEmpty() ||
+                    layers.iterator().next() instanceof WMTSDefaultLayer, "Incorrect default layer");
+        }
         this.defaultLayers = layers;
     }