Changeset 12163 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor

Timestamp:

2017-05-15T15:57:36+02:00 (8 years ago)

Author:

michael2402

Message:

Make use of ILatLon#getEastNorth

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (modified) (4 diffs)

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

@@ -7 +7 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.ProjectionBounds;
-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.osm.Node;
@@ -27 +27 @@
     @Override
     public void visit(Node n) {
-        visit(n.getEastNorth());
+        visit((ILatLon) n);
     }
 
@@ -75 +75 @@
     public void visit(LatLon latlon) {
         if (latlon != null) {
-            if (latlon instanceof CachedLatLon) {
-                visit(((CachedLatLon) latlon).getEastNorth());
-            } else {
-                visit(Main.getProjection().latlon2eastNorth(latlon));
-            }
-        }
+            visit((ILatLon) latlon);
+        }
+    }
+
+    private void visit(ILatLon latlon) {
+        visit(latlon.getEastNorth());
     }
 
@@ -134 +134 @@
         LatLon minLatlon = Main.getProjection().eastNorth2latlon(bounds.getMin());
         LatLon maxLatlon = Main.getProjection().eastNorth2latlon(bounds.getMax());
-        bounds = new ProjectionBounds(
-                Main.getProjection().latlon2eastNorth(new LatLon(
+        bounds = new ProjectionBounds(new LatLon(
                         Math.max(-90, minLatlon.lat() - enlargeDegree),
-                        Math.max(-180, minLatlon.lon() - enlargeDegree))),
-                Main.getProjection().latlon2eastNorth(new LatLon(
+                        Math.max(-180, minLatlon.lon() - enlargeDegree)).getEastNorth(),
+                new LatLon(
                         Math.min(90, maxLatlon.lat() + enlargeDegree),
-                        Math.min(180, maxLatlon.lon() + enlargeDegree))));
+                        Math.min(180, maxLatlon.lon() + enlargeDegree)).getEastNorth());
     }