Changeset 11257 in josm for trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.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/actions/AddImageryLayerAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -23 +23 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.imagery.DefaultLayer;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
@@ -82 +83 @@
             case WMTS:
                 // specify which layer to use
-                String layerId = new WMTSTileSource(info).userSelectLayer();
+                DefaultLayer layerId = new WMTSTileSource(info).userSelectLayer();
                 if (layerId != null) {
                     ImageryInfo copy = new ImageryInfo(info);
-                    Collection<String> defaultLayers = new ArrayList<>(1);
+                    Collection<DefaultLayer> defaultLayers = new ArrayList<>(1);
                     defaultLayers.add(layerId);
                     copy.setDefaultLayers(defaultLayers);