update geo_distance filter construction for ES5

nreese · Dec 14, 2016 · 2a62cae · 2a62cae
1 parent cc07969
commit 2a62cae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/public/visController.js b/public/visController.js
@@ -139,7 +139,7 @@ define(function (require) {
       //add overlay layer to provide visibility of filtered area
       let fieldName = getGeoField();
       if (fieldName) {
-        map.addFilters(geoFilter.toGeoJson(fieldName));
+        map.addFilters(geoFilter.getGeoFilters(fieldName));
       }
 
       drawWmsOverlays();

diff --git a/public/vislib/geoFilter.js b/public/vislib/geoFilter.js
@@ -13,7 +13,7 @@ define(function (require) {
     function addGeoFilter(newFilter, field, indexPatternName) {
       let existingFilter = null;
       _.flatten([queryFilter.getAppFilters(), queryFilter.getGlobalFilters()]).forEach(function (it) {
-        if (utils.isGeoFilter(it, field)) {
+        if (isGeoFilter(it, field)) {
           existingFilter = it;
         }
       });
@@ -48,7 +48,11 @@ define(function (require) {
         let numFilters = 1;
         if (_.isArray(newFilter)) {
           numFilters = newFilter.length;
-          newFilter = { or: newFilter };
+          newFilter = { 
+            bool: {
+              should: newFilter
+            }
+          };
         }
         newFilter.meta = {
           alias: filterAlias(field, numFilters),