Changeset 12669 in josm for trunk/test

Timestamp:

2017-08-27T00:17:49+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - remove dependence on JMapViewer for package data.coor (only useful for imagery)

Location:

trunk/test/unit/org/openstreetmap/josm/data/imagery

Files:

• TemplatedWMSTileSourceTest.java (modified) (3 diffs)
• WMTSTileSourceTest.java (modified) (3 diffs)

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

@@ -159 +159 @@
         assertEquals(LatLon.normalizeLon(expected.getLon() - result.lon()), 0.0, 1e-4);
         LatLon tileCenter = new Bounds(result, getTileLatLon(source, x+1, y+1, z)).getCenter();
-        TileXY backwardsResult = source.latLonToTileXY(tileCenter.toCoordinate(), z);
+        TileXY backwardsResult = source.latLonToTileXY(CoordinateConversion.llToCoor(tileCenter), z);
         assertEquals(x, backwardsResult.getXIndex());
         assertEquals(y, backwardsResult.getYIndex());
@@ -179 +179 @@
                 );
 
-        TileXY tileIndex = source.latLonToTileXY(location.toCoordinate(), z);
+        TileXY tileIndex = source.latLonToTileXY(CoordinateConversion.llToCoor(location), z);
 
         assertTrue("X index: " + tileIndex.getXIndex() + " greater than tileXmax: " + source.getTileXMax(z) + " at zoom: " + z,
@@ -213 +213 @@
 
     private LatLon getTileLatLon(TemplatedWMSTileSource source, int x, int y, int z) {
-        return new LatLon(source.tileXYToLatLon(x, y, z));
+        return CoordinateConversion.coorToLL(source.tileXYToLatLon(x, y, z));
     }
 

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

@@ -129 +129 @@
 
     private void verifyBounds(Bounds bounds, WMTSTileSource testSource, int z, int x, int y) {
-        LatLon ret = new LatLon(testSource.tileXYToLatLon(x, y, z));
+        LatLon ret = CoordinateConversion.coorToLL(testSource.tileXYToLatLon(x, y, z));
         assertTrue(ret.toDisplayString() + " doesn't lie within: " + bounds.toString(), bounds.contains(ret));
         int tileXmax = testSource.getTileXMax(z);
@@ -303 +303 @@
 
     private void verifyTile(LatLon expected, WMTSTileSource source, int x, int y, int z) {
-        LatLon ll = new LatLon(source.tileXYToLatLon(x, y, z));
+        LatLon ll = CoordinateConversion.coorToLL(source.tileXYToLatLon(x, y, z));
         assertEquals("Latitude", expected.lat(), ll.lat(), 1e-05);
         assertEquals("Longitude", expected.lon(), ll.lon(), 1e-05);
@@ -314 +314 @@
     private void verifyMercatorTile(WMTSTileSource testSource, int x, int y, int z, int zoomOffset) {
         TemplatedTMSTileSource verifier = new TemplatedTMSTileSource(testImageryTMS);
-        LatLon result = new LatLon(testSource.tileXYToLatLon(x, y, z));
-        LatLon expected = new LatLon(verifier.tileXYToLatLon(x, y, z + zoomOffset));
+        LatLon result = CoordinateConversion.coorToLL(testSource.tileXYToLatLon(x, y, z));
+        LatLon expected = CoordinateConversion.coorToLL(verifier.tileXYToLatLon(x, y, z + zoomOffset));
         assertEquals("Longitude", LatLon.normalizeLon(expected.lon() - result.lon()), 0.0, 1e-04);
         assertEquals("Latitude", expected.lat(), result.lat(), 1e-04);