Index: /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (revision 8585) +++ /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (revision 8586) @@ -80,4 +80,6 @@ int tileWidth; int tileHeight; + public int matrixWidth = -1; + public int matrixHeight = -1; } @@ -99,4 +101,5 @@ Map tileMatrixSetByCRS = new ConcurrentHashMap<>(); public String baseUrl; + public String style; } @@ -163,5 +166,4 @@ private double crsScale; private TransferMode transferMode; - private String style = ""; /** @@ -248,4 +250,8 @@ 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"); for (int tileMatrixId = 0; tileMatrixId < tileMatrixSetLinks.getLength(); tileMatrixId++) { @@ -287,4 +293,6 @@ tileMatrix.tileHeight = Integer.parseInt(getStringByXpath(tileMatrixNode, "TileHeight")); tileMatrix.tileWidth = Integer.parseInt(getStringByXpath(tileMatrixNode, "TileHeight")); + tileMatrix.matrixWidth = getOptionalIntegerByXpath(tileMatrixNode, "MatrixWidth"); + tileMatrix.matrixHeight = getOptionalIntegerByXpath(tileMatrixNode, "MatrixHeight"); if (tileMatrix.tileHeight != tileMatrix.tileWidth) { throw new AssertionError(tr("Only square tiles are supported. {0}x{1} returned by server for TileMatrix identifier {2}", @@ -304,4 +312,12 @@ } return crsIdentifier; + } + + private int getOptionalIntegerByXpath(Node document, String xpathQuery) throws XPathExpressionException { + String ret = getStringByXpath(document, xpathQuery); + if (ret == null || "".equals(ret)) { + return -1; + } + return Integer.parseInt(ret); } @@ -384,5 +400,5 @@ .replaceAll("\\{TileRow\\}", Integer.toString(tiley)) .replaceAll("\\{TileCol\\}", Integer.toString(tilex)) - .replaceAll("\\{Style\\}", this.style); + .replaceAll("\\{Style\\}", this.currentLayer.style); } @@ -595,6 +611,11 @@ return 0; } + + if (matrix.matrixHeight != -1) { + return matrix.matrixHeight; + } + double scale = matrix.scaleDenominator * this.crsScale; - Bounds bounds = Main.getProjection().getWorldBoundsLatLon(); + Bounds bounds = proj.getWorldBoundsLatLon(); EastNorth min = proj.latlon2eastNorth(bounds.getMin()); EastNorth max = proj.latlon2eastNorth(bounds.getMax()); @@ -607,6 +628,10 @@ return 0; } + if (matrix.matrixWidth != -1) { + return matrix.matrixWidth; + } + double scale = matrix.scaleDenominator * this.crsScale; - Bounds bounds = Main.getProjection().getWorldBoundsLatLon(); + Bounds bounds = proj.getWorldBoundsLatLon(); EastNorth min = proj.latlon2eastNorth(bounds.getMin()); EastNorth max = proj.latlon2eastNorth(bounds.getMax()); Index: /trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java (revision 8585) +++ /trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java (revision 8586) @@ -5,4 +5,5 @@ import java.util.Map; +import org.openstreetmap.gui.jmapviewer.TileXY; import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate; import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader; @@ -81,10 +82,12 @@ */ private double getTileToScreenRatio(int zoom) { - ICoordinate north = tileSource.tileXYToLatLon(0, 0, zoom); - ICoordinate south = tileSource.tileXYToLatLon(0, 1, zoom); - MapView mv = Main.map.mapView; LatLon topLeft = mv.getLatLon(0, 0); LatLon botLeft = mv.getLatLon(0, tileSource.getTileSize()); + + TileXY topLeftTile = tileSource.latLonToTileXY(topLeft.toCoordinate(), zoom); + + ICoordinate north = tileSource.tileXYToLatLon(topLeftTile.getXIndex(), topLeftTile.getYIndex(), zoom); + ICoordinate south = tileSource.tileXYToLatLon(topLeftTile.getXIndex(), topLeftTile.getYIndex() + 1, zoom); return Math.abs((north.getLat() - south.getLat()) / (topLeft.lat() - botLeft.lat())); @@ -95,8 +98,8 @@ if (!Main.isDisplayingMapView()) return 1; - for (int i = getMinZoomLvl(); i <= getMaxZoomLvl(); i++) { + for (int i = getMinZoomLvl() + 1; i <= getMaxZoomLvl(); i++) { double ret = getTileToScreenRatio(i); if (ret < 1) { - return i; + return i - 1; } } Index: /trunk/test/data/wmts/WMTSCapabilities-Wallonie.xml =================================================================== --- /trunk/test/data/wmts/WMTSCapabilities-Wallonie.xml (revision 8585) +++ /trunk/test/data/wmts/WMTSCapabilities-Wallonie.xml (revision 8586) @@ -1,183 +1,246 @@ - -DONNEES_BASE_FOND_PLAN_ANNOTATIONS_2012_RW_NB -OGC WMTS -1.0.0 - - - - - - - -RESTful - - - - - - - -KVP - - - - - - - - - - - - -RESTful - - - - - - -KVP - - - - - - - - -DONNEES_BASE_FOND_PLAN_ANNOTATIONS_2012_RW_NB DONNEES_BASE_FOND_PLAN_ANNOTATIONS_2012_RW_NB - -42300.92807390103 21237.786800000817 -295130.32186220103 167836.14678540602 - -2.840548314430268 49.485372459967245 -6.427849693016202 50.820959517561256 - - -image/png - -default028mm - - - - -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::31370 - -0 -1417413.5491126343 --3.58727E7 4.14227E7 512 512 -178 204 - - -1 -1181177.957593862 --3.58727E7 4.14227E7 512 512 -214 245 - - -2 -944942.3660750897 --3.58727E7 4.14227E7 512 512 -267 306 - - -3 -708706.7745563171 --3.58727E7 4.14227E7 512 512 -356 408 - - -4 -472471.18303754483 --3.58727E7 4.14227E7 512 512 -534 612 - - -5 -236235.59151877242 --3.58727E7 4.14227E7 512 512 -1068 1223 - - -6 -94494.23660750895 --3.58727E7 4.14227E7 512 512 -2670 3057 - - -7 -70870.67745563173 --3.58727E7 4.14227E7 512 512 -3560 4075 - - -8 -47247.118303754476 --3.58727E7 4.14227E7 512 512 -5340 6113 - - -9 -23623.559151877238 --3.58727E7 4.14227E7 512 512 -10680 12225 - - -10 -14174.135491126344 --3.58727E7 4.14227E7 512 512 -17800 20375 - - -11 -9449.423660750896 --3.58727E7 4.14227E7 512 512 -26699 30563 - - -12 -4724.711830375448 --3.58727E7 4.14227E7 512 512 -53398 61125 - - -13 -2362.355915187724 --3.58727E7 4.14227E7 512 512 -106795 122249 - - -14 -944.9423660750896 --3.58727E7 4.14227E7 512 512 -266987 305621 - - -15 -472.4711830375448 --3.58727E7 4.14227E7 512 512 -533973 611241 - - -16 -236.2355915187724 --3.58727E7 4.14227E7 512 512 -1067946 1222482 - - - - + xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gml="http://www.opengis.net/gml" + xsi:schemaLocation="http://www.opengis.net/wmts/1.0 http://schemas.opengis.net/wmts/1.0/wmtsGetCapabilities_response.xsd" + version="1.0.0"> + + + DONNEES_BASE_FOND_PLAN_ANNOTATIONS_2012_RW_NB + OGC WMTS + 1.0.0 + + + + + + + + + RESTful + + + + + + + + KVP + + + + + + + + + + + + + RESTful + + + + + + + KVP + + + + + + + + + + + DONNEES_BASE_FOND_PLAN_ANNOTATIONS_2012_RW_NB + DONNEES_BASE_FOND_PLAN_ANNOTATIONS_2012_RW_NB + + 42300.92807390103 21237.786800000817 + 295130.32186220103 167836.14678540602 + + + 2.840548314430268 49.485372459967245 + 6.427849693016202 50.820959517561256 + + + image/png + + default028mm + + + + + 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::31370 + + 0 + 1417413.5491126343 + -3.58727E7 4.14227E7 + 512 + 512 + 178 + 204 + + + 1 + 1181177.957593862 + -3.58727E7 4.14227E7 + 512 + 512 + 214 + 245 + + + 2 + 944942.3660750897 + -3.58727E7 4.14227E7 + 512 + 512 + 267 + 306 + + + 3 + 708706.7745563171 + -3.58727E7 4.14227E7 + 512 + 512 + 356 + 408 + + + 4 + 472471.18303754483 + -3.58727E7 4.14227E7 + 512 + 512 + 534 + 612 + + + 5 + 236235.59151877242 + -3.58727E7 4.14227E7 + 512 + 512 + 1068 + 1223 + + + 6 + 94494.23660750895 + -3.58727E7 4.14227E7 + 512 + 512 + 2670 + 3057 + + + 7 + 70870.67745563173 + -3.58727E7 4.14227E7 + 512 + 512 + 3560 + 4075 + + + 8 + 47247.118303754476 + -3.58727E7 4.14227E7 + 512 + 512 + 5340 + 6113 + + + 9 + 23623.559151877238 + -3.58727E7 4.14227E7 + 512 + 512 + 10680 + 12225 + + + 10 + 14174.135491126344 + -3.58727E7 4.14227E7 + 512 + 512 + 17800 + 20375 + + + 11 + 9449.423660750896 + -3.58727E7 4.14227E7 + 512 + 512 + 26699 + 30563 + + + 12 + 4724.711830375448 + -3.58727E7 4.14227E7 + 512 + 512 + 53398 + 61125 + + + 13 + 2362.355915187724 + -3.58727E7 4.14227E7 + 512 + 512 + 106795 + 122249 + + + 14 + 944.9423660750896 + -3.58727E7 4.14227E7 + 512 + 512 + 266987 + 305621 + + + 15 + 472.4711830375448 + -3.58727E7 4.14227E7 + 512 + 512 + 533973 + 611241 + + + 16 + 236.2355915187724 + -3.58727E7 4.14227E7 + 512 + 512 + 1067946 + 1222482 + + + + + Index: /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (revision 8585) +++ /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (revision 8586) @@ -11,5 +11,4 @@ import org.junit.BeforeClass; import org.junit.Test; -import org.openstreetmap.gui.jmapviewer.TileXY; import org.openstreetmap.gui.jmapviewer.tilesources.TemplatedTMSTileSource; import org.openstreetmap.josm.JOSMFixture; @@ -70,5 +69,5 @@ assertEquals("TileXMax", 2, testSource.getTileXMax(2)); assertEquals("TileYMax", 2, testSource.getTileYMax(2)); - assertEquals("TileXMax", 5, testSource.getTileXMax(3)); + assertEquals("TileXMax", 4, testSource.getTileXMax(3)); assertEquals("TileYMax", 4, testSource.getTileYMax(3)); @@ -79,15 +78,26 @@ Main.setProjection(Projections.getProjectionByCode("EPSG:31370")); WMTSTileSource testSource = new WMTSTileSource(testImageryWALLONIE); + 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", + testSource.getTileUrl(6, 1063, 1219)); + + // +bounds=2.54,49.51,6.4,51.5 Bounds wallonieBounds = new Bounds( new LatLon(49.485372459967245, 2.840548314430268), new LatLon(50.820959517561256, 6.427849693016202) ); - verifyBounds(wallonieBounds, testSource, 10, 20324, 17724); + verifyBounds(wallonieBounds, testSource, 6, 1063, 1219); + verifyBounds(wallonieBounds, testSource, 11, 17724, 20324); + LatLon ll = new LatLon(testSource.tileXYToLatLon(1063, 1219, 6)); } private void verifyBounds(Bounds bounds, WMTSTileSource testSource, int z, int x, int y) { - LatLon ret = new LatLon(testSource.tileXYToLatLon(y, y, z)); + LatLon ret = new LatLon(testSource.tileXYToLatLon(x, y, z)); assertTrue(ret.toDisplayString() + " doesn't lie within: " + bounds.toString(), bounds.contains(ret)); + int tileXmax = testSource.getTileXMax(z); + int tileYmax = testSource.getTileYMax(z); + assertTrue("tile x: " + x + " is greater than allowed max: " + tileXmax, tileXmax >= x); + assertTrue("tile y: " + y + " is greater than allowed max: " + tileYmax, tileYmax >= y); } @@ -96,7 +106,6 @@ Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); WMTSTileSource testSource = new WMTSTileSource(testImageryWIEN); - int zoomOffset = 10; - - // Linz - 11/1105/709.png + int zoomOffset = 9; + verifyMercatorTile(testSource, 0, 0, 1, zoomOffset); verifyMercatorTile(testSource, 1105, 709, 2, zoomOffset); @@ -106,10 +115,4 @@ verifyMercatorTile(testSource, 1, 1, 2, zoomOffset); - - LatLon ll = new LatLon(testSource.tileXYToLatLon(500, 500, 1)); - - TileXY xy = testSource.latLonToTileXY(new LatLon(48.21, 14.24).toCoordinate(), 1); - assertTrue("X index is negative: " + xy.getXIndex(), xy.getXIndex() > 0); - assertTrue(xy.getYIndex() > 0); for (int x = 0; x < 4; x++) { for (int y = 0; y < 4; y++) { @@ -119,16 +122,23 @@ for (int x = 0; x < 8; x++) { for (int y = 0; y < 4; y++) { - verifyMercatorTile(testSource, x, y, zoomOffset); - } - } - - verifyMercatorTile(testSource, 2 << 9 - 1, 2 << 8 - 1, zoomOffset); - - assertEquals("TileXMax", 1, testSource.getTileXMax(1)); - assertEquals("TileYMax", 1, testSource.getTileYMax(1)); - assertEquals("TileXMax", 2, testSource.getTileXMax(2)); - assertEquals("TileYMax", 2, testSource.getTileYMax(2)); - assertEquals("TileXMax", 4, testSource.getTileXMax(3)); - assertEquals("TileYMax", 4, testSource.getTileYMax(3)); + verifyMercatorTile(testSource, x, y, 4, zoomOffset); + } + } + + verifyMercatorTile(testSource, 2 << 9 - 1, 2 << 8 - 1, 2, zoomOffset); + + verifyMercatorMax(testSource, 1, zoomOffset); + verifyMercatorMax(testSource, 2, zoomOffset); + verifyMercatorMax(testSource, 3, zoomOffset); + } + + private void verifyMercatorMax(WMTSTileSource testSource, int zoom, int zoomOffset) { + TemplatedTMSTileSource verifier = new TemplatedTMSTileSource(testImageryTMS); + int result = testSource.getTileXMax(zoom); + int expected = verifier.getTileXMax(zoom + zoomOffset); + assertTrue("TileXMax expected: " + expected + " got: " + result, Math.abs(result - expected) < 5); + result = testSource.getTileYMax(zoom); + expected = verifier.getTileYMax(zoom + zoomOffset); + assertTrue("TileYMax expected: " + expected + " got: " + result, Math.abs(result - expected) < 5); } @@ -141,13 +151,13 @@ verifyTile(new LatLon(51.1268639, 16.8731360), testSource, 1, 1, 2); - assertEquals("TileXMax", 37, testSource.getTileXMax(1)); - assertEquals("TileYMax", 19, testSource.getTileYMax(1)); - assertEquals("TileXMax", 74, testSource.getTileXMax(2)); - assertEquals("TileYMax", 37, testSource.getTileYMax(2)); - assertEquals("TileXMax", 148, testSource.getTileXMax(3)); - assertEquals("TileYMax", 74, testSource.getTileYMax(3)); + assertEquals("TileXMax", 2, testSource.getTileXMax(1)); + assertEquals("TileYMax", 1, testSource.getTileYMax(1)); + assertEquals("TileXMax", 3, testSource.getTileXMax(2)); + assertEquals("TileYMax", 2, testSource.getTileYMax(2)); + assertEquals("TileXMax", 6, testSource.getTileXMax(3)); + assertEquals("TileYMax", 4, testSource.getTileYMax(3)); assertEquals( "http://mapy.geoportal.gov.pl/wss/service/WMTS/guest/wmts/TOPO?SERVICE=WMTS&REQUEST=GetTile&" - + "VERSION=1.0.0&LAYER=MAPA TOPOGRAFICZNA&STYLE=&FORMAT=image/jpeg&tileMatrixSet=EPSG:4326&" + + "VERSION=1.0.0&LAYER=MAPA TOPOGRAFICZNA&STYLE=default&FORMAT=image/jpeg&tileMatrixSet=EPSG:4326&" + "tileMatrix=EPSG:4326:0&tileRow=1&tileCol=1", testSource.getTileUrl(1, 1, 1)); @@ -159,5 +169,4 @@ WMTSTileSource testSource = new WMTSTileSource(testImageryORTO_PL); verifyTile(new LatLon(53.5993712684958, 19.560669777688176), testSource, 12412, 3941, 14); - verifyTile(new LatLon(49.783096954497786, 22.79034127751704), testSource, 17714, 10206, 14); } @@ -187,12 +196,7 @@ 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()); + //System.out.println(z + "/" + x + "/" + y + " - result: " + result.toDisplayString() + " osmMercator: " + expected.toDisplayString()); assertEquals("Longitude" , expected.lon(), result.lon(), 1e-04); assertEquals("Latitude", expected.lat(), result.lat(), 1e-04); - //assertTrue("result: " + result.toDisplayString() + " osmMercator: " + expected.toDisplayString(), result.equalsEpsilon(expected)); -// LatLon tileCenter = new Bounds(result, new LatLon(testSource.tileXYToLatLon(x+1, y+1, z))).getCenter(); -// TileXY backwardsResult = testSource.latLonToTileXY(tileCenter.toCoordinate(), z); - //assertEquals(x, backwardsResult.getXIndex()); - //assertEquals(y, backwardsResult.getYIndex()); } }