From 39d9162b6d6109159daf5f22cb30b96caf9e7225 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Fri, 25 Sep 2015 12:11:07 +0200 Subject: [PATCH] add locality to the list of types which are boosted by the sqrt(popularity) view --- query/autocomplete.js | 2 +- query/search.js | 2 +- test/unit/fixture/autocomplete_linguistic_focus.js | 5 +++++ .../fixture/autocomplete_linguistic_focus_null_island.js | 5 +++++ test/unit/fixture/autocomplete_linguistic_only.js | 5 +++++ test/unit/fixture/search_boundary_country.js | 5 +++++ test/unit/fixture/search_full_address.js | 5 +++++ test/unit/fixture/search_linguistic_bbox.js | 5 +++++ test/unit/fixture/search_linguistic_focus.js | 5 +++++ test/unit/fixture/search_linguistic_focus_bbox.js | 5 +++++ test/unit/fixture/search_linguistic_focus_null_island.js | 5 +++++ test/unit/fixture/search_linguistic_only.js | 5 +++++ test/unit/fixture/search_partial_address.js | 5 +++++ test/unit/fixture/search_regions_address.js | 5 +++++ 14 files changed, 62 insertions(+), 2 deletions(-) diff --git a/query/autocomplete.js b/query/autocomplete.js index 62fb775e..858880fc 100644 --- a/query/autocomplete.js +++ b/query/autocomplete.js @@ -14,7 +14,7 @@ query.score( peliasQuery.view.ngrams, 'must' ); // scoring boost query.score( peliasQuery.view.phrase ); query.score( peliasQuery.view.focus( peliasQuery.view.ngrams ) ); -query.score( peliasQuery.view.popularity(['admin0','admin1','admin2']) ); +query.score( peliasQuery.view.popularity(['admin0','admin1','admin2','locality']) ); // -------------------------------- diff --git a/query/search.js b/query/search.js index a3787535..ab0b41ed 100644 --- a/query/search.js +++ b/query/search.js @@ -15,7 +15,7 @@ query.score( peliasQuery.view.ngrams, 'must' ); // scoring boost query.score( peliasQuery.view.phrase ); query.score( peliasQuery.view.focus( peliasQuery.view.phrase ) ); -query.score( peliasQuery.view.popularity(['admin0','admin1','admin2']) ); +query.score( peliasQuery.view.popularity(['admin0','admin1','admin2','locality']) ); // address components query.score( peliasQuery.view.address('housenumber') ); diff --git a/test/unit/fixture/autocomplete_linguistic_focus.js b/test/unit/fixture/autocomplete_linguistic_focus.js index 2049bf0b..ec30970a 100644 --- a/test/unit/fixture/autocomplete_linguistic_focus.js +++ b/test/unit/fixture/autocomplete_linguistic_focus.js @@ -81,6 +81,11 @@ module.exports = { 'type': { 'value': 'admin2' } + }, + { + 'type': { + 'value': 'locality' + } } ] }, diff --git a/test/unit/fixture/autocomplete_linguistic_focus_null_island.js b/test/unit/fixture/autocomplete_linguistic_focus_null_island.js index 57d4747c..fa498073 100644 --- a/test/unit/fixture/autocomplete_linguistic_focus_null_island.js +++ b/test/unit/fixture/autocomplete_linguistic_focus_null_island.js @@ -81,6 +81,11 @@ module.exports = { 'type': { 'value': 'admin2' } + }, + { + 'type': { + 'value': 'locality' + } } ] }, diff --git a/test/unit/fixture/autocomplete_linguistic_only.js b/test/unit/fixture/autocomplete_linguistic_only.js index ac059ef1..043784eb 100644 --- a/test/unit/fixture/autocomplete_linguistic_only.js +++ b/test/unit/fixture/autocomplete_linguistic_only.js @@ -54,6 +54,11 @@ module.exports = { 'type': { 'value': 'admin2' } + }, + { + 'type': { + 'value': 'locality' + } } ] }, diff --git a/test/unit/fixture/search_boundary_country.js b/test/unit/fixture/search_boundary_country.js index a75a8091..820f04d1 100644 --- a/test/unit/fixture/search_boundary_country.js +++ b/test/unit/fixture/search_boundary_country.js @@ -64,6 +64,11 @@ module.exports = { 'type': { 'value': 'admin2' } + }, + { + 'type': { + 'value': 'locality' + } } ] }, diff --git a/test/unit/fixture/search_full_address.js b/test/unit/fixture/search_full_address.js index aff242b8..b07ed89a 100644 --- a/test/unit/fixture/search_full_address.js +++ b/test/unit/fixture/search_full_address.js @@ -57,6 +57,11 @@ module.exports = { 'type': { 'value': 'admin2' } + }, + { + 'type': { + 'value': 'locality' + } } ] }, diff --git a/test/unit/fixture/search_linguistic_bbox.js b/test/unit/fixture/search_linguistic_bbox.js index 6c98b010..5b64236a 100644 --- a/test/unit/fixture/search_linguistic_bbox.js +++ b/test/unit/fixture/search_linguistic_bbox.js @@ -54,6 +54,11 @@ module.exports = { 'type': { 'value': 'admin2' } + }, + { + 'type': { + 'value': 'locality' + } } ] }, diff --git a/test/unit/fixture/search_linguistic_focus.js b/test/unit/fixture/search_linguistic_focus.js index 072bca64..847187cb 100644 --- a/test/unit/fixture/search_linguistic_focus.js +++ b/test/unit/fixture/search_linguistic_focus.js @@ -83,6 +83,11 @@ module.exports = { 'type': { 'value': 'admin2' } + }, + { + 'type': { + 'value': 'locality' + } } ] }, diff --git a/test/unit/fixture/search_linguistic_focus_bbox.js b/test/unit/fixture/search_linguistic_focus_bbox.js index e6a04824..a4b53334 100644 --- a/test/unit/fixture/search_linguistic_focus_bbox.js +++ b/test/unit/fixture/search_linguistic_focus_bbox.js @@ -83,6 +83,11 @@ module.exports = { 'type': { 'value': 'admin2' } + }, + { + 'type': { + 'value': 'locality' + } } ] }, diff --git a/test/unit/fixture/search_linguistic_focus_null_island.js b/test/unit/fixture/search_linguistic_focus_null_island.js index 832aa9f7..664a17e8 100644 --- a/test/unit/fixture/search_linguistic_focus_null_island.js +++ b/test/unit/fixture/search_linguistic_focus_null_island.js @@ -83,6 +83,11 @@ module.exports = { 'type': { 'value': 'admin2' } + }, + { + 'type': { + 'value': 'locality' + } } ] }, diff --git a/test/unit/fixture/search_linguistic_only.js b/test/unit/fixture/search_linguistic_only.js index ac059ef1..043784eb 100644 --- a/test/unit/fixture/search_linguistic_only.js +++ b/test/unit/fixture/search_linguistic_only.js @@ -54,6 +54,11 @@ module.exports = { 'type': { 'value': 'admin2' } + }, + { + 'type': { + 'value': 'locality' + } } ] }, diff --git a/test/unit/fixture/search_partial_address.js b/test/unit/fixture/search_partial_address.js index 94210bf5..09c639b0 100644 --- a/test/unit/fixture/search_partial_address.js +++ b/test/unit/fixture/search_partial_address.js @@ -57,6 +57,11 @@ module.exports = { 'type': { 'value': 'admin2' } + }, + { + 'type': { + 'value': 'locality' + } } ] }, diff --git a/test/unit/fixture/search_regions_address.js b/test/unit/fixture/search_regions_address.js index 05d4ffe5..7605e976 100644 --- a/test/unit/fixture/search_regions_address.js +++ b/test/unit/fixture/search_regions_address.js @@ -57,6 +57,11 @@ module.exports = { 'type': { 'value': 'admin2' } + }, + { + 'type': { + 'value': 'locality' + } } ] },