Changeset 14120 in josm for trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.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/gpx/GpxDataTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxDataTest.java

@@ -20 +20 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Bounds;
@@ -28 +27 @@
 import org.openstreetmap.josm.data.gpx.GpxData.GpxDataChangeEvent;
 import org.openstreetmap.josm.data.gpx.GpxData.GpxDataChangeListener;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.ListenerList;
@@ -327 +327 @@
         List<WayPoint> points = Stream
                 .of(new EastNorth(10, 10), new EastNorth(10, 0), new EastNorth(-1, 0))
-                .map(Main.getProjection()::eastNorth2latlon)
+                .map(ProjectionRegistry.getProjection()::eastNorth2latlon)
                 .map(WayPoint::new)
                 .collect(Collectors.toList());
@@ -336 +336 @@
 
         WayPoint close = data.nearestPointOnTrack(new EastNorth(5, 5), 10);
-        assertEquals(10, close.getEastNorth(Main.getProjection()).east(), .01);
-        assertEquals(5, close.getEastNorth(Main.getProjection()).north(), .01);
+        assertEquals(10, close.getEastNorth(ProjectionRegistry.getProjection()).east(), .01);
+        assertEquals(5, close.getEastNorth(ProjectionRegistry.getProjection()).north(), .01);
 
         close = data.nearestPointOnTrack(new EastNorth(15, 5), 10);
-        assertEquals(10, close.getEastNorth(Main.getProjection()).east(), .01);
-        assertEquals(5, close.getEastNorth(Main.getProjection()).north(), .01);
+        assertEquals(10, close.getEastNorth(ProjectionRegistry.getProjection()).east(), .01);
+        assertEquals(5, close.getEastNorth(ProjectionRegistry.getProjection()).north(), .01);
 
         assertNull(data.nearestPointOnTrack(new EastNorth(5, 5), 1));