Merge pull request #122 from pelias/allow-specifying-street-analyzer

Allow specifying analyzer for `address_parts.street` field
pelias · Jun 23, 2020 · cee0da3 · cee0da3
2 parents 133e7b7 + cb818e6
commit cee0da3
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 7 deletions.
diff --git a/layout/AddressesUsingIdsQuery.js b/layout/AddressesUsingIdsQuery.js
@@ -8,7 +8,10 @@ function createAddressShould(vs) {
       _name: 'fallback.address',
       must: [
         match_phrase('address_parts.number', vs.var('input:housenumber')),
-        match_phrase('address_parts.street', vs.var('input:street'), { slop: vs.var('address:street:slop') })
+        match_phrase('address_parts.street', vs.var('input:street'), {
+          slop: vs.var('address:street:slop'),
+          analyzer: vs.var('address:street:analyzer')
+        })
       ],
       filter: {
         term: {
@@ -32,7 +35,10 @@ function createUnitAndAddressShould(vs) {
       must: [
         match_phrase('address_parts.unit', vs.var('input:unit')),
         match_phrase('address_parts.number', vs.var('input:housenumber')),
-        match_phrase('address_parts.street', vs.var('input:street'), { slop: vs.var('address:street:slop') })
+        match_phrase('address_parts.street', vs.var('input:street'), {
+          slop: vs.var('address:street:slop'),
+          analyzer: vs.var('address:street:analyzer')
+        })
       ],
       filter: {
         term: {
@@ -56,7 +62,10 @@ function createPostcodeAndAddressShould(vs) {
       must: [
         match_phrase('address_parts.zip', vs.var('input:postcode')),
         match_phrase('address_parts.number', vs.var('input:housenumber')),
-        match_phrase('address_parts.street', vs.var('input:street'), { slop: vs.var('address:street:slop') })
+        match_phrase('address_parts.street', vs.var('input:street'), {
+          slop: vs.var('address:street:slop'),
+          analyzer: vs.var('address:street:analyzer')
+        })
       ],
       filter: {
         term: {
@@ -78,7 +87,10 @@ function createStreetShould(vs) {
     bool: {
       _name: 'fallback.street',
       must: [
-        match_phrase('address_parts.street', vs.var('input:street'), { slop: vs.var('address:street:slop') })
+        match_phrase('address_parts.street', vs.var('input:street'), {
+          slop: vs.var('address:street:slop'),
+          analyzer: vs.var('address:street:analyzer')
+        })
       ],
       filter: {
         term: {

diff --git a/layout/FallbackQuery.js b/layout/FallbackQuery.js
@@ -233,7 +233,10 @@ function addUnitAndHouseNumberAndStreet(vs) {
       must: [
         match_phrase('address_parts.unit', vs.var('input:unit')),
         match_phrase('address_parts.number', vs.var('input:housenumber')),
-        match_phrase('address_parts.street', vs.var('input:street'), { slop: vs.var('address:street:slop') })
+        match_phrase('address_parts.street', vs.var('input:street'), {
+          slop: vs.var('address:street:slop'),
+          analyzer: vs.var('address:street:analyzer')
+        })
       ],
       should: [],
       filter: {
@@ -265,7 +268,10 @@ function addHouseNumberAndStreet(vs) {
       _name: 'fallback.address',
       must: [
         match_phrase('address_parts.number', vs.var('input:housenumber')),
-        match_phrase('address_parts.street', vs.var('input:street'), { slop: vs.var('address:street:slop') })
+        match_phrase('address_parts.street', vs.var('input:street'), {
+          slop: vs.var('address:street:slop'),
+          analyzer: vs.var('address:street:analyzer')
+        })
       ],
       should: [],
       filter: {
@@ -297,7 +303,10 @@ function addStreet(vs) {
     bool: {
       _name: 'fallback.street',
       must: [
-        match_phrase('address_parts.street', vs.var('input:street'), { slop: vs.var('address:street:slop') })
+        match_phrase('address_parts.street', vs.var('input:street'), {
+          slop: vs.var('address:street:slop'),
+          analyzer: vs.var('address:street:analyzer')
+        })
       ],
       should: [],
       filter: {