Changeset 8000

Timestamp:

09/11/08 13:39:41 (3 months ago)

Author:

tschaub

Message:

Adding a BBOX strategy. This triggers requests for data within a bounding box. When the map bounds invalidate previous data bounds, another request is issued. Reads are triggered with a spatial filter, and protocols that understand how to deal with filters may serialize the filter to request a subset of the data collection. The HTTP protocol understands one filter - the bbox filter. So the BBOX strategy can be used in conjunction with the HTTP protocol to request data via http in a bounding box. Thanks for the collaboration and tests Eric. r=elemoine,crschmidt (#1731)

Files:

• trunk/openlayers/examples/strategy-bbox.html (added)
• trunk/openlayers/lib/OpenLayers.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Protocol/HTTP.js (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Strategy/BBOX.js (added)
• trunk/openlayers/tests/Protocol/HTTP.html (modified) (1 diff)
• trunk/openlayers/tests/Strategy/BBOX.html (added)
• trunk/openlayers/tests/list-tests.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers.js

@@ -186 +186 @@
-            "OpenLayers/Strategy.js",
-            "OpenLayers/Strategy/Fixed.js",
+            "OpenLayers/Strategy/BBOX.js",
-            "OpenLayers/Protocol.js",
-            "OpenLayers/Protocol/HTTP.js",

trunk/openlayers/lib/OpenLayers/Protocol/HTTP.js

@@ -113 +113 @@
-     *     This object is modified and should not be reused.
-     *
+     * Valid options:
+     * url - {String} Url for the request.
+     * params - {Object} Parameters to get serialized as a query string.
+     * headers - {Object} Headers to be set on the request.
+     * filter - {<OpenLayers.Filter.BBOX>} If a bbox filter is sent, it will be
+     *     serialized according to the OpenSearch Geo extension
+     *     (bbox=minx,miny,maxx,maxy).  Note that a BBOX filter as the child
+     *     of a logical filter will not be serialized.
+     *
-     * Returns:
-     * {<OpenLayers.Protocol.Response>} A response object, whose "priv" property
@@ -122 +131 @@
-        options = OpenLayers.Util.applyDefaults(options, this.options);
-        var resp = new OpenLayers.Protocol.Response({requestType: "read"});
+        
+        if(options.filter && options.filter instanceof OpenLayers.Filter.Spatial) {
+            if(options.filter.type == OpenLayers.Filter.Spatial.BBOX) {
+                options.params = OpenLayers.Util.extend(options.params, {
+                    bbox: options.filter.value.toArray()
+                });
+            }
+        }
-
-        resp.priv = OpenLayers.Request.GET({

trunk/openlayers/tests/Protocol/HTTP.html

@@ -103 +103 @@
-
-        var resp = protocol.read(readOptions);
+    }
+
+    function test_read_bbox(t) {
+        t.plan(1);
+        var protocol = new OpenLayers.Protocol.HTTP();
+
+        // fake XHR request object
+        var request = {'status': 200};
+
+        var _get = OpenLayers.Request.GET;
+
+        var bounds = new OpenLayers.Bounds(1, 2, 3, 4);
+        var filter = new OpenLayers.Filter.Spatial({
+            type: OpenLayers.Filter.Spatial.BBOX,
+            value: bounds,
+            projection: "foo"
+        });
+        
+        OpenLayers.Request.GET = function(options) {
+            t.eq(options.params['bbox'].toString(), bounds.toArray().toString(),
+                'GET called with bbox filter in params');
+            return request;
+        };
+
+        var resp = protocol.read({filter: filter});
-    }
-

trunk/openlayers/tests/list-tests.html

@@ -126 +126 @@
-    <li>Strategy.html</li>
-    <li>Strategy/Fixed.html</li>
+    <li>Strategy/BBOX.html</li>
-    <li>Style.html</li>
-    <li>StyleMap.html</li>