feat: Use peliasQuery analyzer for address_parts.street

orangejulius · orangejulius · commit 54127dd08953 · 2020-06-26T06:52:28.000-07:00
This is an experimental change, but one that has good impact when paired with pelias/schema#446. Essentially, this change continues the trend we have started for the `name.*` and `phrase.*` fields to generate synonyms _only_ at index time. It may be the case that variations on input vs data text (for example `crt` vs `ct` vs `court`) may cause different synonyms to be generated by the same analyzer. Many queries, especially `match_phrase` queries, will require that _all_ of those generated synonym tokens must match. This is often not desirable.
diff --git a/query/autocomplete_defaults.js b/query/autocomplete_defaults.js
@@ -42,12 +42,12 @@ module.exports = _.merge({}, peliasQuery.defaults, {
   'address:housenumber:boost': 2,
   'address:housenumber:cutoff_frequency': 0.01,
 
-  'address:street:analyzer': 'peliasStreet',
+  'address:street:analyzer': 'peliasQuery',
   'address:street:field': 'address_parts.street',
   'address:street:boost': 1,
   'address:street:cutoff_frequency': 0.01,
 
-  'address:cross_street:analyzer': 'peliasStreet',
+  'address:cross_street:analyzer': 'peliasQuery',
   'address:cross_street:field': 'address_parts.cross_street',
   'address:cross_street:boost': 5,
   'address:cross_street:cutoff_frequency': 0.01,
diff --git a/query/search_defaults.js b/query/search_defaults.js
@@ -41,7 +41,7 @@ module.exports = _.merge({}, peliasQuery.defaults, {
   'address:housenumber:boost': 2,
   'address:housenumber:cutoff_frequency': 0.01,
 
-  'address:street:analyzer': 'peliasStreet',
+  'address:street:analyzer': 'peliasQuery',
   'address:street:field': 'address_parts.street',
   'address:street:boost': 5,
   'address:street:slop': 1,
diff --git a/test/unit/fixture/autocomplete_single_character_street.js b/test/unit/fixture/autocomplete_single_character_street.js
@@ -39,7 +39,7 @@ module.exports = {
               'query': 'k road',
               'cutoff_frequency': 0.01,
               'boost': 1,
-              'analyzer': 'peliasStreet'
+              'analyzer': 'peliasQuery'
             }
           }
         },
diff --git a/test/unit/fixture/search_boundary_country.js b/test/unit/fixture/search_boundary_country.js
@@ -14,7 +14,7 @@ module.exports = {
                     'match_phrase': {
                       'address_parts.street': {
                         'query': 'street value',
-                        'analyzer': 'peliasStreet',
+                        'analyzer': 'peliasQuery',
                         'slop': 1
                       }
                     }
diff --git a/test/unit/fixture/search_boundary_country_multi.js b/test/unit/fixture/search_boundary_country_multi.js
@@ -14,7 +14,7 @@ module.exports = {
                     'match_phrase': {
                       'address_parts.street': {
                         'query': 'street value',
-                        'analyzer': 'peliasStreet',
+                        'analyzer': 'peliasQuery',
                         'slop': 1
                       }
                     }
diff --git a/test/unit/fixture/search_boundary_gid.js b/test/unit/fixture/search_boundary_gid.js
@@ -14,7 +14,7 @@ module.exports = {
                     'match_phrase': {
                       'address_parts.street': {
                         'query': 'street value',
-                        'analyzer': 'peliasStreet',
+                        'analyzer': 'peliasQuery',
                         'slop': 1
                       }
                     }
diff --git a/test/unit/fixture/search_fallback.js b/test/unit/fixture/search_fallback.js
@@ -110,7 +110,7 @@ module.exports = {
                     'match_phrase': {
                       'address_parts.street': {
                         'query': 'street value',
-                        'analyzer': 'peliasStreet',
+                        'analyzer': 'peliasQuery',
                         'slop': 1
                       }
                     }
@@ -278,7 +278,7 @@ module.exports = {
                     'match_phrase': {
                       'address_parts.street': {
                         'query': 'street value',
-                        'analyzer': 'peliasStreet',
+                        'analyzer': 'peliasQuery',
                         'slop': 1
                       }
                     }
diff --git a/test/unit/fixture/search_linguistic_bbox.js b/test/unit/fixture/search_linguistic_bbox.js
@@ -14,7 +14,7 @@ module.exports = {
                     'match_phrase': {
                       'address_parts.street': {
                         'query': 'street value',
-                        'analyzer': 'peliasStreet',
+                        'analyzer': 'peliasQuery',
                         'slop': 1
                       }
                     }
diff --git a/test/unit/fixture/search_linguistic_focus.js b/test/unit/fixture/search_linguistic_focus.js
@@ -14,7 +14,7 @@ module.exports = {
                     'match_phrase': {
                       'address_parts.street': {
                         'query': 'street value',
-                        'analyzer': 'peliasStreet',
+                        'analyzer': 'peliasQuery',
                         'slop': 1
                       }
                     }
diff --git a/test/unit/fixture/search_linguistic_focus_bbox.js b/test/unit/fixture/search_linguistic_focus_bbox.js
@@ -14,7 +14,7 @@ module.exports = {
                     'match_phrase': {
                       'address_parts.street': {
                         'query': 'street value',
-                        'analyzer': 'peliasStreet',
+                        'analyzer': 'peliasQuery',
                         'slop': 1
                       }
                     }
diff --git a/test/unit/fixture/search_linguistic_focus_null_island.js b/test/unit/fixture/search_linguistic_focus_null_island.js
@@ -14,7 +14,7 @@ module.exports = {
                     'match_phrase': {
                       'address_parts.street': {
                         'query': 'street value',
-                        'analyzer': 'peliasStreet',
+                        'analyzer': 'peliasQuery',
                         'slop': 1
                       }
                     }
diff --git a/test/unit/fixture/search_linguistic_only.js b/test/unit/fixture/search_linguistic_only.js
@@ -14,7 +14,7 @@ module.exports = {
                     'match_phrase': {
                       'address_parts.street': {
                         'query': 'street value',
-                        'analyzer': 'peliasStreet',
+                        'analyzer': 'peliasQuery',
                         'slop': 1
                       }
                     }
diff --git a/test/unit/fixture/search_with_category_filtering.js b/test/unit/fixture/search_with_category_filtering.js
@@ -14,7 +14,7 @@ module.exports = {
                     'match_phrase': {
                       'address_parts.street': {
                         'query': 'street value',
-                        'analyzer': 'peliasStreet',
+                        'analyzer': 'peliasQuery',
                         'slop': 1
                       }
                     }
diff --git a/test/unit/fixture/search_with_source_filtering.js b/test/unit/fixture/search_with_source_filtering.js
@@ -14,7 +14,7 @@ module.exports = {
                     'match_phrase': {
                       'address_parts.street': {
                         'query': 'street value',
-                        'analyzer': 'peliasStreet',
+                        'analyzer': 'peliasQuery',
                         'slop': 1
                       }
                     }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ module.exports = {`
`39`	`39`	`'query': 'k road',`
`40`	`40`	`'cutoff_frequency': 0.01,`
`41`	`41`	`'boost': 1,`
`42`		`- 'analyzer': 'peliasStreet'`
	`42`	`+ 'analyzer': 'peliasQuery'`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`},`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ module.exports = {`
`14`	`14`	`'match_phrase': {`
`15`	`15`	`'address_parts.street': {`
`16`	`16`	`'query': 'street value',`
`17`		`- 'analyzer': 'peliasStreet',`
	`17`	`+ 'analyzer': 'peliasQuery',`
`18`	`18`	`'slop': 1`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ module.exports = {`
`110`	`110`	`'match_phrase': {`
`111`	`111`	`'address_parts.street': {`
`112`	`112`	`'query': 'street value',`
`113`		`- 'analyzer': 'peliasStreet',`
	`113`	`+ 'analyzer': 'peliasQuery',`
`114`	`114`	`'slop': 1`
`115`	`115`	`}`
`116`	`116`	`}`
`@@ -278,7 +278,7 @@ module.exports = {`
`278`	`278`	`'match_phrase': {`
`279`	`279`	`'address_parts.street': {`
`280`	`280`	`'query': 'street value',`
`281`		`- 'analyzer': 'peliasStreet',`
	`281`	`+ 'analyzer': 'peliasQuery',`
`282`	`282`	`'slop': 1`
`283`	`283`	`}`
`284`	`284`	`}`