Changeset 7678

Timestamp:

08/01/08 21:56:36 (4 months ago)

Author:

crschmidt

Message:

"panTo should use tween if new center is in the current bounds + a ratio".
Add a bounds.scale method (takes a ratio and an optional center) and
call it from the panTo to give a ratio we can pan inside of. Patch by
sbenthall, r=me,elemoine (Closes #1341)

Files:

• trunk/openlayers/lib/OpenLayers/BaseTypes/Bounds.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Map.js (modified) (2 diffs)
• trunk/openlayers/tests/BaseTypes/Bounds.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/BaseTypes/Bounds.js

@@ -218 +218 @@
-        return new OpenLayers.LonLat( (this.left + this.right) / 2,
-                                      (this.bottom + this.top) / 2);
+    },
+
+    /**
+     * Method: scale
+     * Scales the bounds around a pixel or lonlat. Note that the new 
+     *     bounds may return non-integer properties, even if a pixel
+     *     is passed. 
+     * 
+     * Parameters:
+     * ratio - {Float} 
+     * origin - {<OpenLayers.Pixel> or <OpenLayers.LonLat>}
+     *          Default is center.
+     *
+     * Returns:
+     * {<OpenLayers.Bound>} A new bounds that is scaled by ratio
+     *                      from origin.
+     */
+
+    scale: function(ratio, origin){
+        if(origin == null){
+            origin = this.getCenterLonLat();
+        }
+
+        var bounds = [];
+        
+        var origx,origy;
+
+        // get origin coordinates
+        if(origin.CLASS_NAME == "OpenLayers.LonLat"){
+            origx = origin.lon;
+            origy = origin.lat;
+        } else {
+            origx = origin.x;
+            origy = origin.y;
+        }
+
+        var left = (this.left - origx) * ratio + origx;
+        var bottom = (this.bottom - origy) * ratio + origy;
+        var right = (this.right - origx) * ratio + origx;
+        var top = (this.top - origy) * ratio + origy;
+
+        return new OpenLayers.Bounds(left, bottom, right, top);
-    },
-

trunk/openlayers/lib/OpenLayers/Map.js

@@ -198 +198 @@
-
-    /**
+     * Property: panRatio
+     * {Float} The ratio of the current extent within
+     *         which panning will tween.
+     */
+    panRatio: 1.5,    
+
+    /**
-     * Property: viewRequestID
-     * {String} Used to store a unique identifier that changes when the map 
@@ -1369 +1376 @@
-     */
-    panTo: function(lonlat) {
-
+scale(this.panRatio).
-            if (!this.panTween) {
-                this.panTween = new OpenLayers.Tween(this.panMethod);

trunk/openlayers/tests/BaseTypes/Bounds.html

@@ -558 +558 @@
-    }
-
+    function test_Bounds_scale(t) {
+        t.plan(3);
+
+        origBounds = new OpenLayers.Bounds(1,2,3,4);
+        bounds = origBounds.scale(2);  
+        var b = new OpenLayers.Bounds(0,1,4,5);
+        t.ok(bounds.equals(b), "Bounds scale correctly with default origin at center")
+
+        var origin = new OpenLayers.Pixel(0,1);
+        bounds = origBounds.scale(2,origin);
+        b = new OpenLayers.Bounds(2,3,6,7);
+        t.ok(bounds.equals(b), "Bounds scale correctly with offset origin");
+
+        origin = new OpenLayers.Pixel(5,1);
+        bounds = bounds.scale(2, origin);
+        b = new OpenLayers.Bounds(-1, 5, 7, 13);
+        t.ok(bounds.equals(b), "Bounds scale correctly with offset origin");
+
+    }
-
-  </script>