Changeset 12725 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.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/data/osm/visitor/BoundingXYVisitor.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java

@@ -74 +74 @@
      * Visiting call for lat/lon.
      * @param latlon lat/lon
+     * @since 12725 (public for ILatLon parameter)
+     */
+    public void visit(ILatLon latlon) {
+        if (latlon != null) {
+            visit(latlon.getEastNorth(Main.getProjection()));
+        }
+    }
+
+    /**
+     * Visiting call for lat/lon.
+     * @param latlon lat/lon
      */
     public void visit(LatLon latlon) {
-        if (latlon != null) {
-            visit((ILatLon) latlon);
-        }
-    }
-
-    private void visit(ILatLon latlon) {
-        visit(latlon.getEastNorth());
+        visit((ILatLon) latlon);
     }
 
@@ -138 +143 @@
         bounds = new ProjectionBounds(new LatLon(
                         Math.max(-90, minLatlon.lat() - enlargeDegree),
-                        Math.max(-180, minLatlon.lon() - enlargeDegree)).getEastNorth(),
+                        Math.max(-180, minLatlon.lon() - enlargeDegree)).getEastNorth(Main.getProjection()),
                 new LatLon(
                         Math.min(90, maxLatlon.lat() + enlargeDegree),
-                        Math.min(180, maxLatlon.lon() + enlargeDegree)).getEastNorth());
+                        Math.min(180, maxLatlon.lon() + enlargeDegree)).getEastNorth(Main.getProjection()));
     }