Ignore:
Timestamp:
2016-11-15T21:46:24+01:00 (3 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

    r11219 r11257  
    2323
    2424import org.openstreetmap.josm.Main;
     25import org.openstreetmap.josm.data.imagery.DefaultLayer;
    2526import org.openstreetmap.josm.data.imagery.ImageryInfo;
    2627import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
     
    8283            case WMTS:
    8384                // specify which layer to use
    84                 String layerId = new WMTSTileSource(info).userSelectLayer();
     85                DefaultLayer layerId = new WMTSTileSource(info).userSelectLayer();
    8586                if (layerId != null) {
    8687                    ImageryInfo copy = new ImageryInfo(info);
    87                     Collection<String> defaultLayers = new ArrayList<>(1);
     88                    Collection<DefaultLayer> defaultLayers = new ArrayList<>(1);
    8889                    defaultLayers.add(layerId);
    8990                    copy.setDefaultLayers(defaultLayers);
Note: See TracChangeset for help on using the changeset viewer.