Ticket #496: patch-MapFish-496-r2729-A1.diff

server/python/mapfish/tests/test_protocol.py

@@ -64 +64 @@
     assert filter.values["epsg"] == 900913
 
     request = FakeRequest(
+        {"bbox": "-45,-5,40,0", "tolerance": "1", "epsg": "900913"}
+    )
+    filter = create_geom_filter(request, MappedClass)
+    assert isinstance(filter, spatial.Spatial)
+    assert filter.type == spatial.Spatial.BOX
+    assert filter.values["tolerance"] == 1
+    assert filter.values["epsg"] == 900913
+
+    request = FakeRequest(
         {"lon": "-45", "lat": "5", "tolerance": "1", "epsg": "900913"}
     )
     filter = create_geom_filter(request, MappedClass)

server/python/mapfish/lib/protocol.py

@@ -79 +79 @@
     if 'epsg' in request.params:
         epsg = int(request.params['epsg'])
 
-    if 'box' in request.params:
+    # "box" is an alias to "bbox"
+    box = None
+    if 'bbox' in request.params:
+        box = request.params['bbox']
+    elif 'box' in request.params:
+        box = request.params['box']
+
+    if box is not None:
         # box spatial filter
         filter = Spatial(
             Spatial.BOX,
             geom_column,
-            box=request.params['box'].split(','),
+            box=box.split(','),
             tolerance=tolerance,
             epsg=epsg
         )

client/mfbase/mapfish/tests/core/Protocol/MapFish.html

@@ -106 +106 @@
             }
         };
         protocol.filterAdapter(options);
-        t.eq(options.params.box, bbox,
-             "filterAdapter sets correct box param if passed a BBOX filter");
+        t.eq(options.params.bbox, bbox,
+             "filterAdapter sets correct bbox param if passed a BBOX filter");
         t.eq(options.filter, undefined,
              "filterAdapter deletes filter if passed a BBOX filter");
 
@@ -196 +196 @@
         };
 
         protocol.filterAdapter(options);
-        t.eq(options.params.box, "0,0,10,10",
-             "filterAdapter sets correct box param if passed a Logical filter containing a BBOX");
+        t.eq(options.params.bbox, "0,0,10,10",
+             "filterAdapter sets correct bbox param if passed a Logical filter containing a BBOX");
         t.eq(options.filter, undefined,
              "filterAdapter deletes filter");
 

client/mfbase/mapfish/core/Protocol/MapFish.js

@@ -181 +181 @@
                 var type = filter.type;
                 switch (type) {
                     case OpenLayers.Filter.Spatial.BBOX:
-                        if (params["box"]) {
+                        if (params["bbox"]) {
                             OpenLayers.Console.error('Filter contains multiple ' +
                                                      'Spatial BBOX entries');
                             // We should merge with the old bbox, but OL does not
                             // proving geometry merging.
                             return false;
                         }
-                        params["box"] = filter.value.toBBOX();
+                        params["bbox"] = filter.value.toBBOX();
                         break;
                     case OpenLayers.Filter.Spatial.DWITHIN:
                         params["tolerance"] = filter.distance;