Revert "Update pelias-query to the latest version 🚀"

package.json

@@ -61,7 +61,7 @@
     "pelias-logger": "0.2.0",
     "pelias-mock-logger": "^1.0.1",
     "pelias-model": "4.6.0",
-    "pelias-query": "8.16.0",
+    "pelias-query": "8.15.0",
     "pelias-text-analyzer": "1.7.3",
     "predicates": "^1.0.1",
     "retry": "^0.10.1",

test/unit/fixture/search_boundary_country.js

@@ -2,28 +2,32 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'bool': {
+        'filtered': {
-          'should': [
+          'query': {
-            {
+            'bool': {
-              'bool': {
+              'should': [
-                '_name': 'fallback.street',
+                {
-                'boost': 5,
+                  'bool': {
-                'must': [
+                    '_name': 'fallback.street',
-                  {
+                    'boost': 5,
-                    'match_phrase': {
+                    'must': [
-                      'address_parts.street': 'street value'
+                      {
+                        'match_phrase': {
+                          'address_parts.street': 'street value'
+                        }
+                      }
+                    ],
+                    'should': [],
+                    'filter': {
+                      'term': {
+                        'layer': 'street'
+                      }
                     }
                   }
-                ],
-                'should': [],
-                'filter': {
-                  'term': {
-                    'layer': 'street'
-                  }
                 }
-              }
+              ]
             }
-          ],
+          },
           'filter': {
             'bool': {
               'must': [

test/unit/fixture/search_fallback_postalcode_only.js

@@ -2,30 +2,39 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'bool': {
+        'filtered': {
-          'should': [
+          'query': {
-            {
+            'bool': {
-              'bool': {
+              'should': [
-                '_name': 'fallback.postalcode',
+                {
-                'must': [
+                  'bool': {
-                  {
+                    '_name': 'fallback.postalcode',
-                    'multi_match': {
+                    'must': [
-                      'query': '90210',
+                      {
-                      'type': 'phrase',
+                        'multi_match': {
-                      'fields': [
+                          'query': '90210',
-                        'parent.postalcode'
+                          'type': 'phrase',
-                      ]
+                          'fields': [
+                            'parent.postalcode'
+                          ]
+                        }
+                      }
+                    ],
+                    'filter': {
+                      'term': {
+                        'layer': 'postalcode'
+                      }
                     }
                   }
-                ],
-                'filter': {
-                  'term': {
-                    'layer': 'postalcode'
-                  }
                 }
-              }
+              ]
+            }
+          },
+          'filter': {
+            'bool': {
+              'must': []
             }
-          ]
+          }
         }
       },
       'max_boost': 20,

test/unit/fixture/search_linguistic_bbox.js

@@ -2,28 +2,32 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'bool': {
+        'filtered': {
-          'should': [
+          'query': {
-            {
+            'bool': {
-              'bool': {
+              'should': [
-                '_name': 'fallback.street',
+                {
-                'boost': 5,
+                  'bool': {
-                'must': [
+                    '_name': 'fallback.street',
-                  {
+                    'boost': 5,
-                    'match_phrase': {
+                    'must': [
-                      'address_parts.street': 'street value'
+                      {
+                        'match_phrase': {
+                          'address_parts.street': 'street value'
+                        }
+                      }
+                    ],
+                    'should': [],
+                    'filter': {
+                      'term': {
+                        'layer': 'street'
+                      }
                     }
                   }
-                ],
-                'should': [],
-                'filter': {
-                  'term': {
-                    'layer': 'street'
-                  }
                 }
-              }
+              ]
             }
-          ],
+          },
           'filter': {
             'bool': {
               'must': [

test/unit/fixture/search_linguistic_focus.js

@@ -2,28 +2,32 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'bool': {
+        'filtered': {
-          'should': [
+          'query': {
-            {
+            'bool': {
-              'bool': {
+              'should': [
-                '_name': 'fallback.street',
+                {
-                'boost': 5,
+                  'bool': {
-                'must': [
+                    '_name': 'fallback.street',
-                  {
+                    'boost': 5,
-                    'match_phrase': {
+                    'must': [
-                      'address_parts.street': 'street value'
+                      {
+                        'match_phrase': {
+                          'address_parts.street': 'street value'
+                        }
+                      }
+                    ],
+                    'should': [],
+                    'filter': {
+                      'term': {
+                        'layer': 'street'
+                      }
                     }
                   }
-                ],
-                'should': [],
-                'filter': {
-                  'term': {
-                    'layer': 'street'
-                  }
                 }
-              }
+              ]
             }
-          ],
+          },
           'filter': {
             'bool': {
               'must': [

test/unit/fixture/search_linguistic_focus_bbox.js

@@ -2,28 +2,32 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'bool': {
+        'filtered': {
-          'should': [
+          'query': {
-            {
+            'bool': {
-              'bool': {
+              'should': [
-                '_name': 'fallback.street',
+                {
-                'boost': 5,
+                  'bool': {
-                'must': [
+                    '_name': 'fallback.street',
-                  {
+                    'boost': 5,
-                    'match_phrase': {
+                    'must': [
-                      'address_parts.street': 'street value'
+                      {
+                        'match_phrase': {
+                          'address_parts.street': 'street value'
+                        }
+                      }
+                    ],
+                    'should': [],
+                    'filter': {
+                      'term': {
+                        'layer': 'street'
+                      }
                     }
                   }
-                ],
-                'should': [],
-                'filter': {
-                  'term': {
-                    'layer': 'street'
-                  }
                 }
-              }
+              ]
             }
-          ],
+          },
           'filter': {
             'bool': {
               'must': [

test/unit/fixture/search_linguistic_focus_null_island.js

@@ -2,28 +2,32 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'bool': {
+        'filtered': {
-          'should': [
+          'query': {
-            {
+            'bool': {
-              'bool': {
+              'should': [
-                '_name': 'fallback.street',
+                {
-                'boost': 5,
+                  'bool': {
-                'must': [
+                    '_name': 'fallback.street',
-                  {
+                    'boost': 5,
-                    'match_phrase': {
+                    'must': [
-                      'address_parts.street': 'street value'
+                      {
+                        'match_phrase': {
+                          'address_parts.street': 'street value'
+                        }
+                      }
+                    ],
+                    'should': [],
+                    'filter': {
+                      'term': {
+                        'layer': 'street'
+                      }
                     }
                   }
-                ],
-                'should': [],
-                'filter': {
-                  'term': {
-                    'layer': 'street'
-                  }
                 }
-              }
+              ]
             }
-          ],
+          },
           'filter': {
             'bool': {
               'must': [

test/unit/fixture/search_linguistic_only.js

@@ -2,28 +2,32 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'bool': {
+        'filtered': {
-          'should': [
+          'query': {
-            {
+            'bool': {
-              'bool': {
+              'should': [
-                '_name': 'fallback.street',
+                {
-                'boost': 5,
+                  'bool': {
-                'must': [
+                    '_name': 'fallback.street',
-                  {
+                    'boost': 5,
-                    'match_phrase': {
+                    'must': [
-                      'address_parts.street': 'street value'
+                      {
+                        'match_phrase': {
+                          'address_parts.street': 'street value'
+                        }
+                      }
+                    ],
+                    'should': [],
+                    'filter': {
+                      'term': {
+                        'layer': 'street'
+                      }
                     }
                   }
-                ],
-                'should': [],
-                'filter': {
-                  'term': {
-                    'layer': 'street'
-                  }
                 }
-              }
+              ]
             }
-          ],
+          },
           'filter': {
             'bool': {
               'must': [

test/unit/fixture/search_linguistic_viewport.js

@@ -2,28 +2,32 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'bool': {
+        'filtered': {
-          'should': [
+          'query': {
-            {
+            'bool': {
-              'bool': {
+              'should': [
-                '_name': 'fallback.street',
+                {
-                'boost': 5,
+                  'bool': {
-                'must': [
+                    '_name': 'fallback.street',
-                  {
+                    'boost': 5,
-                    'match_phrase': {
+                    'must': [
-                      'address_parts.street': 'street value'
+                      {
+                        'match_phrase': {
+                          'address_parts.street': 'street value'
+                        }
+                      }
+                    ],
+                    'should': [],
+                    'filter': {
+                      'term': {
+                        'layer': 'street'
+                      }
                     }
                   }
-                ],
-                'should': [],
-                'filter': {
-                  'term': {
-                    'layer': 'street'
-                  }
                 }
-              }
+              ]
             }
-          ],
+          },
           'filter': {
             'bool': {
               'must': [

test/unit/fixture/search_linguistic_viewport_min_diagonal.js

@@ -2,28 +2,32 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'bool': {
+        'filtered': {
-          'should': [
+          'query': {
-            {
+            'bool': {
-              'bool': {
+              'should': [
-                '_name': 'fallback.street',
+                {
-                'boost': 5,
+                  'bool': {
-                'must': [
+                    '_name': 'fallback.street',
-                  {
+                    'boost': 5,
-                    'match_phrase': {
+                    'must': [
-                      'address_parts.street': 'street value'
+                      {
+                        'match_phrase': {
+                          'address_parts.street': 'street value'
+                        }
+                      }
+                    ],
+                    'should': [],
+                    'filter': {
+                      'term': {
+                        'layer': 'street'
+                      }
                     }
                   }
-                ],
-                'should': [],
-                'filter': {
-                  'term': {
-                    'layer': 'street'
-                  }
                 }
-              }
+              ]
             }
-          ],
+          },
           'filter': {
             'bool': {
               'must': [

test/unit/fixture/search_with_category_filtering.js

@@ -2,28 +2,32 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'bool': {
+        'filtered': {
-          'should': [
+          'query': {
-            {
+            'bool': {
-              'bool': {
+              'should': [
-                '_name': 'fallback.street',
+                {
-                'boost': 5,
+                  'bool': {
-                'must': [
+                    '_name': 'fallback.street',
-                  {
+                    'boost': 5,
-                    'match_phrase': {
+                    'must': [
-                      'address_parts.street': 'street value'
+                      {
+                        'match_phrase': {
+                          'address_parts.street': 'street value'
+                        }
+                      }
+                    ],
+                    'should': [],
+                    'filter': {
+                      'term': {
+                        'layer': 'street'
+                      }
                     }
                   }
-                ],
-                'should': [],
-                'filter': {
-                  'term': {
-                    'layer': 'street'
-                  }
                 }
-              }
+              ]
             }
-          ],
+          },
           'filter': {
             'bool': {
               'must': [

test/unit/fixture/search_with_source_filtering.js

@@ -2,28 +2,32 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'bool': {
+        'filtered': {
-          'should': [
+          'query': {
-            {
+            'bool': {
-              'bool': {
+              'should': [
-                '_name': 'fallback.street',
+                {
-                'boost': 5,
+                  'bool': {
-                'must': [
+                    '_name': 'fallback.street',
-                  {
+                    'boost': 5,
-                    'match_phrase': {
+                    'must': [
-                      'address_parts.street': 'street value'
+                      {
+                        'match_phrase': {
+                          'address_parts.street': 'street value'
+                        }
+                      }
+                    ],
+                    'should': [],
+                    'filter': {
+                      'term': {
+                        'layer': 'street'
+                      }
                     }
                   }
-                ],
-                'should': [],
-                'filter': {
-                  'term': {
-                    'layer': 'street'
-                  }
                 }
-              }
+              ]
             }
-          ],
+          },
           'filter': {
             'bool': {
               'must': [

test/unit/fixture/structured_geocoding/boundary_country.json

@@ -2,8 +2,12 @@
   "query": {
     "function_score": {
       "query": {
-        "bool": {
+        "filtered": {
-          "should": [],
+          "query": {
+            "bool": {
+              "should": []
+            }
+          },
           "filter": {
             "bool": {
               "must": [
@@ -55,4 +59,4 @@
   ],
   "size": 10,
   "track_scores": true
-}
+}

test/unit/fixture/structured_geocoding/linguistic_bbox.json

@@ -2,8 +2,12 @@
   "query": {
     "function_score": {
       "query": {
-        "bool": {
+        "filtered": {
-          "should": [],
+          "query": {
+            "bool": {
+              "should": []
+            }
+          },
           "filter": {
             "bool": {
               "must": [
@@ -58,4 +62,4 @@
   ],
   "size": 10,
   "track_scores": true
-}
+}

test/unit/fixture/structured_geocoding/linguistic_focus.json

@@ -2,8 +2,12 @@
   "query": {
     "function_score": {
       "query": {
-        "bool": {
+        "filtered": {
-          "should": [],
+          "query": {
+            "bool": {
+              "should": []
+            }
+          },
           "filter": {
             "bool": {
               "must": [
@@ -61,4 +65,4 @@
   ],
   "size": 10,
   "track_scores": true
-}
+}

test/unit/fixture/structured_geocoding/linguistic_focus_bbox.json

@@ -2,8 +2,12 @@
   "query": {
     "function_score": {
       "query": {
-        "bool": {
+        "filtered": {
-          "should": [],
+          "query": {
+            "bool": {
+              "should": []
+            }
+          },
           "filter": {
             "bool": {
               "must": [

test/unit/fixture/structured_geocoding/linguistic_focus_null_island.json

@@ -2,8 +2,12 @@
   "query": {
     "function_score": {
       "query": {
-        "bool": {
+        "filtered": {
-          "should": [],
+          "query": {
+            "bool": {
+              "should": []
+            }
+          },
           "filter": {
             "bool": {
               "must": [
@@ -61,4 +65,4 @@
   ],
   "size": 10,
   "track_scores": true
-}
+}

test/unit/fixture/structured_geocoding/linguistic_only.json

@@ -2,8 +2,12 @@
   "query": {
     "function_score": {
       "query": {
-        "bool": {
+        "filtered": {
-          "should": [],
+          "query": {
+            "bool": {
+              "should": []
+            }
+          },
           "filter": {
             "bool": {
               "must": [
@@ -47,4 +51,4 @@
   ],
   "size": 10,
   "track_scores": true
-}
+}

test/unit/fixture/structured_geocoding/linguistic_viewport.json

@@ -2,8 +2,12 @@
   "query": {
     "function_score": {
       "query": {
-        "bool": {
+        "filtered": {
-          "should": [],
+          "query": {
+            "bool": {
+              "should": []
+            }
+          },
           "filter": {
             "bool": {
               "must": [
@@ -47,4 +51,4 @@
   ],
   "size": 10,
   "track_scores": true
-}
+}

test/unit/fixture/structured_geocoding/linguistic_viewport_min_diagonal.json

@@ -2,8 +2,12 @@
   "query": {
     "function_score": {
       "query": {
-        "bool": {
+        "filtered": {
-          "should": [],
+          "query": {
+            "bool": {
+              "should": []
+            }
+          },
           "filter": {
             "bool": {
               "must": [
@@ -47,4 +51,4 @@
   ],
   "size": 10,
   "track_scores": true
-}
+}

test/unit/fixture/structured_geocoding/postalcode_only.js

@@ -2,30 +2,39 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'bool': {
+        'filtered': {
-          'should': [
+          'query': {
-            {
+            'bool': {
-              'bool': {
+              'should': [
-                '_name': 'fallback.postalcode',
+                {
-                'must': [
+                  'bool': {
-                  {
+                    '_name': 'fallback.postalcode',
-                    'multi_match': {
+                    'must': [
-                      'query': 'postalcode value',
+                      {
-                      'type': 'phrase',
+                        'multi_match': {
-                      'fields': [
+                          'query': 'postalcode value',
-                        'parent.postalcode'
+                          'type': 'phrase',
-                      ]
+                          'fields': [
+                            'parent.postalcode'
+                          ]
+                        }
+                      }
+                    ],
+                    'filter': {
+                      'term': {
+                        'layer': 'postalcode'
+                      }
                     }
                   }
-                ],
-                'filter': {
-                  'term': {
-                    'layer': 'postalcode'
-                  }
                 }
-              }
+              ]
+            }
+          },
+          'filter': {
+            'bool': {
+              'must': []
             }
-          ]
+          }
         }
       },
       'max_boost': 20,

test/unit/fixture/structured_geocoding/with_source_filtering.json

@@ -2,9 +2,12 @@
   "query": {
     "function_score": {
       "query": {
-        "bool": {
+        "filtered": {
-          "should": [
+          "query": {
-          ],
+            "bool": {
+              "should": []
+            }
+          },
           "filter": {
             "bool": {
               "must": [
@@ -48,4 +51,4 @@
   ],
   "size": 20,
   "track_scores": true
-}
+}