Changeset 16462 in osm for applications/editors/josm/plugins/slippymap/src

Timestamp:

2009-07-12T20:31:35+02:00 (15 years ago)

Author:

dhansen

Message:

It was silly to return the number of tiles seen in terms of
square tiles. It's more natural to think in terms of number
of tiles in a single direction, so return the sqrt().

File:

• applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java (modified) (3 diffs)

applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java

@@ -519 +519 @@
                 }
 
-                int tilesSpanned() {
+                double tilesSpanned() {
                         int x_span = z12x1 - z12x0;
                         int y_span = z12y1 - z12y0;
-                        return x_span * y_span;
+                        return Math.sqrt(1.0 * x_span * y_span);
                 }
 
@@ -585 +585 @@
                 int zoom = currentZoomLevel;
 
-                if (zoomDecreaseAllowed() && (ts.tilesSpanned() > (18*18))) {
+                if (zoomDecreaseAllowed() && (ts.tilesSpanned() > 18)) {
                         this.debug("too many tiles, decreasing zoom from " + currentZoomLevel);
             if (decreaseZoomLevel())
@@ -591 +591 @@
                         return;
                 }
-                if (zoomIncreaseAllowed() && (ts.tilesSpanned() <= 0)) {
+                if (zoomIncreaseAllowed() && (ts.tilesSpanned() < 1.0)) {
                         this.debug("doesn't even cover one tile (" + ts.tilesSpanned() 
                                            + "), increasing zoom from " + currentZoomLevel);