Changeset 8584 in josm for trunk/test
- Timestamp:
- 2015-07-08T20:59:09+02:00 (9 years ago)
- Location:
- trunk/test
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/data/wmts/getCapabilities-wien.xml
r8569 r8584 60 60 <ResourceURL format="image/png" template="http://webgis.linz.at/WMTS/1.0.0/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png" resourceType="tile"/> 61 61 </Layer> 62 <Layer>63 <ows:Title>Stadtkarte</ows:Title>64 <ows:WGS84BoundingBox crs="urn:ogc:def:crs:OGC:2:84">65 <ows:LowerCorner>14.42 48.21</ows:LowerCorner>66 <ows:UpperCorner>14.24 48.38</ows:UpperCorner>67 </ows:WGS84BoundingBox>68 <ows:Identifier>Stadtkarte</ows:Identifier>69 <Style isDefault="true">70 <ows:Identifier>normal</ows:Identifier>71 </Style>72 <Format>image/png</Format>73 <TileMatrixSetLink>74 <TileMatrixSet>Stadtkarte_standard</TileMatrixSet>75 </TileMatrixSetLink>76 <ResourceURL format="image/png" template="http://webgis.linz.at/WMTS/1.0.0/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png" resourceType="tile"/>77 </Layer>78 <Layer>79 <ows:Title>Beschriftungen</ows:Title>80 <ows:WGS84BoundingBox crs="urn:ogc:def:crs:OGC:2:84">81 <ows:LowerCorner>14.42 48.21</ows:LowerCorner>82 <ows:UpperCorner>14.24 48.38</ows:UpperCorner>83 </ows:WGS84BoundingBox>84 <ows:Identifier>Beschriftungen</ows:Identifier>85 <Style isDefault="true">86 <ows:Identifier>normal</ows:Identifier>87 </Style>88 <Format>image/png</Format>89 <TileMatrixSetLink>90 <TileMatrixSet>Beschriftungen_alles</TileMatrixSet>91 </TileMatrixSetLink>92 <ResourceURL format="image/png" template="http://webgis.linz.at/WMTS/1.0.0/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png" resourceType="tile"/>93 </Layer>94 95 62 <TileMatrixSet> 96 63 <ows:Identifier>Orthofotos_standard</ows:Identifier> -
trunk/test/data/wmts/getcapabilities-pseudo-mercator.xml
r8568 r8584 53 53 <ows:Identifier>EPSG:3857:0</ows:Identifier> 54 54 <ScaleDenominator>559082264.0287178</ScaleDenominator> 55 <TopLeftCorner> 20037509.917339604 -20037508.342789244</TopLeftCorner>55 <TopLeftCorner>-20037508.3428 20037508.3428</TopLeftCorner> 56 56 <TileWidth>256</TileWidth> 57 57 <TileHeight>256</TileHeight> … … 63 63 <ows:Identifier>EPSG:3857:1</ows:Identifier> 64 64 <ScaleDenominator>279541132.0143589</ScaleDenominator> 65 <TopLeftCorner> 20037509.917339604 -20037508.342789244</TopLeftCorner>65 <TopLeftCorner>-20037508.3428 20037508.3428</TopLeftCorner> 66 66 <TileWidth>256</TileWidth> 67 67 <TileHeight>256</TileHeight> … … 73 73 <ows:Identifier>EPSG:3857:2</ows:Identifier> 74 74 <ScaleDenominator>139770566.0071794</ScaleDenominator> 75 <TopLeftCorner> 20037509.917339604 -20037508.342789244</TopLeftCorner>75 <TopLeftCorner>-20037508.3428 20037508.3428</TopLeftCorner> 76 76 <TileWidth>256</TileWidth> 77 77 <TileHeight>256</TileHeight> … … 83 83 <ows:Identifier>EPSG:3857:3</ows:Identifier> 84 84 <ScaleDenominator>69885283.00358972</ScaleDenominator> 85 <TopLeftCorner> 20037509.917339604 -20037508.342789244</TopLeftCorner>85 <TopLeftCorner>-20037508.3428 20037508.3428</TopLeftCorner> 86 86 <TileWidth>256</TileWidth> 87 87 <TileHeight>256</TileHeight> … … 93 93 <ows:Identifier>EPSG:3857:4</ows:Identifier> 94 94 <ScaleDenominator>34942641.50179486</ScaleDenominator> 95 <TopLeftCorner> 20037509.917339604 -20037508.342789244</TopLeftCorner>95 <TopLeftCorner>-20037508.3428 20037508.3428</TopLeftCorner> 96 96 <TileWidth>256</TileWidth> 97 97 <TileHeight>256</TileHeight> … … 103 103 <ows:Identifier>EPSG:3857:5</ows:Identifier> 104 104 <ScaleDenominator>17471320.75089743</ScaleDenominator> 105 <TopLeftCorner> 20037509.917339604 -20037508.342789244</TopLeftCorner>105 <TopLeftCorner>-20037508.3428 20037508.3428</TopLeftCorner> 106 106 <TileWidth>256</TileWidth> 107 107 <TileHeight>256</TileHeight> … … 113 113 <ows:Identifier>EPSG:3857:6</ows:Identifier> 114 114 <ScaleDenominator>8735660.375448715</ScaleDenominator> 115 <TopLeftCorner> 20037509.917339604 -20037508.342789244</TopLeftCorner>115 <TopLeftCorner>-20037508.3428 20037508.3428</TopLeftCorner> 116 116 <TileWidth>256</TileWidth> 117 117 <TileHeight>256</TileHeight> … … 123 123 <ows:Identifier>EPSG:3857:7</ows:Identifier> 124 124 <ScaleDenominator>4367830.187724357</ScaleDenominator> 125 <TopLeftCorner> 20037509.917339604 -20037508.342789244</TopLeftCorner>125 <TopLeftCorner>-20037508.3428 20037508.3428</TopLeftCorner> 126 126 <TileWidth>256</TileWidth> 127 127 <TileHeight>256</TileHeight> … … 133 133 <ows:Identifier>EPSG:3857:8</ows:Identifier> 134 134 <ScaleDenominator>2183915.093862179</ScaleDenominator> 135 <TopLeftCorner> 20037509.917339604 -20037508.342789244</TopLeftCorner>135 <TopLeftCorner>-20037508.3428 20037508.3428</TopLeftCorner> 136 136 <TileWidth>256</TileWidth> 137 137 <TileHeight>256</TileHeight> … … 143 143 <ows:Identifier>EPSG:3857:9</ows:Identifier> 144 144 <ScaleDenominator>1091957.546931089</ScaleDenominator> 145 <TopLeftCorner> 20037509.917339604 -20037508.342789244</TopLeftCorner>145 <TopLeftCorner>-20037508.3428 20037508.3428</TopLeftCorner> 146 146 <TileWidth>256</TileWidth> 147 147 <TileHeight>256</TileHeight> … … 153 153 <ows:Identifier>EPSG:3857:10</ows:Identifier> 154 154 <ScaleDenominator>545978.7734655447</ScaleDenominator> 155 <TopLeftCorner> 20037509.917339604 -20037508.342789244</TopLeftCorner>155 <TopLeftCorner>-20037508.3428 20037508.3428</TopLeftCorner> 156 156 <TileWidth>256</TileWidth> 157 157 <TileHeight>256</TileHeight> -
trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java
r8570 r8584 3 3 4 4 import static org.junit.Assert.assertEquals; 5 import static org.junit.Assert.assertTrue; 5 6 6 7 import java.io.File; … … 10 11 import org.junit.BeforeClass; 11 12 import org.junit.Test; 13 import org.openstreetmap.gui.jmapviewer.TileXY; 12 14 import org.openstreetmap.gui.jmapviewer.tilesources.TemplatedTMSTileSource; 13 15 import org.openstreetmap.josm.JOSMFixture; 14 16 import org.openstreetmap.josm.Main; 17 import org.openstreetmap.josm.data.Bounds; 15 18 import org.openstreetmap.josm.data.coor.LatLon; 16 19 import org.openstreetmap.josm.data.projection.Projections; … … 69 72 assertEquals("TileXMax", 5, testSource.getTileXMax(3)); 70 73 assertEquals("TileYMax", 4, testSource.getTileYMax(3)); 74 71 75 } 72 76 … … 75 79 Main.setProjection(Projections.getProjectionByCode("EPSG:31370")); 76 80 WMTSTileSource testSource = new WMTSTileSource(testImageryWALLONIE); 77 } 81 Bounds wallonieBounds = new Bounds( 82 new LatLon(49.485372459967245, 2.840548314430268), 83 new LatLon(50.820959517561256, 6.427849693016202) 84 ); 85 verifyBounds(wallonieBounds, testSource, 10, 20324, 17724); 86 87 } 88 89 private void verifyBounds(Bounds bounds, WMTSTileSource testSource, int z, int x, int y) { 90 LatLon ret = new LatLon(testSource.tileXYToLatLon(y, y, z)); 91 assertTrue(ret.toDisplayString() + " doesn't lie within: " + bounds.toString(), bounds.contains(ret)); 92 } 93 94 78 95 79 96 @Test … … 83 100 int zoomOffset = 10; 84 101 102 // Linz - 11/1105/709.png 85 103 verifyMercatorTile(testSource, 0, 0, 1, zoomOffset); 104 verifyMercatorTile(testSource, 1105, 709, 2, zoomOffset); 105 verifyMercatorTile(testSource, 1, 1, 1, zoomOffset); 106 verifyMercatorTile(testSource, 2, 2, 1, zoomOffset); 86 107 verifyMercatorTile(testSource, 0, 0, 2, zoomOffset); 87 108 verifyMercatorTile(testSource, 1, 1, 2, zoomOffset); 88 for (int x = 0; x < 4; x++) { 89 for (int y = 0; y < 4; y++) { 109 110 111 LatLon ll = new LatLon(testSource.tileXYToLatLon(500, 500, 1)); 112 113 TileXY xy = testSource.latLonToTileXY(new LatLon(48.21, 14.24).toCoordinate(), 1); 114 assertTrue("X index is negative: " + xy.getXIndex(), xy.getXIndex() > 0); 115 assertTrue(xy.getYIndex() > 0); 116 for(int x = 0; x < 4; x++) { 117 for(int y = 0; y < 4; y++) { 90 118 verifyMercatorTile(testSource, x, y, 3, zoomOffset); 91 119 } 92 120 } 93 for 94 for 121 for(int x = 0; x < 8; x++) { 122 for(int y = 0; y < 4; y++) { 95 123 verifyMercatorTile(testSource, x, y, zoomOffset); 96 124 } 97 125 } 98 126 99 verifyMercatorTile(testSource, 2 << 9 - 1, 2 <<8 - 1, zoomOffset);127 verifyMercatorTile(testSource, 2<<9 - 1, 2<<8 - 1, zoomOffset); 100 128 101 129 assertEquals("TileXMax", 1, testSource.getTileXMax(1)); … … 122 150 assertEquals("TileYMax", 74, testSource.getTileYMax(3)); 123 151 assertEquals( 124 "http://mapy.geoportal.gov.pl/wss/service/WMTS/guest/wmts/TOPO?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=MAPA " 125 + "TOPOGRAFICZNA&STYLE=&FORMAT=image/jpeg&TileMatrixSet=EPSG:4326&TileMatrix=EPSG:4326:0&TileRow=1&TileCol=1", 152 "http://mapy.geoportal.gov.pl/wss/service/WMTS/guest/wmts/TOPO?SERVICE=WMTS&REQUEST=GetTile&" 153 + "VERSION=1.0.0&LAYER=MAPA TOPOGRAFICZNA&STYLE=&FORMAT=image/jpeg&tileMatrixSet=EPSG:4326&" 154 + "tileMatrix=EPSG:4326:0&tileRow=1&tileCol=1", 126 155 testSource.getTileUrl(1, 1, 1)); 127 156 }
Note:
See TracChangeset
for help on using the changeset viewer.