Changeset 18731 in osm for applications

Timestamp:

2009-11-21T20:10:36+01:00 (15 years ago)

Author:

dhansen

Message:

Fixes null pointer error when snapping to tile size.

This is a race that can occur when the user rezooms
then clicks on a tile before any have been drawn.

It can also happen when not autoloading tiles.

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

@@ -216 +216 @@
                 new AbstractAction(tr("Snap to tile size")) {
                     public void actionPerformed(ActionEvent ae) {
+                        if (lastImageScale == null) {
+                            out("please wait for a tile to be loaded before snapping");
+                            return;
+                        }
                         double new_factor = Math.sqrt(lastImageScale);
                         if (debug)
@@ -628 +632 @@
                 continue;
             drawImageInside(g, img, sourceRect, borderRect);
-            if (autoZoomEnabled() &&
-                !imageScaleRecorded && zoom == currentZoomLevel) {
+            if (!imageScaleRecorded && zoom == currentZoomLevel) {
                 lastImageScale = new Double(getImageScaling(img, sourceRect));
                 imageScaleRecorded = true;