Ticket #750: getDataExtent.patch

tests/Layer/test_Markers.html

@@ -49 +49 @@
-        layer.destroy();
-        t.eq( layer.map, null, "layer.map is null after destroy" );
-    }
+
+    function test_03_Layer_Markers_getDataExtent(t) {
+        t.plan( 4 );
+
+        var layer = {};
+        var ret = OpenLayers.Layer.Markers.prototype.getDataExtent.apply(layer, []);
+        t.eq(ret, null, "does not crash, returns null on layer with null 'this.markers'");
+
+        layer.markers = [];
+        ret = OpenLayers.Layer.Markers.prototype.getDataExtent.apply(layer, []);
+        t.eq(ret, null, "returns null on layer with empty 'this.markers'");
+        
+        layer.markers.push({
+            'lonlat': new OpenLayers.LonLat(4,5)
+        });
+        var expectedBounds = new OpenLayers.Bounds(4,5,4,5);
+        ret = OpenLayers.Layer.Markers.prototype.getDataExtent.apply(layer, []);
+        t.ok(ret.equals(expectedBounds), "returns expected bounds with only one marker");
+
+        layer.markers.push({
+            'lonlat': new OpenLayers.LonLat(1,2)
+        });
+        var expectedBounds = new OpenLayers.Bounds(1,2,4,5);
+        ret = OpenLayers.Layer.Markers.prototype.getDataExtent.apply(layer, []);
+        t.ok(ret.equals(expectedBounds), "returns expected bounds with multiple markers");
+
+    }
+
-  // -->
-  </script>
-</head>

lib/OpenLayers/Layer.js

@@ -723 +723 @@
-        return this.getZoomForResolution(idealResolution);
-    },
-    
+    /** 
+     * Method: getDataExtent
+     * Calculates the max extent which includes all of the data for the layer.
+     *     This function is to be implemented by subclasses.
+     * 
+     * Returns:
+     * {<OpenLayers.Bounds>}
+     */
+    getDataExtent: function () {
+        //to be implemented by subclasses
+    },
+
-    /**
-     * APIMethod: getZoomForResolution
-     * 

lib/OpenLayers/Layer/Markers.js

@@ -139 +139 @@
-            }
-        }
-    },
+    
+    /** 
+     * Method: getDataExtent
+     * Calculates the max extent which includes all of the markers.
+     * 
+     * Returns:
+     * {<OpenLayers.Bounds>}
+     */
+    getDataExtent: function () {
+        var maxExtent = null;
+        
+        if ( this.markers && (this.markers.length > 0)) {
+            var maxExtent = new OpenLayers.Bounds();
+            for(var i=0; i < this.markers.length; i++) {
+                var marker = this.markers[i];
+                maxExtent.extend(marker.lonlat);
+            }
+        }
-
+        return maxExtent;
+    },
+
-    CLASS_NAME: "OpenLayers.Layer.Markers"
-});