Changeset 14120 in josm for trunk/src/org/openstreetmap/josm/data/gpx/GpxData.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/src/org/openstreetmap/josm/data/gpx/GpxData.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

@@ -20 +20 @@
 import java.util.stream.Stream;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.Data;
@@ -26 +25 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.gpx.GpxTrack.GpxTrackChangeListener;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
@@ -539 +539 @@
                 WayPoint r = null;
                 for (WayPoint wpSeg : seg.getWayPoints()) {
-                    EastNorth en = wpSeg.getEastNorth(Main.getProjection());
+                    EastNorth en = wpSeg.getEastNorth(ProjectionRegistry.getProjection());
                     if (r == null) {
                         r = wpSeg;
@@ -586 +586 @@
                 }
                 if (r != null) {
-                    EastNorth c = r.getEastNorth(Main.getProjection());
+                    EastNorth c = r.getEastNorth(ProjectionRegistry.getProjection());
                     /* if there is only one point in the seg, it will do this twice, but no matter */
                     rx = c.east();
@@ -603 +603 @@
         if (bestEN == null)
             return null;
-        WayPoint best = new WayPoint(Main.getProjection().eastNorth2latlon(bestEN));
+        WayPoint best = new WayPoint(ProjectionRegistry.getProjection().eastNorth2latlon(bestEN));
         best.time = bestTime;
         return best;