Changeset 6799

Timestamp:

04/07/08 00:08:33 (5 months ago)

Author:

crschmidt

Message:

2.6 accidentally broke behavior when clicking on the panzoombar. Thanks to Linda Rawson's report of this issue, this is now fixed, by moving the Math.floor call to a different part of the code. r=euzuro (Pullup #1486)

Files:

• trunk/openlayers/lib/OpenLayers/Control/PanZoomBar.js (modified) (1 diff)
• trunk/openlayers/tests/Control/PanZoomBar.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Control/PanZoomBar.js

@@ -243 +243 @@
-        var top = OpenLayers.Util.pagePosition(evt.object)[1];
-        var levels = (y - top)/this.zoomStopHeight;
+        if(!this.map.fractionalZoom) {
+            levels = Math.floor(levels);
+        }    
-        var zoom = (this.map.getNumZoomLevels() - 1) - levels; 
-
-
-
-
-
+
-        this.map.zoomTo(zoom);
-        OpenLayers.Event.stop(evt);

trunk/openlayers/tests/Control/PanZoomBar.html

@@ -34 +34 @@
-        t.eq( control2.div.style.top, "100px", "2nd control div is located correctly");
-    }
+    function test_Control_PanZoomBar_divClick (t) {
+        t.plan(2);
+        map = new OpenLayers.Map('map', {controls:[]});
+        var layer = new OpenLayers.Layer.WMS("Test Layer", 
+            "http://octo.metacarta.com/cgi-bin/mapserv?",
+            {map: "/mapdata/vmap_wms.map", layers: "basic"});
+        map.addLayer(layer);
+        control = new OpenLayers.Control.PanZoomBar();
+        map.addControl(control);
+        control.divClick({'xy': {'x': 0, 'y': 50}, which: 1});
+        t.eq(map.zoom, 11, "zoom is correct on standard map");
+
+        map.fractionalZoom = true;
+        control.divClick({'xy': {'x': 0, 'y': 49}, which: 1});
+        t.eq(map.zoom.toFixed(3), '10.545', "zoom is correct on fractional zoom map");
+    
+    }
-
-  </script>