Changeset 14120 in josm for trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.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/gui/layer/markerlayer/PlayHeadMarker.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java

@@ -22 +22 @@
 import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -215 +216 @@
             for (Marker m : recent.parentLayer.data) {
                 if (m instanceof AudioMarker) {
-                    double distanceSquared = m.getEastNorth(Main.getProjection()).distanceSq(en);
+                    double distanceSquared = m.getEastNorth(ProjectionRegistry.getProjection()).distanceSq(en);
                     if (distanceSquared < closestAudioMarkerDistanceSquared) {
                         ca = (AudioMarker) m;
@@ -348 +349 @@
             return;
         setEastNorth(w2 == null ?
-                w1.getEastNorth(Main.getProjection()) :
-                    w1.getEastNorth(Main.getProjection()).interpolate(w2.getEastNorth(Main.getProjection()),
+                w1.getEastNorth(ProjectionRegistry.getProjection()) :
+                    w1.getEastNorth(ProjectionRegistry.getProjection()).interpolate(w2.getEastNorth(ProjectionRegistry.getProjection()),
                             (audioTime - w1.time)/(w2.time - w1.time)));
         time = audioTime;