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

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -516 +516 @@
      * @return The point on screen where "point" would be drawn, relative to the own top/left.
      */
-    public Point2D getPoint2D(LatLon latlon) {
+    public Point2D getPoint2D(ILatLon latlon) {
         if (latlon == null) {
             return new Point();
         } else {
-            return getPoint2D(latlon.getEastNorth());
-        }
+            return getPoint2D(latlon.getEastNorth(Main.getProjection()));
+        }
+    }
+
+    /**
+     * Return the point on the screen where this Coordinate would be.
+     *
+     * Alternative: {@link #getState()}, then {@link MapViewState#getPointFor(ILatLon)}
+     * @param latlon The point, where this geopoint would be drawn.
+     * @return The point on screen where "point" would be drawn, relative to the own top/left.
+     */
+    public Point2D getPoint2D(LatLon latlon) {
+        return getPoint2D((ILatLon) latlon);
     }
 
@@ -551 +562 @@
      * @return point
      * @see #getPoint2D(LatLon)
-     */
-    public Point getPoint(LatLon latlon) {
+     * @since 12725
+     */
+    public Point getPoint(ILatLon latlon) {
         Point2D d = getPoint2D(latlon);
         return new Point((int) d.getX(), (int) d.getY());
+    }
+
+    /**
+     * looses precision, may overflow (depends on p and current scale)
+     * @param latlon lat/lon
+     * @return point
+     * @see #getPoint2D(LatLon)
+     */
+    public Point getPoint(LatLon latlon) {
+        return getPoint((ILatLon) latlon);
     }
 
@@ -690 +712 @@
      * Zoom to given lat/lon.
      * @param newCenter new center coordinates
+     * @since 12725
+     */
+    public void zoomTo(ILatLon newCenter) {
+        zoomTo(Projections.project(newCenter));
+    }
+
+    /**
+     * Zoom to given lat/lon.
+     * @param newCenter new center coordinates
      */
     public void zoomTo(LatLon newCenter) {
-        zoomTo(Projections.project(newCenter));
+        zoomTo((ILatLon) newCenter);
     }