Ticket #442: final_animatedZooming_PanZoomBar.patch

tests/Control/test_PanZoomBar.html

@@ -30 +30 @@
-        map.addControl(control2, new OpenLayers.Pixel(100,100));
-        t.eq( control2.div.style.top, "100px", "2nd control div is located correctly");
-    }
+
+    function test_03_Control_PanZoomBar_control_events (t) {
+        t.plan( 3 );
+
+        var evt = {which: 1}; // control expects left-click
+        map = new OpenLayers.Map('map');
+        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);
+        var centerLL = new OpenLayers.LonLat(0,0); 
+        map.setCenter(centerLL, 0);
+
+        evt.xy = new OpenLayers.Pixel(10,115); 
+        evt.object = control;
+        control.divClick(evt);
+        t.delay_call(
+            1, function() {
+                t.eq(map.zoom, 5, 
+                    "Clicking on the zoombar has the correct effect on zoomlevel");
+
+                control.zoomBarDown(evt);
+                evt.xy.y -= 30;  
+                control.zoomBarDrag(evt);
+
+                control.zoomBarUp(evt);
+            },
+            1, function() {
+                t.eq(map.zoom, 8, 
+                    "Dragging the zoomslider works correctly");
+                t.eq(control.slider.style.top, "159px", 
+                    "Zoomslider top position has been set correctly");
+            }
+
+        );
+        
+
+
+    }
+
-  // -->
-  </script>
-</head>

lib/OpenLayers/Control/PanZoomBar.js

@@ -152 +152 @@
-        var y = evt.xy.y;
-        var top = OpenLayers.Util.pagePosition(evt.object)[1];
-        var levels = Math.floor((y - top)/this.zoomStopHeight);
-
+
+
+
+
-        OpenLayers.Event.stop(evt);
-    },
-    
@@ -165 +168 @@
-        this.map.events.register("mousemove", this, this.passEventToSlider);
-        this.map.events.register("mouseup", this, this.passEventToSlider);
-        this.mouseDragStart = evt.xy.clone();
-
+map.
-        this.div.style.cursor = "move";
+
+        // get and set some settings for zoom animation 
+        this.map.prepareZoomAnimation();
+        
-        OpenLayers.Event.stop(evt);
-    },
-    
@@ -186 +193 @@
-                this.slider.style.top = newTop+"px";
-            }
-            this.mouseDragStart = evt.xy.clone();
+           
+            // set current slider position
+            var sliderPosition = new OpenLayers.Pixel(evt.xy.x, evt.xy.y); 
+
+            // run zoom animation -> scale tile(s)
+            this.map.runZoomAnimation(this.zoomStopHeight, sliderPosition);
+      
-            OpenLayers.Event.stop(evt);
-        }
-    },
@@ -197 +211 @@
-     */
-    zoomBarUp:function(evt) {
-        if (!OpenLayers.Event.isLeftClick(evt)) return;
-
+map.
-            this.div.style.cursor="default";
-            this.map.events.unregister("mouseup", this, this.passEventToSlider);
-            this.map.events.unregister("mousemove", this, this.passEventToSlider);
-
-
+
+
+
+
+
+
+
+
-            this.moveZoomBar();
-            this.mouseDragStart = null;
-            OpenLayers.Event.stop(evt);
@@ -211 +231 @@
-    
-    /* 
-    * Change the location of the slider to match the current zoom level.
+    *
+    * @param {float} zoomlevel
-    */
-
-
-
+
+
+
+
+
+
+
+
-            this.zoomStopHeight + this.startTop + 1;
-        this.slider.style.top = newTop + "px";
-    },