Ticket #110: animatedPanning#2.patch

tests/test_Util.html

@@ -563 +563 @@
-        
- 
-    }
-
+16_
-        t.plan(1);
-        OpenLayers.Util.lastSeqID = 0;
-        OpenLayers.Util.createDiv();
-        OpenLayers.Util.createDiv();
-        t.eq(OpenLayers.Util.createDiv().id, "OpenLayersDiv3", "Div created is sequential, starting at lastSeqID in Util.");
-    }
+
+    function test_17_Util_easeInOutPan(t) {
+        t.plan(1);
+        var delta = 5; 
+        var totalSteps = 4;
+        var step = 1;
+        var power = 1;
+        var value = OpenLayers.Util.easeInOutPan(delta,totalSteps,step,power);
+        t.eq( value, 2, "calculation correct");
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-   // -->
-  </script>
-</head>

tests/test_Map.html

@@ -316 +316 @@
-        t.ok(map.getCenter().equals(new OpenLayers.LonLat(0,0)), "safely sets out-of-bounds lonlat");
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    function test_01_Map_defaultTheme(t) {
-        t.plan(5);
-        

tests/Control/test_Permalink.html

@@ -20 +20 @@
-        if (!map.getCenter())  map.zoomToMaxExtent();
-        map.addControl(control);
-        map.pan(5, 0);
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-    function test_03_Control_Permalink_updateLinksBase (t) {
-        t.plan( 2 );
@@ -37 +39 @@
-        if (!map.getCenter())  map.zoomToMaxExtent();
-        map.addControl(control);
-        map.pan(5, 0);
-
-
+
+
+
+
-  }
-  function test_04_Control_Permalink_noElement (t) {
-        t.plan( 2 );

tests/Control/test_PanZoom.html

@@ -42 +42 @@
-        map.setCenter(centerLL, 5);
-
-        control.buttons[0].onmousedown(evt);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-control.buttons[1
-t.ok( map.getCenter().lon < centerLL.lon, "Pan lef
+        control.buttons[6
+        t.eq( map.getZoom(), 5, "zoomou
-
-
-
+
+
+
+
-
-        control.buttons[3].onmousedown(evt);
-        t.ok( map.getCenter().lat == centerLL.lat, "Pan down works correctly" );
-
-        control.buttons[4].onmousedown(evt);
-        t.eq( map.getZoom(), 6, "zoomin works correctly" );
-
-        control.buttons[6].onmousedown(evt);
-        t.eq( map.getZoom(), 5, "zoomout works correctly" );
-
-        control.buttons[5].onmousedown(evt);
-        t.eq( map.getZoom(), 2, "zoomworld works correctly" );
-
-    }
-  // -->
-  </script>

lib/OpenLayers/Control/PanZoom.js

@@ -15 +15 @@
-  OpenLayers.Class.inherit( OpenLayers.Control, {
-
-    /** @type int */
-50
+75
-
-    /** @type Array of Button Divs */
-    buttons: null,
@@ -114 +114 @@
-
-        switch (this.action) {
-            case "panup": 
-50
+this.slideFactor
-                break;
-            case "pandown": 
-50
+this.slideFactor
-                break;
-            case "panleft": 
-50
+this.slideFactor
-                break;
-            case "panright": 
-50
+this.slideFactor
-                break;
-            case "zoomin": 
-                this.map.zoomIn(); 

lib/OpenLayers/Layer.js

@@ -529 +529 @@
-            var size = this.map.getSize();
-            var center = this.map.getCenter();
-            var res  = this.map.getResolution();
-
-
-
+
+Math.ceil
+Math.ceil
-            
-            lonlat = new OpenLayers.LonLat(center.lon + delta_x * res ,
-                                         center.lat - delta_y * res); 

lib/OpenLayers/Map.js

@@ -136 +136 @@
-    /** @type string */
-    theme: null,
-
+
+    //ANIMATION
+    
+    /** @type Boolean */
+    animated: true,
+
+    /** steps in the slide
+     * 
+     * @type int */
+    slideSteps: 4,  
+    
+    /** millisecondss between each step
+     * 
+     * @type int */
+    slideWait: 1,
+
+    /** power used to calculate width of slide steps
+     * 
+     * @type float*/
+    slidePower: 0.7,
+
+    /** @type int */
+    animatedPanningIntervalID: null,
+
-    /** Should OpenLayers allow events on the map to fall through to other
-     *   elements on the page, or should it swallow them? (#457)
-     * 
@@ -749 +773 @@
-     * @param {int} dx
-     * @param {int} dy
-     */
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+    
+    
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        }
-
-   },
-
-    /**
@@ -871 +905 @@
-            this.layerContainerDiv.style.top  = (originPx.y - newPx.y) + "px";
-        }
-    },
+    /** Position changer with Memory by www.hesido.com
+     *  modified by dncpax for OpenLayers
+     * 
+     * @param {int} slideX
+     * @param {int} slideY
+     * @param {int} totalSteps
+     * @param {int} intervals
+     * @param {float} power 
+     */
+    panSlide: function( slideX, slideY, totalSteps, interval, power) {
+        if (this.animatedPanningIntervalID) {
+            window.clearInterval(this.animatedPanningIntervalID);
+            this.animatedPanningIntervalID = null;
+        }
+        var context = {
+            'map': this,
+            'slideX': slideX,
+            'slideY': slideY,
+            'totalSteps': totalSteps,
+            'step': 0,
+            'power': power
+        };
+        var move = function() {
+            var dx = OpenLayers.Util.easeInOutPan(this.slideX, 
+                                                this.totalSteps, 
+                                                this.step, 
+                                                this.power);
+            var dy = OpenLayers.Util.easeInOutPan(this.slideY,
+                                                this.totalSteps, 
+                                                this.step, 
+                                                this.power);
+            this.map.pan(dx, dy, false);
+            this.step++;
+            if (this.step > this.totalSteps) {
+                window.clearInterval(this.map.animatedPanningIntervalID);
+                this.map.animatedPanningIntervalID = null;
+            }
+        };
-
+        this.animatedPanningIntervalID = 
+            window.setInterval(move.bindAsEventListener(context), 
+                               interval);
+    },
+
-    /**
-     * @private 
-     * 

lib/OpenLayers/Util.js

@@ -965 +965 @@
-    }
-    return head;
-};
+
+
+/** Generic Animation Step Value Generator By www.hesido.com, slightly modified
+ * 
+ * 
+ * @param {int} delta
+ * @param {int} totalSteps
+ * @param {int} step
+ * @param {float} power
+ * 
+ * @returns The delta to the next position in the pan animation movement
+ * @type int
+ */
+OpenLayers.Util.easeInOutPan = function(delta, totalSteps, step, power) {
+    var prevStepVal = Math.pow(((1/totalSteps)*(step-1)),power) * delta;
+    var stepVal = Math.pow(((1/totalSteps)*step),power) * delta;
+    return Math.ceil(stepVal) - Math.ceil(prevStepVal);
+};
+