Changeset 8770 in josm for trunk/test/unit/org/openstreetmap/josm/data/imagery

Timestamp:

2015-09-21T01:40:14+02:00 (9 years ago)

Author:

Don-vip

Message:

don't use deprecated method in unit test

File:

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

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

@@ -8 +8 @@
 import org.junit.Test;
 import org.openstreetmap.gui.jmapviewer.TileXY;
+import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
 import org.openstreetmap.gui.jmapviewer.tilesources.TemplatedTMSTileSource;
 import org.openstreetmap.josm.JOSMFixture;
@@ -125 +126 @@
         TemplatedTMSTileSource verifier = new TemplatedTMSTileSource(testImageryTMS);
         LatLon result = getTileLatLon(source, x, y, z);
-        LatLon expected = new LatLon(verifier.tileYToLat(y, z - 1), verifier.tileXToLon(x, z - 1));
-        assertEquals(expected.lat(), result.lat(), 1e-4);
-        assertEquals(expected.lon(), result.lon(), 1e-4);
+        ICoordinate expected = verifier.tileXYToLatLon(x, y, z - 1);
+        assertEquals(expected.getLat(), result.lat(), 1e-4);
+        assertEquals(expected.getLon(), result.lon(), 1e-4);
         //assertTrue("result: " + result.toDisplayString() + " osmMercator: " +  expected.toDisplayString(), result.equalsEpsilon(expected));
         LatLon tileCenter = new Bounds(result, getTileLatLon(source, x+1, y+1, z)).getCenter();