Changeset 12725 in josm for trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

Timestamp:

2017-09-04T20:19:23+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - deprecate ILatLon#getEastNorth() so ILatLon has no dependency on Main.proj

File:

• trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (modified) (4 diffs)

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

@@ -23 +23 @@
 import javax.swing.ImageIcon;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
 import org.openstreetmap.josm.data.coor.CachedLatLon;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxConstants;
@@ -75 +77 @@
  * @author Frederik Ramm
  */
-public class Marker implements TemplateEngineDataProvider {
+public class Marker implements TemplateEngineDataProvider, ILatLon {
 
     public static final class TemplateEntryProperty extends CachedProperty<TemplateEntry> {
@@ -318 +320 @@
 
     /**
+     * @since 12725
+     */
+    @Override
+    public double lon() {
+        return coor == null ? Double.NaN : coor.lon();
+    }
+
+    /**
+     * @since 12725
+     */
+    @Override
+    public double lat() {
+        return coor == null ? Double.NaN : coor.lat();
+    }
+
+    /**
      * Returns the marker's projected coordinates.
      * @return The marker's projected coordinates (easting/northing)
-     */
+     * @deprecated use {@link #getEastNorth(org.openstreetmap.josm.data.projection.Projecting)}
+     */
+    @Deprecated
     public final EastNorth getEastNorth() {
-        return coor.getEastNorth();
+        return coor.getEastNorth(Main.getProjection());
     }
 
@@ -354 +374 @@
      */
     public void paint(Graphics g, MapView mv, boolean mousePressed, boolean showTextOrIcon) {
-        Point screen = mv.getPoint(getEastNorth());
+        Point screen = mv.getPoint(this);
         if (symbol != null && showTextOrIcon) {
             paintIcon(mv, g, screen.x-symbol.getIconWidth()/2, screen.y-symbol.getIconHeight()/2);