Index: trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java (revision 11256) +++ trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java (revision 11257) @@ -23,4 +23,5 @@ 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,8 +83,8 @@ 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 defaultLayers = new ArrayList<>(1); + Collection defaultLayers = new ArrayList<>(1); defaultLayers.add(layerId); copy.setDefaultLayers(defaultLayers); Index: trunk/src/org/openstreetmap/josm/data/imagery/DefaultLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/DefaultLayer.java (revision 11257) +++ trunk/src/org/openstreetmap/josm/data/imagery/DefaultLayer.java (revision 11257) @@ -0,0 +1,32 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.data.imagery; + +/** + * + * Simple class representing default layer that might be set in imagery information + * + * This simple class is needed - as for WMS there is different information needed to specify layer than for WMTS + * + * @author Wiktor Niesiobedzki + * + */ +public class DefaultLayer { + + protected String layerName; + + /** + * Constructor + * @param layerName that is the DefaultLayer + */ + public DefaultLayer(String layerName) { + this.layerName = layerName; + } + + /** + * @return layer name of the default layer + */ + public String getLayerName() { + return layerName; + } + +} Index: trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (revision 11256) +++ trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (revision 11257) @@ -195,5 +195,5 @@ private boolean isEpsg4326To3857Supported; /** which layers should be activated by default on layer addition. **/ - private Collection defaultLayers = Collections.emptyList(); + private Collection defaultLayers = Collections.emptyList(); // when adding a field, also adapt the ImageryInfo(ImageryInfo) // and ImageryInfo(ImageryPreferenceEntry) constructor, equals method, and ImageryPreferenceEntry @@ -1156,5 +1156,5 @@ * @return Collection of the layer names */ - public Collection getDefaultLayers() { + public Collection getDefaultLayers() { return defaultLayers; } @@ -1164,5 +1164,10 @@ * @param layers set the list of default layers */ - public void setDefaultLayers(Collection layers) { + public void setDefaultLayers(Collection layers) { + if (ImageryType.WMTS.equals(this.imageryType)) { + CheckParameterUtil.ensureThat(layers == null || + layers.isEmpty() || + layers.iterator().next() instanceof WMTSDefaultLayer, "Incorrect default layer"); + } this.defaultLayers = layers; } Index: trunk/src/org/openstreetmap/josm/data/imagery/WMTSDefaultLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/WMTSDefaultLayer.java (revision 11257) +++ trunk/src/org/openstreetmap/josm/data/imagery/WMTSDefaultLayer.java (revision 11257) @@ -0,0 +1,15 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.data.imagery; + +public class WMTSDefaultLayer extends DefaultLayer { + String tileMatrixSet; + + public WMTSDefaultLayer(String layerName, String tileMatrixSet) { + super(layerName); + this.tileMatrixSet = tileMatrixSet; + } + + public String getTileMatrixSet() { + return tileMatrixSet; + } +} Index: trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (revision 11256) +++ trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (revision 11257) @@ -174,5 +174,8 @@ switch (columnIndex) { case 0: - return SelectLayerDialog.this.layers.get(rowIndex).getKey(); + return SelectLayerDialog.this.layers.get(rowIndex).getValue() + .stream() + .map(x -> x.name) + .collect(Collectors.joining(", ")); //this should be only one case 1: return SelectLayerDialog.this.layers.get(rowIndex).getValue() @@ -184,5 +187,5 @@ .stream() .map(x -> x.tileMatrixSet.identifier) - .collect(Collectors.joining(", ")); + .collect(Collectors.joining(", ")); //this should be only one default: throw new IllegalArgumentException(); @@ -224,15 +227,11 @@ } - private static List>> groupLayersByName(Collection layers) { - Map> layerByName = layers.stream().collect(Collectors.groupingBy(x -> x.name)); - return layerByName.entrySet().stream().sorted(Map.Entry.comparingByKey()).collect(Collectors.toList()); - } - - public String getSelectedLayer() { + public DefaultLayer getSelectedLayer() { int index = list.getSelectedRow(); if (index < 0) { return null; //nothing selected } - return layers.get(index).getKey(); + Layer selectedLayer = layers.get(index).getValue().iterator().next(); + return new WMTSDefaultLayer(selectedLayer.name, selectedLayer.tileMatrixSet.identifier); } } @@ -247,5 +246,6 @@ private ScaleList nativeScaleList; - private final String defaultLayer; + private final WMTSDefaultLayer defaultLayer; + /** @@ -261,5 +261,5 @@ this.baseUrl = GetCapabilitiesParseHelper.normalizeCapabilitiesUrl(handleTemplate(info.getUrl())); this.layers = getCapabilities(); - this.defaultLayer = info.getDefaultLayers().isEmpty() ? null : info.getDefaultLayers().iterator().next(); + this.defaultLayer = info.getDefaultLayers().isEmpty() ? null : (WMTSDefaultLayer) info.getDefaultLayers().iterator().next(); if (this.layers.isEmpty()) throw new IllegalArgumentException(tr("No layers defined by getCapabilities document: {0}", info.getUrl())); @@ -270,10 +270,12 @@ * @return Name of selected layer */ - public String userSelectLayer() { - Collection layerNames = layers.stream().map(x -> x.name).collect(Collectors.toSet()); + public DefaultLayer userSelectLayer() { + Collection>> grouppedLayers = groupLayersByName(layers);; // if there is only one layer name no point in asking - if (layerNames.size() == 1) - return layerNames.iterator().next(); + if (grouppedLayers.size() == 1) { + Layer selectedLayer = grouppedLayers.iterator().next().getValue().iterator().next(); + return new WMTSDefaultLayer(selectedLayer.name, selectedLayer.tileMatrixSet.identifier); + } final SelectLayerDialog layerSelection = new SelectLayerDialog(layers); @@ -294,4 +296,10 @@ matcher.appendTail(output); return output.toString(); + } + + private static List>> groupLayersByName(Collection layers) { + Map> layerByName = layers.stream().collect( + Collectors.groupingBy(x -> x.name + '\u001c' + x.tileMatrixSet.identifier)); + return layerByName.entrySet().stream().sorted(Map.Entry.comparingByKey()).collect(Collectors.toList()); } @@ -555,7 +563,9 @@ // getLayers will return only layers matching the name, if the user already choose the layer // so we will not ask the user again to chose the layer, if he just changes projection - Collection candidates = getLayers(currentLayer != null ? currentLayer.name : defaultLayer, proj.toCode()); + Collection candidates = getLayers( + currentLayer != null ? new WMTSDefaultLayer(currentLayer.name, currentLayer.tileMatrixSet.identifier) : defaultLayer, + proj.toCode()); + if (candidates.size() == 1) { - Layer newLayer = candidates.iterator().next(); if (newLayer != null) { @@ -580,13 +590,17 @@ /** * - * @param name of the layer to match + * @param searchLayer which layer do we look for * @param projectionCode projection code to match * @return Collection of layers matching the name of the layer and projection, or only projection if name is not provided */ - private Collection getLayers(String name, String projectionCode) { + private Collection getLayers(WMTSDefaultLayer searchLayer, String projectionCode) { Collection ret = new ArrayList<>(); if (this.layers != null) { for (Layer layer: this.layers) { - if ((name == null || name.equals(layer.name)) && (projectionCode == null || projectionCode.equals(layer.tileMatrixSet.crs))) { + if ((searchLayer == null || (// if it's null, then accept all layers + searchLayer.getLayerName().equals(layer.name) && + searchLayer.getTileMatrixSet().equals(layer.tileMatrixSet.identifier))) + && (projectionCode == null || // if it's null, then accept any projection + projectionCode.equals(layer.tileMatrixSet.crs))) { ret.add(layer); } Index: trunk/test/data/wmts/bug13975-multiple-tile-matrices-for-one-layer-projection.xml =================================================================== --- trunk/test/data/wmts/bug13975-multiple-tile-matrices-for-one-layer-projection.xml (revision 11257) +++ trunk/test/data/wmts/bug13975-multiple-tile-matrices-for-one-layer-projection.xml (revision 11257) @@ -0,0 +1,377 @@ + + + +Mashhad_BaseMap_1 +OGC WMTS +1.0.0 + + + + + + + +RESTful + + + + + + + +KVP + + + + + + + + + + + + +RESTful + + + + + + +KVP + + + + + + + + +Mashhad_BaseMap_1 Mashhad_BaseMap_1 + +6588340.738203676 4304495.929392335 +6678536.942362351 4378339.757654444 + +59.184071821156536 36.028153408122506 +59.99431810880956 36.56279324540633 + + +image/jpgpng + +default028mm + + + +GoogleMapsCompatible + + + + +TileMatrix using 0.28mm +The tile matrix set that has scale values calculated based on the dpi defined by OGC specification (dpi assumes 0.28mm as the physical distance of a pixel). default028mm +urn:ogc:def:crs:EPSG::3857 + +0 +5.590822640285016E8 +-2.0037508342787E7 2.0037508342787E7 256 256 +1 1 + + +1 +2.7954113201425034E8 +-2.0037508342787E7 2.0037508342787E7 256 256 +2 1 + + +2 +1.3977056600712562E8 +-2.0037508342787E7 2.0037508342787E7 256 256 +3 2 + + +3 +6.988528300356235E7 +-2.0037508342787E7 2.0037508342787E7 256 256 +6 4 + + +4 +3.494264150178117E7 +-2.0037508342787E7 2.0037508342787E7 256 256 +11 7 + + +5 +1.7471320750890587E7 +-2.0037508342787E7 2.0037508342787E7 256 256 +22 13 + + +6 +8735660.375445293 +-2.0037508342787E7 2.0037508342787E7 256 256 +43 26 + + +7 +4367830.187722647 +-2.0037508342787E7 2.0037508342787E7 256 256 +86 51 + + +8 +2183915.0938617955 +-2.0037508342787E7 2.0037508342787E7 256 256 +171 101 + + +9 +1091957.5469304253 +-2.0037508342787E7 2.0037508342787E7 256 256 +342 202 + + +10 +545978.7734656851 +-2.0037508342787E7 2.0037508342787E7 256 256 +683 403 + + +11 +272989.38673237007 +-2.0037508342787E7 2.0037508342787E7 256 256 +1366 805 + + +12 +136494.69336618503 +-2.0037508342787E7 2.0037508342787E7 256 256 +2731 1609 + + +13 +68247.34668309252 +-2.0037508342787E7 2.0037508342787E7 256 256 +5462 3217 + + +14 +34123.67334154626 +-2.0037508342787E7 2.0037508342787E7 256 256 +10923 6433 + + +15 +17061.836671245605 +-2.0037508342787E7 2.0037508342787E7 256 256 +21845 12865 + + +16 +8530.918335622802 +-2.0037508342787E7 2.0037508342787E7 256 256 +43690 25729 + + +17 +4265.459167338929 +-2.0037508342787E7 2.0037508342787E7 256 256 +87380 51458 + + +18 +2132.729584141936 +-2.0037508342787E7 2.0037508342787E7 256 256 +174759 102915 + + +19 +1066.3647915984968 +-2.0037508342787E7 2.0037508342787E7 256 256 +349518 205830 + + + +GoogleMapsCompatible +the wellknown 'GoogleMapsCompatible' tile matrix set defined by OGC WMTS specification +GoogleMapsCompatible +urn:ogc:def:crs:EPSG:6.18.3:3857 +urn:ogc:def:wkss:OGC:1.0:GoogleMapsCompatible + +0 +559082264.0287178 +-20037508.34278925 20037508.34278925 +256 +256 +1 +1 + + +1 +279541132.0143589 +-20037508.34278925 20037508.34278925 +256 +256 +2 +2 + + +2 +139770566.0071794 +-20037508.34278925 20037508.34278925 +256 +256 +4 +4 + + +3 +69885283.00358972 +-20037508.34278925 20037508.34278925 +256 +256 +8 +8 + + +4 +34942641.50179486 +-20037508.34278925 20037508.34278925 +256 +256 +16 +16 + + +5 +17471320.75089743 +-20037508.34278925 20037508.34278925 +256 +256 +32 +32 + + +6 +8735660.375448715 +-20037508.34278925 20037508.34278925 +256 +256 +64 +64 + + +7 +4367830.187724357 +-20037508.34278925 20037508.34278925 +256 +256 +128 +128 + + +8 +2183915.093862179 +-20037508.34278925 20037508.34278925 +256 +256 +256 +256 + + +9 +1091957.546931089 +-20037508.34278925 20037508.34278925 +256 +256 +512 +512 + + +10 +545978.7734655447 +-20037508.34278925 20037508.34278925 +256 +256 +1024 +1024 + + +11 +272989.3867327723 +-20037508.34278925 20037508.34278925 +256 +256 +2048 +2048 + + +12 +136494.6933663862 +-20037508.34278925 20037508.34278925 +256 +256 +4096 +4096 + + +13 +68247.34668319309 +-20037508.34278925 20037508.34278925 +256 +256 +8192 +8192 + + +14 +34123.67334159654 +-20037508.34278925 20037508.34278925 +256 +256 +16384 +16384 + + +15 +17061.83667079827 +-20037508.34278925 20037508.34278925 +256 +256 +32768 +32768 + + +16 +8530.918335399136 +-20037508.34278925 20037508.34278925 +256 +256 +65536 +65536 + + +17 +4265.459167699568 +-20037508.34278925 20037508.34278925 +256 +256 +131072 +131072 + + +18 +2132.729583849784 +-20037508.34278925 20037508.34278925 +256 +256 +262144 +262144 + + + + Index: trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (revision 11256) +++ trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (revision 11257) @@ -8,4 +8,6 @@ import java.io.IOException; import java.net.MalformedURLException; +import java.util.ArrayList; +import java.util.Collection; import org.junit.Ignore; @@ -38,4 +40,6 @@ private ImageryInfo testDuplicateTags = getImagery(TestUtils.getTestDataRoot() + "wmts/bug12573-wmts-identifier.xml"); private ImageryInfo testMissingStyleIdentifer = getImagery(TestUtils.getTestDataRoot() + "wmts/bug12573-wmts-missing-style-identifier.xml"); + private ImageryInfo testMultipleTileMatrixForLayer = getImagery(TestUtils.getTestDataRoot() + + "wmts/bug13975-multiple-tile-matrices-for-one-layer-projection.xml"); /** @@ -263,4 +267,20 @@ } + @Test + public void testForMultipleTileMatricesForOneLayerProjection() throws Exception { + Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); + ImageryInfo copy = new ImageryInfo(testMultipleTileMatrixForLayer); + Collection defaultLayers = new ArrayList<>(1); + defaultLayers.add(new WMTSDefaultLayer("Mashhad_BaseMap_1", "default028mm")); + copy.setDefaultLayers(defaultLayers); + WMTSTileSource testSource = new WMTSTileSource(copy); + testSource.initProjection(Main.getProjection()); + assertEquals( + "http://188.253.0.155:6080/arcgis/rest/services/Mashhad_BaseMap_1/MapServer/WMTS/tile/1.0.0/Mashhad_BaseMap_1" + + "/default/default028mm/1/3/2", + testSource.getTileUrl(1, 2, 3) + ); + } + private void verifyTile(LatLon expected, WMTSTileSource source, int x, int y, int z) { LatLon ll = new LatLon(source.tileXYToLatLon(x, y, z)); @@ -277,5 +297,4 @@ LatLon result = new LatLon(testSource.tileXYToLatLon(x, y, z)); LatLon expected = new LatLon(verifier.tileXYToLatLon(x, y, z + zoomOffset)); - //System.out.println(z + "/" + x + "/" + y + " - result: " + result.toDisplayString() + " osmMercator: " + expected.toDisplayString()); assertEquals("Longitude", LatLon.normalizeLon(expected.lon() - result.lon()), 0.0, 1e-04); assertEquals("Latitude", expected.lat(), result.lat(), 1e-04);