Changeset 8568 in josm for trunk/test

Timestamp:

2015-07-04T22:52:23+02:00 (9 years ago)

Author:

wiktorn

Message:

Basic WMTS support.

• added information about units and to_meter to EPSG projection definitions (needed for WMTS)
• added WMTSTileSource and WMTSLayer classes
• a bit of cleanup of AbstractTileSourceLayer and align so it will work properly with WMTS tile definitions
• added Imagery Preferences panel for WMTS and icon for button
• added removal of wms: / tms: / wmts: prefix, if user will paste them into the field
• CachedFile - added possibility to send custom headers with request
• added support for unit and to_meter in CustomProjection
• AbstractTMSTileSource cleanups (change of Coordinate to ICoordinate)
• moved JCSCachedTileLoaderJob.read() to Utils

Addresses: #10623

Tested with Polish WMTS service proivders, Walonnie needs still some debugging, as it is not working right now.

Location:

trunk/test

Files:

• data/wmts (added)
• data/wmts/getcapabilities-ORTO.xml (added)
• data/wmts/getcapabilities-TOPO.xml (added)
• data/wmts/getcapabilities-pseudo-mercator.xml (added)
• unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java (modified) (3 diffs)
• unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (added)

trunk/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java

@@ -7 +7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openstreetmap.gui.jmapviewer.Tile;
 import org.openstreetmap.gui.jmapviewer.TileXY;
 import org.openstreetmap.gui.jmapviewer.tilesources.TemplatedTMSTileSource;
@@ -48 +47 @@
             }
         }
+        verifyTileSquarness(source, 150, 20, 18);
         verifyTileSquarness(source, 2270, 1323, 12);
         verifyLocation(source, new LatLon(53.5937132, 19.5652017));
@@ -109 +109 @@
 
     private LatLon getTileLatLon(TemplatedWMSTileSource source, int x, int y, int z) {
-        return new LatLon(source.tileXYToLatLon(new Tile(source, x, y, z)));
+        return new LatLon(source.tileXYToLatLon(x, y, z));
     }