Merge pull request #100 from pelias/use-full-match_phrase-query

feat(query): Use full form for match_phrase query
pelias · Jun 18, 2019 · ca7ddd6 · ca7ddd6
2 parents ae3912b + f7f4d50
commit ca7ddd6
Show file tree

Hide file tree

Showing 19 changed files with 246 additions and 82 deletions.
diff --git a/layout/AddressesUsingIdsQuery.js b/layout/AddressesUsingIdsQuery.js
@@ -10,12 +10,16 @@ function createAddressShould(vs) {
       must: [
         {
           match_phrase: {
-            'address_parts.number': vs.var('input:housenumber')
+            'address_parts.number': {
+              query: vs.var('input:housenumber')
+            }
           }
         },
         {
           match_phrase: {
-            'address_parts.street': vs.var('input:street')
+            'address_parts.street': {
+              query: vs.var('input:street')
+            }
           }
         }
       ],
@@ -41,17 +45,23 @@ function createUnitAndAddressShould(vs) {
       must: [
         {
           match_phrase: {
-            'address_parts.unit': vs.var('input:unit')
+            'address_parts.unit': {
+              query: vs.var('input:unit')
+            }
           }
         },
         {
           match_phrase: {
-            'address_parts.number': vs.var('input:housenumber')
+            'address_parts.number': {
+              query: vs.var('input:housenumber')
+            }
           }
         },
         {
           match_phrase: {
-            'address_parts.street': vs.var('input:street')
+            'address_parts.street': {
+              query: vs.var('input:street')
+            }
           }
         }
       ],
@@ -77,17 +87,23 @@ function createPostcodeAndAddressShould(vs) {
       must: [
         {
           match_phrase: {
-            'address_parts.zip': vs.var('input:postcode')
+            'address_parts.zip': {
+              query: vs.var('input:postcode')
+            }
           }
         },
         {
           match_phrase: {
-            'address_parts.number': vs.var('input:housenumber')
+            'address_parts.number': {
+              query: vs.var('input:housenumber')
+            }
           }
         },
         {
           match_phrase: {
-            'address_parts.street': vs.var('input:street')
+            'address_parts.street': {
+              query: vs.var('input:street')
+            }
           }
         }
       ],
@@ -113,7 +129,9 @@ function createStreetShould(vs) {
       must: [
         {
           match_phrase: {
-            'address_parts.street': vs.var('input:street')
+            'address_parts.street': {
+              query: vs.var('input:street')
+            }
           }
         }
       ],

diff --git a/layout/FallbackQuery.js b/layout/FallbackQuery.js
@@ -80,7 +80,9 @@ function addPrimary(value, layer, fields, likely_to_have_abbreviation) {
   //   o.bool.must.push(
   //     {
   //       match_phrase: {
-  //         'phrase.default': value
+  //         'phrase.default': {
+  //           query: value
+  //         }
   //       }
   //     }
   //   );
@@ -110,7 +112,9 @@ function addSecPostCode(vs, o) {
   if (vs.isset('input:postcode')) {
     o.bool.should.push({
       match_phrase: {
-        'address_parts.zip': vs.var('input:postcode').toString()
+        'address_parts.zip': {
+          query: vs.var('input:postcode').toString()
+        }
       }
     });
   }
@@ -231,17 +235,23 @@ function addUnitAndHouseNumberAndStreet(vs) {
       must: [
         {
           match_phrase: {
-            'address_parts.unit': vs.var('input:unit').toString()
+            'address_parts.unit': {
+              query: vs.var('input:unit').toString()
+            }
           }
         },
         {
           match_phrase: {
-            'address_parts.number': vs.var('input:housenumber').toString()
+            'address_parts.number': {
+              query: vs.var('input:housenumber').toString()
+            }
           }
         },
         {
           match_phrase: {
-            'address_parts.street': vs.var('input:street').toString()
+            'address_parts.street': {
+              query: vs.var('input:street').toString()
+            }
           }
         }
       ],
@@ -277,12 +287,16 @@ function addHouseNumberAndStreet(vs) {
       must: [
         {
           match_phrase: {
-            'address_parts.number': vs.var('input:housenumber').toString()
+            'address_parts.number': {
+              query: vs.var('input:housenumber').toString()
+            }
           }
         },
         {
           match_phrase: {
-            'address_parts.street': vs.var('input:street').toString()
+            'address_parts.street': {
+              query: vs.var('input:street').toString()
+            }
           }
         }
       ],
@@ -318,7 +332,9 @@ function addStreet(vs) {
       must: [
         {
           match_phrase: {
-            'address_parts.street': vs.var('input:street').toString()
+            'address_parts.street': {
+              query: vs.var('input:street').toString()
+            }
           }
         }
       ],

diff --git a/layout/StructuredFallbackQuery.js b/layout/StructuredFallbackQuery.js
@@ -70,7 +70,9 @@ function addSecPostCode(vs, o) {
   if (vs.isset('input:postcode')) {
     o.bool.should.push({
       match_phrase: {
-        'address_parts.zip': vs.var('input:postcode').toString()
+        'address_parts.zip': {
+          query: vs.var('input:postcode').toString()
+        }
       }
     });
   }
@@ -192,17 +194,23 @@ function addUnitAndHouseNumberAndStreet(vs) {
       must: [
         {
           match_phrase: {
-            'address_parts.unit': vs.var('input:unit').toString()
+            'address_parts.unit': {
+              query: vs.var('input:unit').toString()
+            }
           }
         },
         {
           match_phrase: {
-            'address_parts.number': vs.var('input:housenumber').toString()
+            'address_parts.number': {
+              query: vs.var('input:housenumber').toString()
+            }
           }
         },
         {
           match_phrase: {
-            'address_parts.street': vs.var('input:street').toString()
+            'address_parts.street': {
+              query: vs.var('input:street').toString()
+            }
           }
         }
       ],
@@ -238,7 +246,9 @@ function addHouseNumber(vs) {
       must: [
         {
           match_phrase: {
-            'address_parts.number': vs.var('input:housenumber').toString()
+            'address_parts.number': {
+              query: vs.var('input:housenumber').toString()
+            }
           }
         }
       ],
@@ -273,12 +283,16 @@ function addHouseNumberAndStreet(vs) {
       must: [
         {
           match_phrase: {
-            'address_parts.number': vs.var('input:housenumber').toString()
+            'address_parts.number': {
+              query: vs.var('input:housenumber').toString()
+            }
           }
         },
         {
           match_phrase: {
-            'address_parts.street': vs.var('input:street').toString()
+            'address_parts.street': {
+              query: vs.var('input:street').toString()
+            }
           }
         }
       ],
@@ -314,7 +328,9 @@ function addStreet(vs) {
       must: [
         {
           match_phrase: {
-            'address_parts.street': vs.var('input:street').toString()
+            'address_parts.street': {
+              query: vs.var('input:street').toString()
+            }
           }
         }
       ],

diff --git a/test/fixtures/addressesUsingIdsQuery/housenumber_no_units.json b/test/fixtures/addressesUsingIdsQuery/housenumber_no_units.json
@@ -11,7 +11,9 @@
                 "must": [
                   {
                     "match_phrase": {
-                      "address_parts.street": "street value"
+                      "address_parts.street": {
+                        "query": "street value"
+                      }
                     }
                   }
                 ],
@@ -28,12 +30,16 @@
                 "must": [
                   {
                     "match_phrase": {
-                      "address_parts.number": "housenumber value"
+                      "address_parts.number": {
+                        "query": "housenumber value"
+                      }
                     }
                   },
                   {
                     "match_phrase": {
-                      "address_parts.street": "street value"
+                      "address_parts.street": {
+                        "query": "street value"
+                      }
                     }
                   }
                 ],

diff --git a/test/fixtures/addressesUsingIdsQuery/no_housenumber.json b/test/fixtures/addressesUsingIdsQuery/no_housenumber.json
@@ -11,7 +11,9 @@
                 "must": [
                   {
                     "match_phrase": {
-                      "address_parts.street": "street value"
+                      "address_parts.street": {
+                        "query": "street value"
+                      }
                     }
                   }
                 ],

diff --git a/test/fixtures/addressesUsingIdsQuery/no_layers.json b/test/fixtures/addressesUsingIdsQuery/no_layers.json
@@ -11,7 +11,9 @@
                 "must": [
                   {
                     "match_phrase": {
-                      "address_parts.street": "street value"
+                      "address_parts.street": {
+                        "query": "street value"
+                      }
                     }
                   }
                 ],
@@ -28,17 +30,23 @@
                 "must": [
                   {
                     "match_phrase": {
-                      "address_parts.zip": "postcode value"
+                      "address_parts.zip": {
+                        "query": "postcode value"
+                      }
                     }
                   },
                   {
                     "match_phrase": {
-                      "address_parts.number": "housenumber value"
+                      "address_parts.number": {
+                        "query": "housenumber value"
+                      }
                     }
                   },
                   {
                     "match_phrase": {
-                      "address_parts.street": "street value"
+                      "address_parts.street": {
+                        "query": "street value"
+                      }
                     }
                   }
                 ],
@@ -55,17 +63,23 @@
                 "must": [
                   {
                     "match_phrase": {
-                      "address_parts.unit": "unit value"
+                      "address_parts.unit": {
+                        "query": "unit value"
+                      }
                     }
                   },
                   {
                     "match_phrase": {
-                      "address_parts.number": "housenumber value"
+                      "address_parts.number": {
+                        "query": "housenumber value"
+                      }
                     }
                   },
                   {
                     "match_phrase": {
-                      "address_parts.street": "street value"
+                      "address_parts.street": {
+                        "query": "street value"
+                      }
                     }
                   }
                 ],

diff --git a/test/fixtures/addressesUsingIdsQuery/no_layers_with_boosts.json b/test/fixtures/addressesUsingIdsQuery/no_layers_with_boosts.json
@@ -12,7 +12,9 @@
                 "must": [
                   {
                     "match_phrase": {
-                      "address_parts.street": "street value"
+                      "address_parts.street": {
+                        "query": "street value"
+                      }
                     }
                   }
                 ],
@@ -30,17 +32,23 @@
                 "must": [
                   {
                     "match_phrase": {
-                      "address_parts.unit": "unit value"
+                      "address_parts.unit": {
+                        "query": "unit value"
+                      }
                     }
                   },
                   {
                     "match_phrase": {
-                      "address_parts.number": "housenumber value"
+                      "address_parts.number": {
+                        "query": "housenumber value"
+                      }
                     }
                   },
                   {
                     "match_phrase": {
-                      "address_parts.street": "street value"
+                      "address_parts.street": {
+                        "query": "street value"
+                      }
                     }
                   }
                 ],

diff --git a/test/fixtures/addressesUsingIdsQuery/unit_no_housenumber.json b/test/fixtures/addressesUsingIdsQuery/unit_no_housenumber.json
@@ -11,7 +11,9 @@
                 "must": [
                   {
                     "match_phrase": {
-                      "address_parts.street": "street value"
+                      "address_parts.street": {
+                        "query": "street value"
+                      }
                     }
                   }
                 ],