Index: trunk/test/data/wmts/getCapabilities-wien.xml
===================================================================
--- trunk/test/data/wmts/getCapabilities-wien.xml (revision 8570)
+++ trunk/test/data/wmts/getCapabilities-wien.xml (revision 8584)
@@ -60,37 +60,4 @@
-
- Stadtkarte
-
- 14.42 48.21
- 14.24 48.38
-
- Stadtkarte
-
- image/png
-
- Stadtkarte_standard
-
-
-
-
- Beschriftungen
-
- 14.42 48.21
- 14.24 48.38
-
- Beschriftungen
-
- image/png
-
- Beschriftungen_alles
-
-
-
-
Orthofotos_standard
Index: trunk/test/data/wmts/getcapabilities-pseudo-mercator.xml
===================================================================
--- trunk/test/data/wmts/getcapabilities-pseudo-mercator.xml (revision 8570)
+++ trunk/test/data/wmts/getcapabilities-pseudo-mercator.xml (revision 8584)
@@ -53,5 +53,5 @@
EPSG:3857:0
559082264.0287178
- 20037509.917339604 -20037508.342789244
+ -20037508.3428 20037508.3428
256
256
@@ -63,5 +63,5 @@
EPSG:3857:1
279541132.0143589
- 20037509.917339604 -20037508.342789244
+ -20037508.3428 20037508.3428
256
256
@@ -73,5 +73,5 @@
EPSG:3857:2
139770566.0071794
- 20037509.917339604 -20037508.342789244
+ -20037508.3428 20037508.3428
256
256
@@ -83,5 +83,5 @@
EPSG:3857:3
69885283.00358972
- 20037509.917339604 -20037508.342789244
+ -20037508.3428 20037508.3428
256
256
@@ -93,5 +93,5 @@
EPSG:3857:4
34942641.50179486
- 20037509.917339604 -20037508.342789244
+ -20037508.3428 20037508.3428
256
256
@@ -103,5 +103,5 @@
EPSG:3857:5
17471320.75089743
- 20037509.917339604 -20037508.342789244
+ -20037508.3428 20037508.3428
256
256
@@ -113,5 +113,5 @@
EPSG:3857:6
8735660.375448715
- 20037509.917339604 -20037508.342789244
+ -20037508.3428 20037508.3428
256
256
@@ -123,5 +123,5 @@
EPSG:3857:7
4367830.187724357
- 20037509.917339604 -20037508.342789244
+ -20037508.3428 20037508.3428
256
256
@@ -133,5 +133,5 @@
EPSG:3857:8
2183915.093862179
- 20037509.917339604 -20037508.342789244
+ -20037508.3428 20037508.3428
256
256
@@ -143,5 +143,5 @@
EPSG:3857:9
1091957.546931089
- 20037509.917339604 -20037508.342789244
+ -20037508.3428 20037508.3428
256
256
@@ -153,5 +153,5 @@
EPSG:3857:10
545978.7734655447
- 20037509.917339604 -20037508.342789244
+ -20037508.3428 20037508.3428
256
256
Index: trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (revision 8570)
+++ trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (revision 8584)
@@ -3,4 +3,5 @@
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.io.File;
@@ -10,7 +11,9 @@
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;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.projection.Projections;
@@ -69,4 +72,5 @@
assertEquals("TileXMax", 5, testSource.getTileXMax(3));
assertEquals("TileYMax", 4, testSource.getTileYMax(3));
+
}
@@ -75,5 +79,18 @@
Main.setProjection(Projections.getProjectionByCode("EPSG:31370"));
WMTSTileSource testSource = new WMTSTileSource(testImageryWALLONIE);
- }
+ Bounds wallonieBounds = new Bounds(
+ new LatLon(49.485372459967245, 2.840548314430268),
+ new LatLon(50.820959517561256, 6.427849693016202)
+ );
+ verifyBounds(wallonieBounds, testSource, 10, 20324, 17724);
+
+ }
+
+ private void verifyBounds(Bounds bounds, WMTSTileSource testSource, int z, int x, int y) {
+ LatLon ret = new LatLon(testSource.tileXYToLatLon(y, y, z));
+ assertTrue(ret.toDisplayString() + " doesn't lie within: " + bounds.toString(), bounds.contains(ret));
+ }
+
+
@Test
@@ -83,19 +100,30 @@
int zoomOffset = 10;
+ // Linz - 11/1105/709.png
verifyMercatorTile(testSource, 0, 0, 1, zoomOffset);
+ verifyMercatorTile(testSource, 1105, 709, 2, zoomOffset);
+ verifyMercatorTile(testSource, 1, 1, 1, zoomOffset);
+ verifyMercatorTile(testSource, 2, 2, 1, zoomOffset);
verifyMercatorTile(testSource, 0, 0, 2, zoomOffset);
verifyMercatorTile(testSource, 1, 1, 2, zoomOffset);
- for (int x = 0; x < 4; x++) {
- for (int y = 0; y < 4; y++) {
+
+
+ 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++) {
verifyMercatorTile(testSource, x, y, 3, zoomOffset);
}
}
- for (int x = 0; x < 8; x++) {
- for (int y = 0; y < 4; y++) {
+ 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);
+ verifyMercatorTile(testSource, 2<<9 - 1, 2<<8 - 1, zoomOffset);
assertEquals("TileXMax", 1, testSource.getTileXMax(1));
@@ -122,6 +150,7 @@
assertEquals("TileYMax", 74, 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&TileMatrix=EPSG:4326:0&TileRow=1&TileCol=1",
+ "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&"
+ + "tileMatrix=EPSG:4326:0&tileRow=1&tileCol=1",
testSource.getTileUrl(1, 1, 1));
}