Changeset 2327 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2009-10-27T01:21:32+01:00 (15 years ago)

Author:

Gubaer

Message:

Cleanup in download logic (less global, more encapsulation)

File:

• trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java

@@ -59 +59 @@
     static public int getZoom(Bounds b) {
         // convert to mercator (for calculation of zoom only)
-        double latMin = Math.log(Math.tan(Math.PI/4.0+b.min.lat()/180.0*Math.PI/2.0))*180.0/Math.PI;
-        double latMax = Math.log(Math.tan(Math.PI/4.0+b.max.lat()/180.0*Math.PI/2.0))*180.0/Math.PI;
-        double size = Math.max(Math.abs(latMax-latMin), Math.abs(b.max.lon()-b.min.lon()));
+        double latMin = Math.log(Math.tan(Math.PI/4.0+b.getMin().lat()/180.0*Math.PI/2.0))*180.0/Math.PI;
+        double latMax = Math.log(Math.tan(Math.PI/4.0+b.getMax().lat()/180.0*Math.PI/2.0))*180.0/Math.PI;
+        double size = Math.max(Math.abs(latMax-latMin), Math.abs(b.getMax().lon()-b.getMin().lon()));
         int zoom = 0;
         while (zoom <= 20) {