Changeset 14120 in josm for trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java

Timestamp:

2018-08-11T17:29:48+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate all Main methods related to projections. New ProjectionRegistry class

File:

• trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (modified) (20 diffs)

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

@@ -21 +21 @@
 import org.openstreetmap.gui.jmapviewer.TileXY;
 import org.openstreetmap.gui.jmapviewer.tilesources.TemplatedTMSTileSource;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Bounds;
@@ -27 +26 @@
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
 import org.openstreetmap.josm.data.imagery.WMTSTileSource.WMTSGetCapabilitiesException;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -85 +85 @@
     @Test
     public void testPseudoMercator() throws IOException, WMTSGetCapabilitiesException {
-        Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
+        ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3857"));
         WMTSTileSource testSource = new WMTSTileSource(testImageryPSEUDO_MERCATOR);
-        testSource.initProjection(Main.getProjection());
+        testSource.initProjection(ProjectionRegistry.getProjection());
 
         verifyMercatorTile(testSource, 0, 0, 1);
@@ -115 +115 @@
     @Test
     public void testWALLONIE() throws IOException, WMTSGetCapabilitiesException {
-        Main.setProjection(Projections.getProjectionByCode("EPSG:31370"));
+        ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:31370"));
         WMTSTileSource testSource = new WMTSTileSource(testImageryWALLONIE);
-        testSource.initProjection(Main.getProjection());
+        testSource.initProjection(ProjectionRegistry.getProjection());
 
         assertEquals("http://geoservices.wallonie.be/arcgis/rest/services/DONNEES_BASE/FOND_PLAN_ANNOTATIONS_2012_RW_NB/"
@@ -135 +135 @@
     @Ignore("disable this test, needs further working") // XXX
     public void testWALLONIENoMatrixDimension() throws IOException, WMTSGetCapabilitiesException {
-        Main.setProjection(Projections.getProjectionByCode("EPSG:31370"));
+        ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:31370"));
         WMTSTileSource testSource = new WMTSTileSource(getImagery("test/data/wmts/WMTSCapabilities-Wallonie-nomatrixdimension.xml"));
-        testSource.initProjection(Main.getProjection());
+        testSource.initProjection(ProjectionRegistry.getProjection());
 
         Bounds wallonieBounds = new Bounds(
@@ -159 +159 @@
     @Test
     public void testWIEN() throws IOException, WMTSGetCapabilitiesException {
-        Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
+        ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3857"));
         WMTSTileSource testSource = new WMTSTileSource(testImageryWIEN);
-        testSource.initProjection(Main.getProjection());
+        testSource.initProjection(ProjectionRegistry.getProjection());
         int zoomOffset = 10;
 
@@ -201 +201 @@
     @Test
     public void testGeoportalTOPOPL() throws IOException, WMTSGetCapabilitiesException {
-        Main.setProjection(Projections.getProjectionByCode("EPSG:4326"));
+        ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:4326"));
         WMTSTileSource testSource = new WMTSTileSource(testImageryTOPO_PL);
-        testSource.initProjection(Main.getProjection());
+        testSource.initProjection(ProjectionRegistry.getProjection());
         verifyTile(new LatLon(56, 12), testSource, 0, 0, 1);
         verifyTile(new LatLon(56, 12), testSource, 0, 0, 2);
@@ -223 +223 @@
     @Test
     public void testGeoportalORTOPL4326() throws IOException, WMTSGetCapabilitiesException {
-        Main.setProjection(Projections.getProjectionByCode("EPSG:4326"));
+        ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:4326"));
         WMTSTileSource testSource = new WMTSTileSource(testImageryORTO_PL);
-        testSource.initProjection(Main.getProjection());
+        testSource.initProjection(ProjectionRegistry.getProjection());
         verifyTile(new LatLon(53.60205873528009, 19.552206794646956), testSource, 12412, 3941, 13);
         verifyTile(new LatLon(49.79005619189761, 22.778262259134397), testSource, 17714, 10206, 13);
@@ -232 +232 @@
     @Test
     public void testGeoportalORTOPL2180() throws IOException, WMTSGetCapabilitiesException {
-        Main.setProjection(Projections.getProjectionByCode("EPSG:2180"));
+        ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:2180"));
         WMTSTileSource testSource = new WMTSTileSource(testImageryORTO_PL);
-        testSource.initProjection(Main.getProjection());
+        testSource.initProjection(ProjectionRegistry.getProjection());
 
         verifyTile(new LatLon(53.59940948387726, 19.560544913270064), testSource, 6453, 3140, 13);
@@ -242 +242 @@
     @Test
     public void testTicket12168() throws IOException, WMTSGetCapabilitiesException {
-        Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
+        ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3857"));
         WMTSTileSource testSource = new WMTSTileSource(testImagery12168);
-        testSource.initProjection(Main.getProjection());
+        testSource.initProjection(ProjectionRegistry.getProjection());
         assertEquals(
                 "http://www.ngi.be/cartoweb/1.0.0/topo/default/3857/7/1/1.png",
@@ -252 +252 @@
     @Test
     public void testTwoTileSetsForOneProjection() throws Exception {
-        Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
+        ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3857"));
         ImageryInfo ontario = getImagery(TestUtils.getTestDataRoot() + "wmts/WMTSCapabilities-Ontario.xml");
         ontario.setDefaultLayers(Arrays.asList(new DefaultLayer[] {
@@ -258 +258 @@
         }));
         WMTSTileSource testSource = new WMTSTileSource(ontario);
-        testSource.initProjection(Main.getProjection());
+        testSource.initProjection(ProjectionRegistry.getProjection());
         assertEquals(
                 "http://maps.ottawa.ca/arcgis/rest/services/Basemap_Imagery_2014/MapServer/WMTS/tile/1.0.0/Basemap_Imagery_2014/default/"
@@ -269 +269 @@
     @Test
     public void testTwoTileSetsForOneProjectionSecondLayer() throws Exception {
-        Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
+        ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3857"));
         ImageryInfo ontario = getImagery(TestUtils.getTestDataRoot() + "wmts/WMTSCapabilities-Ontario.xml");
         ontario.setDefaultLayers(Arrays.asList(new DefaultLayer[] {
@@ -275 +275 @@
         }));
         WMTSTileSource testSource = new WMTSTileSource(ontario);
-        testSource.initProjection(Main.getProjection());
+        testSource.initProjection(ProjectionRegistry.getProjection());
         assertEquals(
                 "http://maps.ottawa.ca/arcgis/rest/services/Basemap_Imagery_2014/MapServer/WMTS/tile/1.0.0/Basemap_Imagery_2014/default/"
@@ -286 +286 @@
     @Test
     public void testManyLayersScrollbars() throws Exception {
-        Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
+        ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3857"));
         WMTSTileSource testSource = new WMTSTileSource(testLotsOfLayers);
-        testSource.initProjection(Main.getProjection());
+        testSource.initProjection(ProjectionRegistry.getProjection());
     }
 
     @Test
     public void testParserForDuplicateTags() throws Exception {
-        Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
+        ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3857"));
         WMTSTileSource testSource = new WMTSTileSource(testDuplicateTags);
-        testSource.initProjection(Main.getProjection());
+        testSource.initProjection(ProjectionRegistry.getProjection());
         assertEquals(
                 "http://tile.informatievlaanderen.be/ws/raadpleegdiensten/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=grb_bsk&"
@@ -305 +305 @@
     @Test
     public void testParserForMissingStyleIdentifier() throws Exception {
-        Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
+        ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3857"));
         WMTSTileSource testSource = new WMTSTileSource(testMissingStyleIdentifer);
-        testSource.initProjection(Main.getProjection());
+        testSource.initProjection(ProjectionRegistry.getProjection());
     }
 
     @Test
     public void testForMultipleTileMatricesForOneLayerProjection() throws Exception {
-        Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
+        ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3857"));
         ImageryInfo copy = new ImageryInfo(testMultipleTileMatrixForLayer);
         List<DefaultLayer> defaultLayers = new ArrayList<>(1);
@@ -318 +318 @@
         copy.setDefaultLayers(defaultLayers);
         WMTSTileSource testSource = new WMTSTileSource(copy);
-        testSource.initProjection(Main.getProjection());
+        testSource.initProjection(ProjectionRegistry.getProjection());
         assertEquals(
                 "http://188.253.0.155:6080/arcgis/rest/services/Mashhad_BaseMap_1/MapServer/WMTS/tile/1.0.0/Mashhad_BaseMap_1"
@@ -333 +333 @@
     @Test
     public void testDimension() throws IOException, WMTSGetCapabilitiesException {
-        Main.setProjection(Projections.getProjectionByCode("EPSG:21781"));
+        ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:21781"));
         ImageryInfo info = new ImageryInfo(testImageryGeoAdminCh);
         List<DefaultLayer> defaultLayers = new ArrayList<>(1);
@@ -339 +339 @@
         info.setDefaultLayers(defaultLayers);
         WMTSTileSource testSource = new WMTSTileSource(info);
-        testSource.initProjection(Main.getProjection());
+        testSource.initProjection(ProjectionRegistry.getProjection());
         assertEquals(
                 "http://wmts.geo.admin.ch/1.0.0/ch.are.agglomerationen_isolierte_staedte/default/20140101/21781/1/3/2.png",
@@ -414 +414 @@
     @Test
     public void testGisKtnGvAt() throws IOException, WMTSGetCapabilitiesException {
-        Main.setProjection(Projections.getProjectionByCode("EPSG:31258"));
+        ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:31258"));
         final WMTSTileSource source = new WMTSTileSource(testImageryGisKtnGvAt);
-        source.initProjection(Main.getProjection());
+        source.initProjection(ProjectionRegistry.getProjection());
         final TileXY tile = source.latLonToTileXY(46.6103, 13.8558, 11);
         assertEquals("https://gis.ktn.gv.at/arcgis/rest/services/tilecache/Ortho_2013_2015" +