Index: trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (revision 8751) +++ trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (revision 8752) @@ -15,4 +15,5 @@ import java.util.Collection; import java.util.Comparator; +import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -23,7 +24,8 @@ import java.util.regex.Pattern; -import javax.swing.JList; import javax.swing.JPanel; +import javax.swing.JTable; import javax.swing.ListSelectionModel; +import javax.swing.table.AbstractTableModel; import javax.xml.XMLConstants; import javax.xml.namespace.QName; @@ -98,5 +100,5 @@ private String format; private String name; - private Map tileMatrixSetByCRS = new ConcurrentHashMap<>(); + private TileMatrixSet tileMatrixSet; private String baseUrl; private String style; @@ -129,12 +131,52 @@ private static final class SelectLayerDialog extends ExtendedDialog { private final Layer[] layers; - private final JList list; + private final JTable list; public SelectLayerDialog(Collection layers) { super(Main.parent, tr("Select WMTS layer"), new String[]{tr("Add layers"), tr("Cancel")}); this.layers = layers.toArray(new Layer[]{}); - this.list = new JList<>(getLayerNames(layers)); + //getLayersTable(layers, Main.getProjection()) + this.list = new JTable( + new AbstractTableModel() { + @Override + public Object getValueAt(int rowIndex, int columnIndex) { + switch (columnIndex) { + case 0: + return SelectLayerDialog.this.layers[rowIndex].name; + case 1: + return SelectLayerDialog.this.layers[rowIndex].tileMatrixSet.crs; + case 2: + return SelectLayerDialog.this.layers[rowIndex].tileMatrixSet.identifier; + default: + throw new IllegalArgumentException(); + } + } + + @Override + public int getRowCount() { + return SelectLayerDialog.this.layers.length; + } + + @Override + public int getColumnCount() { + return 3; + } + @Override + public String getColumnName(int column) { + switch (column) { + case 0: return tr("Layer name"); + case 1: return tr("Projection"); + case 2: return tr("Matrix set identifier"); + default: + throw new IllegalArgumentException(); + } + } + @Override + public boolean isCellEditable(int row, int column) { return false; } + }); this.list.setPreferredSize(new Dimension(400, 400)); this.list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + this.list.setRowSelectionAllowed(true); + this.list.setColumnSelectionAllowed(false); JPanel panel = new JPanel(new GridBagLayout()); panel.add(this.list, GBC.eol().fill()); @@ -142,14 +184,6 @@ } - private static String[] getLayerNames(Collection layers) { - Collection ret = new ArrayList<>(); - for (Layer layer: layers) { - ret.add(layer.name); - } - return ret.toArray(new String[]{}); - } - public Layer getSelectedLayer() { - int index = list.getSelectedIndex(); + int index = list.getSelectedRow(); if (index < 0) { return null; //nothing selected @@ -175,23 +209,25 @@ this.baseUrl = normalizeCapabilitiesUrl(handleTemplate(info.getUrl())); this.layers = getCapabilities(); - if (layers.size() > 1) { - final SelectLayerDialog layerSelection = new SelectLayerDialog(layers); - if (layerSelection.showDialog().getValue() == 1) { - this.currentLayer = layerSelection.getSelectedLayer(); - // TODO: save layer information into ImageryInfo / ImageryPreferences? - } - - if (this.currentLayer == null) { - // user canceled operation or did not choose any layer - throw new IllegalArgumentException(tr("No layer selected")); - } - - } else if (layers.size() == 1) { - this.currentLayer = this.layers.iterator().next(); - } else { + if (this.layers.isEmpty()) throw new IllegalArgumentException(tr("No layers defined by getCapabilities document: {0}", info.getUrl())); - } - - initProjection(); + + // Not needed ? initProjection(); + } + + private Layer userSelectLayer(Collection layers) { + if (layers.size() == 1) + return layers.iterator().next(); + Layer ret = null; + + final SelectLayerDialog layerSelection = new SelectLayerDialog(layers); + if (layerSelection.showDialog().getValue() == 1) { + ret = layerSelection.getSelectedLayer(); + // TODO: save layer information into ImageryInfo / ImageryPreferences? + } + if (ret == null) { + // user canceled operation or did not choose any layer + throw new IllegalArgumentException(tr("No layer selected")); + } + return ret; } @@ -239,5 +275,4 @@ Map matrixSetById = parseMatrices(getByXpath(document, "/Capabilities/Contents/TileMatrixSet")); return parseLayer(layersNodeList, matrixSetById); - } catch (Exception e) { throw new IllegalArgumentException(e); @@ -255,19 +290,21 @@ for (int layerId = 0; layerId < nodeList.getLength(); layerId++) { Node layerNode = nodeList.item(layerId); - Layer layer = new Layer(); - layer.format = getStringByXpath(layerNode, "Format"); - layer.name = getStringByXpath(layerNode, "Identifier"); - layer.baseUrl = getStringByXpath(layerNode, "ResourceURL[@resourceType='tile']/@template"); - layer.style = getStringByXpath(layerNode, "Style[@isDefault='true']/Identifier"); - if (layer.style == null) { - layer.style = ""; - } NodeList tileMatrixSetLinks = getByXpath(layerNode, "TileMatrixSetLink"); + + // we add an layer for all matrix sets to allow user to choose, with which tileset he wants to work for (int tileMatrixId = 0; tileMatrixId < tileMatrixSetLinks.getLength(); tileMatrixId++) { + Layer layer = new Layer(); + layer.format = getStringByXpath(layerNode, "Format"); + layer.name = getStringByXpath(layerNode, "Identifier"); + layer.baseUrl = getStringByXpath(layerNode, "ResourceURL[@resourceType='tile']/@template"); + layer.style = getStringByXpath(layerNode, "Style[@isDefault='true']/Identifier"); + if (layer.style == null) { + layer.style = ""; + } Node tileMatrixLink = tileMatrixSetLinks.item(tileMatrixId); TileMatrixSet tms = matrixSetById.get(getStringByXpath(tileMatrixLink, "TileMatrixSet")); - layer.tileMatrixSetByCRS.put(tms.crs, tms); - } - ret.add(layer); + layer.tileMatrixSet = tms; + ret.add(layer); + } } return ret; @@ -357,11 +394,28 @@ */ public void initProjection(Projection proj) { - this.currentTileMatrixSet = currentLayer.tileMatrixSetByCRS.get(proj.toCode()); - if (this.currentTileMatrixSet == null) { - Main.warn("Unsupported CRS selected"); - // take first, maybe it will work (if user sets custom projections, codes will not match) - this.currentTileMatrixSet = currentLayer.tileMatrixSetByCRS.values().iterator().next(); - } + String layerName = null; + if (currentLayer != null) { + layerName = currentLayer.name; + } + Collection candidates = getLayers(layerName, proj.toCode()); + if (!candidates.isEmpty()) { + Layer newLayer = userSelectLayer(candidates); + if (newLayer != null) { + this.currentTileMatrixSet = newLayer.tileMatrixSet; + this.currentLayer = newLayer; + } + } + this.crsScale = getTileSize() * 0.28e-03 / proj.getMetersPerUnit(); + } + + private Collection getLayers(String name, String projectionCode) { + Collection ret = new ArrayList<>(); + for (Layer layer: this.layers) { + if ((name == null || name.equals(layer.name)) && (projectionCode == null || projectionCode.equals(layer.tileMatrixSet.crs))) { + ret.add(layer); + } + } + return ret; } @@ -385,4 +439,8 @@ public String getTileUrl(int zoom, int tilex, int tiley) { String url; + if (currentLayer == null) { + return ""; + } + switch (transferMode) { case KVP: @@ -619,5 +677,17 @@ */ public Set getSupportedProjections() { - return this.currentLayer.tileMatrixSetByCRS.keySet(); + Set ret = new HashSet<>(); + if (currentLayer == null) { + for(Layer layer: this.layers) { + ret.add(layer.tileMatrixSet.crs); + } + } else { + for(Layer layer: this.layers) { + if (currentLayer.name.equals(layer.name)) { + ret.add(layer.tileMatrixSet.crs); + } + } + } + return ret; } Index: trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java (revision 8751) +++ trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java (revision 8752) @@ -3,4 +3,5 @@ import java.io.IOException; +import java.util.Set; import org.apache.commons.jcs.access.CacheAccess; @@ -95,5 +96,6 @@ @Override public boolean isProjectionSupported(Projection proj) { - return ((WMTSTileSource) tileSource).getSupportedProjections().contains(proj.toCode()); + Set supportedProjections = ((WMTSTileSource) tileSource).getSupportedProjections(); + return supportedProjections.contains(proj.toCode()); } @@ -104,5 +106,5 @@ ret.append(e).append(", "); } - return ret.substring(0, ret.length()-2); + return ret.length() > 2 ? ret.substring(0, ret.length()-2) : ret.toString(); } Index: trunk/test/data/wmts/WMTSCapabilities-Ontario.xml =================================================================== --- trunk/test/data/wmts/WMTSCapabilities-Ontario.xml (revision 8752) +++ trunk/test/data/wmts/WMTSCapabilities-Ontario.xml (revision 8752) @@ -0,0 +1,457 @@ + + + + + Basemap_Imagery_2014 + OGC WMTS + 1.0.0 + + + + + + + + RESTful + + + + + + + + KVP + + + + + + + + + + + + + RESTful + + + + + + + KVP + + + + + + + + + + + Basemap_Imagery_2014 + Basemap_Imagery_2014 + + + + -8507199.652697453 5606950.534040266 + -8367322.830222864 5713437.426857653 + + + + + -76.42147473074407 44.907369851539244 + -75.1649398555141 45.580879803959924 + + + image/jpg + + 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 + + 1091957.5469304253 + + -2.0037508342787E7 2.0037508342787E7 + 256 + 256 + + 150 + 185 + + + + + 1 + + 545978.7734656851 + + -2.0037508342787E7 2.0037508342787E7 + 256 + 256 + + 299 + 369 + + + + + 2 + + 272989.38673237007 + + -2.0037508342787E7 2.0037508342787E7 + 256 + 256 + + 597 + 738 + + + + + 3 + + 136494.69336618503 + + -2.0037508342787E7 2.0037508342787E7 + 256 + 256 + + 1193 + 1475 + + + + + 4 + + 68247.34668309252 + + -2.0037508342787E7 2.0037508342787E7 + 256 + 256 + + 2386 + 2950 + + + + + 5 + + 34123.67334154626 + + -2.0037508342787E7 2.0037508342787E7 + 256 + 256 + + 4772 + 5900 + + + + + 6 + + 17061.836671245605 + + -2.0037508342787E7 2.0037508342787E7 + 256 + 256 + + 9543 + 11800 + + + + + 7 + + 8530.918335622802 + + -2.0037508342787E7 2.0037508342787E7 + 256 + 256 + + 19085 + 23599 + + + + + 8 + + 4265.459167338929 + + -2.0037508342787E7 2.0037508342787E7 + 256 + 256 + + 38170 + 47198 + + + + + 9 + + 2132.729584141936 + + -2.0037508342787E7 2.0037508342787E7 + 256 + 256 + + 76339 + 94396 + + + + + 10 + + 1066.3647915984968 + + -2.0037508342787E7 2.0037508342787E7 + 256 + 256 + + 152678 + 188791 + + + + + 11 + + 533.1823957992484 + + -2.0037508342787E7 2.0037508342787E7 + 256 + 256 + + 305355 + 377581 + + + + + 12 + + 266.5911978996242 + + -2.0037508342787E7 2.0037508342787E7 + 256 + 256 + + 610709 + 755161 + + + + + + + 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 8751) +++ trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (revision 8752) @@ -26,4 +26,5 @@ private ImageryInfo testImageryWIEN = getImagery("test/data/wmts/getCapabilities-wien.xml"); private ImageryInfo testImageryWALLONIE = getImagery("test/data/wmts/WMTSCapabilities-Wallonie.xml"); + private ImageryInfo testImageryOntario = getImagery("test/data/wmts/WMTSCapabilities-Ontario.xml"); @BeforeClass @@ -48,4 +49,5 @@ Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); WMTSTileSource testSource = new WMTSTileSource(testImageryPSEUDO_MERCATOR); + testSource.initProjection(); verifyMercatorTile(testSource, 0, 0, 1); @@ -78,4 +80,6 @@ Main.setProjection(Projections.getProjectionByCode("EPSG:31370")); WMTSTileSource testSource = new WMTSTileSource(testImageryWALLONIE); + testSource.initProjection(); + assertEquals("http://geoservices.wallonie.be/arcgis/rest/services/DONNEES_BASE/FOND_PLAN_ANNOTATIONS_2012_RW_NB/" + "MapServer/WMTS/tile/1.0.0/DONNEES_BASE_FOND_PLAN_ANNOTATIONS_2012_RW_NB/default/default028mm/5/1219/1063.png", @@ -95,4 +99,6 @@ Main.setProjection(Projections.getProjectionByCode("EPSG:31370")); WMTSTileSource testSource = new WMTSTileSource(getImagery("test/data/wmts/WMTSCapabilities-Wallonie-nomatrixdimension.xml")); + testSource.initProjection(); + Bounds wallonieBounds = new Bounds( new LatLon(49.485372459967245, 2.840548314430268), @@ -117,4 +123,5 @@ Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); WMTSTileSource testSource = new WMTSTileSource(testImageryWIEN); + testSource.initProjection(); int zoomOffset = 9; @@ -158,4 +165,5 @@ Main.setProjection(Projections.getProjectionByCode("EPSG:4326")); WMTSTileSource testSource = new WMTSTileSource(testImageryTOPO_PL); + testSource.initProjection(); verifyTile(new LatLon(56, 12), testSource, 0, 0, 1); verifyTile(new LatLon(56, 12), testSource, 0, 0, 2); @@ -179,4 +187,5 @@ Main.setProjection(Projections.getProjectionByCode("EPSG:4326")); WMTSTileSource testSource = new WMTSTileSource(testImageryORTO_PL); + testSource.initProjection(); verifyTile(new LatLon(53.5993712684958, 19.560669777688176), testSource, 12412, 3941, 14); verifyTile(new LatLon(49.783096954497786, 22.79034127751704), testSource, 17714, 10206, 14); @@ -187,7 +196,19 @@ Main.setProjection(Projections.getProjectionByCode("EPSG:2180")); WMTSTileSource testSource = new WMTSTileSource(testImageryORTO_PL); + testSource.initProjection(); verifyTile(new LatLon(53.59940948387726, 19.560544913270064), testSource, 6453, 3140, 14); verifyTile(new LatLon(49.782984840526055, 22.790064966993445), testSource, 9932, 9305, 14); + } + + // disabled as this needs user action + // @Test + public void testTwoTileSetsForOneProjection() throws Exception { + Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); + WMTSTileSource testSource = new WMTSTileSource(testImageryOntario); + testSource.initProjection(); + verifyTile(new LatLon(45.4105023, -75.7153702), testSource, 303751, 375502, 12); + verifyTile(new LatLon(45.4601306, -75.7617187), testSource, 1186, 1466, 4); + }