Changeset 1702

Timestamp:

10/17/06 18:23:19 (2 years ago)

Author:

crschmidt

Message:

Use calculateBounds function from patch on #228. This is a refactoring of the
code that Tim Schaub contributed on that patch. Thanks Tim!

Files:

• trunk/openlayers/lib/OpenLayers/Layer.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Map.js (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Layer.js

@@ -446 +446 @@
-    },
-
-
-
-
-
+
-     * @returns A Bounds object which represents the lon/lat bounds of the 
-     *          current viewPort.
-     * @type OpenLayers.Bounds
-     */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    },
-

trunk/openlayers/lib/OpenLayers/Map.js

@@ -607 +607 @@
-        return size;
-    },
+
+    /** 
+     * @param {OpenLayers.LonLat} center Default is this.getCenter()
+     * @param {float} resolution Default is this.getResolution() 
+     * 
+     * @returns A Bounds based on resolution, center, and current mapsize.
+     * @type OpenLayers.Bounds
+     */
+    calculateBounds: function(center, resolution) {
+
+        var extent = null;
+        
+        if (center == null) {
+            center = this.getCenter();
+        }                
+        if (resolution == null) {
+            resolution = this.getResolution();
+        }
+    
+        if ((center != null) && (resolution != null)) {
+
+            var size = this.getSize();
+            var w_deg = size.w * resolution;
+            var h_deg = size.h * resolution;
+        
+            extent = new OpenLayers.Bounds(center.lon - w_deg / 2,
+                                           center.lat - h_deg / 2,
+                                           center.lon + w_deg / 2,
+                                           center.lat + h_deg / 2);
+        
+        }
+
+        return extent;
+    },
+
-
-  /********************************************************/