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

Timestamp:

2010-04-29T17:15:09+02:00 (14 years ago)

Author:

dhansen

Message:

Fix autozoom fight when windows are really small.

The tile set size and the pixelation autozoom code are fighting.
This happens when the window is less than one tile wide.

See the comment for a bit more of a description. This is just a workaround.

File:

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

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

@@ -802 +802 @@
     }
 
+    boolean az_disable = false;
     boolean autoZoomEnabled()
     {
+        if (az_disable)
+            return false;
         return autoZoomPopup.isSelected();
     }
@@ -852 +855 @@
                     out("too zoomed in, (" + ts.tilesSpanned()
                         + "), increasing zoom from " + currentZoomLevel);
+                // This is a hack.  ts.tooSmall() is proabably a bad thing, and this works
+                // around it.  If we have a very small window, the tileSet may be well
+                // less than 1 real tile wide, but that's expected.  But, this sees the
+                // tile set as too small and zooms in.  The code below that checks for
+                // pixel stretching disagrees and tries to zoom out.  Both calls recurse,
+                // hillarity ensues, and the stack overflows.
+                //
+                // This really needs to get fixed properly.  We probably shouldn't even
+                // have the tooSmall() check on tileSets.  But, this also helps the zoom
+                // converge to the correct place much faster.
+                boolean tmp = az_disable;
+                az_disable = true;
                 if (increaseZoomLevel())
                      this.paint(oldg, mv, bounds);
+                az_disable = tmp;
                 return;
             }