Fix server-side WFS property filtering

The previous approach of filtering features that match one of many
values worked client side for e.g. GeoJSON format WFS layers, but crashed
when attemping to build the XML request for server-side feature filtering
(e.g. Bristol). This code instead builds a proper Logical filter which
OpenLayers can use in both situations.

1 files changed, 9 insertions, 5 deletions

diff --git a/web/cobrands/fixmystreet/assets.js b/web/cobrands/fixmystreet/assets.js
index 0134991e9..1761e6a3e 100644
--- a/web/cobrands/fixmystreet/assets.js
+++ b/web/cobrands/fixmystreet/assets.js
@@ -574,11 +574,15 @@ fixmystreet.assets = {
             // Add this filter to the layer, so it can potentially be used
             // in the request (though only Bristol currently does this).
             if (OpenLayers.Util.isArray(options.filter_value)) {
-                layer_options.filter = new OpenLayers.Filter.FeatureId({
-                    type: OpenLayers.Filter.Function,
-                    evaluate: function(f) {
-                        return OpenLayers.Util.indexOf(options.filter_value, f.attributes[options.filter_key]) != -1;
-                    }
+                layer_options.filter = new OpenLayers.Filter.Logical({
+                    type: OpenLayers.Filter.Logical.OR,
+                    filters: $.map(options.filter_value, function(value) {
+                        return new OpenLayers.Filter.Comparison({
+                            type: OpenLayers.Filter.Comparison.EQUAL_TO,
+                            property: options.filter_key,
+                            value: value
+                        });
+                    })
                 });
             } else if (typeof options.filter_value === 'function') {
                 layer_options.filter = new OpenLayers.Filter.FeatureId({