Changeset 16458 in osm for applications/editors/josm/plugins/slippymap

Timestamp:

2009-07-12T20:25:26+02:00 (15 years ago)

Author:

dhansen

Message:

This makes sure that we don't get into any zooming loops.
We only recursively call to repaint when we've actually
changed zoom level, just just when we've attempted to
change.

File:

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

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

@@ -577 +577 @@
                 if (ts.tilesSpanned() > (18*18)) {
                         System.out.println("too many tiles, decreasing zoom from " + currentZoomLevel);
-                        if (decreaseZoomLevel()) {
+            if (decreaseZoomLevel())
                                 this.paint(oldg, mv);
-                        }
-                        return;
-                }//end of if more than 18*18
+            return;
+            }
                 
                 if (ts.tilesSpanned() <= 0) {
                         System.out.println("doesn't even cover one tile, increasing zoom from " + currentZoomLevel);
-                        if (increaseZoomLevel()) {
-                                this.paint(oldg, mv);
-                        }
-                        return;
-                }
+            if (increaseZoomLevel())
+                 this.paint(oldg, mv);
+            return;
+        }
 
                 int fontHeight = g.getFontMetrics().getHeight();