From 6c6d6e8a1146dcb2e699612d6fa1011816b0bbf7 Mon Sep 17 00:00:00 2001 From: missinglink Date: Tue, 18 Jun 2019 13:44:42 +0200 Subject: [PATCH] feat(remove_population_subquery): remove population subqueries --- query/autocomplete.js | 1 - query/autocomplete_defaults.js | 5 ---- query/reverse_defaults.js | 7 +---- query/search.js | 1 - query/search_defaults.js | 5 ---- query/search_original.js | 1 - query/structured_geocoding.js | 1 - .../fixture/autocomplete_boundary_country.js | 17 ----------- .../unit/fixture/autocomplete_boundary_gid.js | 17 ----------- .../fixture/autocomplete_custom_boosts.json | 20 ------------- ...ocomplete_linguistic_bbox_san_francisco.js | 17 ----------- ...omplete_linguistic_circle_san_francisco.js | 22 -------------- .../autocomplete_linguistic_final_token.js | 17 ----------- .../fixture/autocomplete_linguistic_focus.js | 17 ----------- ...tocomplete_linguistic_focus_null_island.js | 17 ----------- ...autocomplete_linguistic_multiple_tokens.js | 17 ----------- .../autocomplete_linguistic_one_char_token.js | 17 ----------- .../fixture/autocomplete_linguistic_only.js | 17 ----------- ...utocomplete_linguistic_three_char_token.js | 17 ----------- .../autocomplete_linguistic_two_char_token.js | 17 ----------- .../autocomplete_linguistic_with_admin.js | 20 ------------- .../autocomplete_single_character_street.js | 17 ----------- .../autocomplete_with_category_filtering.js | 17 ----------- .../autocomplete_with_layer_filtering.js | 17 ----------- .../autocomplete_with_source_filtering.js | 17 ----------- test/unit/fixture/search_boundary_country.js | 8 ----- .../fixture/search_boundary_country_multi.js | 8 ----- .../search_boundary_country_original.js | 26 ---------------- test/unit/fixture/search_boundary_gid.js | 8 ----- .../fixture/search_boundary_gid_original.js | 26 ---------------- test/unit/fixture/search_fallback.js | 8 ----- .../search_fallback_postalcode_only.js | 8 ----- .../fixture/search_full_address_original.js | 26 ---------------- test/unit/fixture/search_geodisambiguation.js | 8 ----- test/unit/fixture/search_linguistic_bbox.js | 8 ----- .../search_linguistic_bbox_original.js | 26 ---------------- test/unit/fixture/search_linguistic_focus.js | 8 ----- .../fixture/search_linguistic_focus_bbox.js | 8 ----- .../search_linguistic_focus_bbox_original.js | 26 ---------------- .../search_linguistic_focus_null_island.js | 8 ----- ...h_linguistic_focus_null_island_original.js | 26 ---------------- .../search_linguistic_focus_original.js | 26 ---------------- test/unit/fixture/search_linguistic_only.js | 8 ----- .../search_linguistic_only_original.js | 26 ---------------- .../search_partial_address_original.js | 26 ---------------- .../search_regions_address_original.js | 26 ---------------- .../fixture/search_with_category_filtering.js | 8 ----- ...search_with_category_filtering_original.js | 26 ---------------- .../fixture/search_with_custom_boosts.json | 26 ---------------- .../fixture/search_with_source_filtering.js | 8 ----- .../search_with_source_filtering_original.js | 26 ---------------- ...utocomplete_token_matching_permutations.js | 30 +++++++------------ test/unit/query/structured_geocoding.js | 4 +-- 53 files changed, 12 insertions(+), 802 deletions(-) diff --git a/query/autocomplete.js b/query/autocomplete.js index c650a3903..f2a2f0065 100644 --- a/query/autocomplete.js +++ b/query/autocomplete.js @@ -45,7 +45,6 @@ query.score( peliasQuery.view.admin('neighbourhood') ); query.score( views.boost_exact_matches ); query.score( peliasQuery.view.focus( views.ngrams_strict ) ); query.score( peliasQuery.view.popularity( views.pop_subquery ) ); -query.score( peliasQuery.view.population( views.pop_subquery ) ); query.score( views.custom_boosts( config.get('api.customBoosts') ) ); // non-scoring hard filters diff --git a/query/autocomplete_defaults.js b/query/autocomplete_defaults.js index 4a70be039..d3c7b2d57 100644 --- a/query/autocomplete_defaults.js +++ b/query/autocomplete_defaults.js @@ -105,11 +105,6 @@ module.exports = _.merge({}, peliasQuery.defaults, { 'popularity:max_boost': 20, 'popularity:weight': 1, - 'population:field': 'population', - 'population:modifier': 'log1p', - 'population:max_boost': 20, - 'population:weight': 3, - // boost_sources_and_layers view 'custom:boosting:min_score': 1, // score applied to documents which don't score anything via functions 'custom:boosting:boost': 5, // multiply score by this number to increase the strength of the boost diff --git a/query/reverse_defaults.js b/query/reverse_defaults.js index cbcf7a65e..f255bd3f3 100644 --- a/query/reverse_defaults.js +++ b/query/reverse_defaults.js @@ -83,11 +83,6 @@ module.exports = _.merge({}, peliasQuery.defaults, { 'popularity:field': 'popularity', 'popularity:modifier': 'log1p', 'popularity:max_boost': 20, - 'popularity:weight': 1, - - 'population:field': 'population', - 'population:modifier': 'log1p', - 'population:max_boost': 20, - 'population:weight': 2 + 'popularity:weight': 1 }); diff --git a/query/search.js b/query/search.js index 2cbe93310..9e8d07d03 100644 --- a/query/search.js +++ b/query/search.js @@ -12,7 +12,6 @@ var fallbackQuery = new peliasQuery.layout.FallbackQuery(); // scoring boost fallbackQuery.score( peliasQuery.view.focus_only_function( peliasQuery.view.phrase ) ); fallbackQuery.score( peliasQuery.view.popularity_only_function ); -fallbackQuery.score( peliasQuery.view.population_only_function ); // -------------------------------- // non-scoring hard filters diff --git a/query/search_defaults.js b/query/search_defaults.js index e892ea41e..464875de8 100644 --- a/query/search_defaults.js +++ b/query/search_defaults.js @@ -105,11 +105,6 @@ module.exports = _.merge({}, peliasQuery.defaults, { 'popularity:max_boost': 20, 'popularity:weight': 1, - 'population:field': 'population', - 'population:modifier': 'log1p', - 'population:max_boost': 20, - 'population:weight': 2, - // used by fallback queries // @todo: it is also possible to specify layer boosting // via pelias/config, consider deprecating this config. diff --git a/query/search_original.js b/query/search_original.js index 33388eea3..e15070664 100644 --- a/query/search_original.js +++ b/query/search_original.js @@ -26,7 +26,6 @@ query.score( peliasQuery.view.ngrams, 'must' ); query.score( peliasQuery.view.phrase ); query.score( peliasQuery.view.focus( peliasQuery.view.phrase ) ); query.score( peliasQuery.view.popularity( peliasQuery.view.phrase ) ); -query.score( peliasQuery.view.population( peliasQuery.view.phrase ) ); // address components query.score( peliasQuery.view.address('housenumber') ); diff --git a/query/structured_geocoding.js b/query/structured_geocoding.js index 967c85b39..07e5a5625 100644 --- a/query/structured_geocoding.js +++ b/query/structured_geocoding.js @@ -11,7 +11,6 @@ const structuredQuery = new peliasQuery.layout.StructuredFallbackQuery(); // scoring boost structuredQuery.score( peliasQuery.view.focus_only_function( peliasQuery.view.phrase ) ); structuredQuery.score( peliasQuery.view.popularity_only_function ); -structuredQuery.score( peliasQuery.view.population_only_function ); // -------------------------------- // non-scoring hard filters diff --git a/test/unit/fixture/autocomplete_boundary_country.js b/test/unit/fixture/autocomplete_boundary_country.js index 4c74717c2..33578e884 100644 --- a/test/unit/fixture/autocomplete_boundary_country.js +++ b/test/unit/fixture/autocomplete_boundary_country.js @@ -35,23 +35,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match_all': {} - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 3 - }] - } }], 'filter': [{ 'match': { diff --git a/test/unit/fixture/autocomplete_boundary_gid.js b/test/unit/fixture/autocomplete_boundary_gid.js index e575e41a9..2574ae406 100644 --- a/test/unit/fixture/autocomplete_boundary_gid.js +++ b/test/unit/fixture/autocomplete_boundary_gid.js @@ -35,23 +35,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match_all': {} - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 3 - }] - } }], 'filter': [{ 'multi_match': { diff --git a/test/unit/fixture/autocomplete_custom_boosts.json b/test/unit/fixture/autocomplete_custom_boosts.json index adef7f6ee..1c4b85580 100644 --- a/test/unit/fixture/autocomplete_custom_boosts.json +++ b/test/unit/fixture/autocomplete_custom_boosts.json @@ -49,26 +49,6 @@ "score_mode": "first", "boost_mode": "replace" } - }, - { - "function_score": { - "query": { - "match_all": {} - }, - "max_boost": 20, - "functions": [ - { - "field_value_factor": { - "modifier": "log1p", - "field": "population", - "missing": 1 - }, - "weight": 3 - } - ], - "score_mode": "first", - "boost_mode": "replace" - } },{ "function_score": { "query": { diff --git a/test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js b/test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js index 35e3185a9..7f1d043ac 100644 --- a/test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js +++ b/test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js @@ -35,23 +35,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match_all': {} - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 3 - }] - } }], 'filter': [{ 'geo_bounding_box': { diff --git a/test/unit/fixture/autocomplete_linguistic_circle_san_francisco.js b/test/unit/fixture/autocomplete_linguistic_circle_san_francisco.js index 9cf488dbe..df5685a90 100644 --- a/test/unit/fixture/autocomplete_linguistic_circle_san_francisco.js +++ b/test/unit/fixture/autocomplete_linguistic_circle_san_francisco.js @@ -42,28 +42,6 @@ module.exports = { 'score_mode': 'first', 'boost_mode': 'replace' } - }, - { - 'function_score': { - 'query': { - 'match_all': { - - } - }, - 'max_boost': 20, - 'functions': [ - { - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 3 - } - ], - 'score_mode': 'first', - 'boost_mode': 'replace' - } } ], 'filter': [ diff --git a/test/unit/fixture/autocomplete_linguistic_final_token.js b/test/unit/fixture/autocomplete_linguistic_final_token.js index 875f61f8e..9c04e7604 100644 --- a/test/unit/fixture/autocomplete_linguistic_final_token.js +++ b/test/unit/fixture/autocomplete_linguistic_final_token.js @@ -41,23 +41,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match_all': {} - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 3 - }] - } }] } }, diff --git a/test/unit/fixture/autocomplete_linguistic_focus.js b/test/unit/fixture/autocomplete_linguistic_focus.js index b008a66fc..7d9885ac9 100644 --- a/test/unit/fixture/autocomplete_linguistic_focus.js +++ b/test/unit/fixture/autocomplete_linguistic_focus.js @@ -67,23 +67,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match_all': {} - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 3 - }] - } }] } }, diff --git a/test/unit/fixture/autocomplete_linguistic_focus_null_island.js b/test/unit/fixture/autocomplete_linguistic_focus_null_island.js index 8b0dfb86e..62655ccdd 100644 --- a/test/unit/fixture/autocomplete_linguistic_focus_null_island.js +++ b/test/unit/fixture/autocomplete_linguistic_focus_null_island.js @@ -67,23 +67,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match_all': {} - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 3 - }] - } }] } }, diff --git a/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js b/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js index 4e1b95feb..fc7ed8657 100644 --- a/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js +++ b/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js @@ -60,23 +60,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match_all': {} - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 3 - }] - } }] } }, diff --git a/test/unit/fixture/autocomplete_linguistic_one_char_token.js b/test/unit/fixture/autocomplete_linguistic_one_char_token.js index 8a017f946..7916596d8 100644 --- a/test/unit/fixture/autocomplete_linguistic_one_char_token.js +++ b/test/unit/fixture/autocomplete_linguistic_one_char_token.js @@ -35,23 +35,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match_all': {} - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 3 - }] - } }], 'filter': [{ 'terms': { diff --git a/test/unit/fixture/autocomplete_linguistic_only.js b/test/unit/fixture/autocomplete_linguistic_only.js index d422a9ffd..769cc8ae9 100644 --- a/test/unit/fixture/autocomplete_linguistic_only.js +++ b/test/unit/fixture/autocomplete_linguistic_only.js @@ -35,23 +35,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match_all': {} - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 3 - }] - } }] } }, diff --git a/test/unit/fixture/autocomplete_linguistic_three_char_token.js b/test/unit/fixture/autocomplete_linguistic_three_char_token.js index b2ebe23df..a2c4ad17b 100644 --- a/test/unit/fixture/autocomplete_linguistic_three_char_token.js +++ b/test/unit/fixture/autocomplete_linguistic_three_char_token.js @@ -35,23 +35,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match_all': {} - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 3 - }] - } }] } }, diff --git a/test/unit/fixture/autocomplete_linguistic_two_char_token.js b/test/unit/fixture/autocomplete_linguistic_two_char_token.js index 7f9ce63b4..e1efc5697 100644 --- a/test/unit/fixture/autocomplete_linguistic_two_char_token.js +++ b/test/unit/fixture/autocomplete_linguistic_two_char_token.js @@ -35,23 +35,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match_all': {} - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 3 - }] - } }], 'filter': [{ 'terms': { diff --git a/test/unit/fixture/autocomplete_linguistic_with_admin.js b/test/unit/fixture/autocomplete_linguistic_with_admin.js index 85ab37587..0e9e923a9 100644 --- a/test/unit/fixture/autocomplete_linguistic_with_admin.js +++ b/test/unit/fixture/autocomplete_linguistic_with_admin.js @@ -127,26 +127,6 @@ module.exports = { 'score_mode': 'first', 'boost_mode': 'replace' } - }, - { - 'function_score': { - 'query': { - 'match_all': {} - }, - 'max_boost': 20, - 'functions': [ - { - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 3 - } - ], - 'score_mode': 'first', - 'boost_mode': 'replace' - } } ] } diff --git a/test/unit/fixture/autocomplete_single_character_street.js b/test/unit/fixture/autocomplete_single_character_street.js index 581424132..2a54ec1d8 100644 --- a/test/unit/fixture/autocomplete_single_character_street.js +++ b/test/unit/fixture/autocomplete_single_character_street.js @@ -125,23 +125,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match_all': {} - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 3 - }] - } }] } }, diff --git a/test/unit/fixture/autocomplete_with_category_filtering.js b/test/unit/fixture/autocomplete_with_category_filtering.js index 577e32d95..7d875e438 100644 --- a/test/unit/fixture/autocomplete_with_category_filtering.js +++ b/test/unit/fixture/autocomplete_with_category_filtering.js @@ -35,23 +35,6 @@ module.exports = { 'weight': 1 }] } - }, { - 'function_score': { - 'query': { - 'match_all': {} - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 3 - }] - } }], 'filter': [{ 'terms': { diff --git a/test/unit/fixture/autocomplete_with_layer_filtering.js b/test/unit/fixture/autocomplete_with_layer_filtering.js index 197a4e014..1ca78f5ba 100644 --- a/test/unit/fixture/autocomplete_with_layer_filtering.js +++ b/test/unit/fixture/autocomplete_with_layer_filtering.js @@ -35,23 +35,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match_all': {} - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 3 - }] - } }], 'filter': [{ 'terms': { diff --git a/test/unit/fixture/autocomplete_with_source_filtering.js b/test/unit/fixture/autocomplete_with_source_filtering.js index e9f56f671..0bc0262f2 100644 --- a/test/unit/fixture/autocomplete_with_source_filtering.js +++ b/test/unit/fixture/autocomplete_with_source_filtering.js @@ -35,23 +35,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match_all': {} - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 3 - }] - } }], 'filter': [{ 'terms': { diff --git a/test/unit/fixture/search_boundary_country.js b/test/unit/fixture/search_boundary_country.js index 31cad683e..a4a483979 100644 --- a/test/unit/fixture/search_boundary_country.js +++ b/test/unit/fixture/search_boundary_country.js @@ -57,14 +57,6 @@ module.exports = { 'missing': 1 }, 'weight': 1 - }, - { - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 } ], 'score_mode': 'avg', diff --git a/test/unit/fixture/search_boundary_country_multi.js b/test/unit/fixture/search_boundary_country_multi.js index 426db1ee3..2505a189b 100644 --- a/test/unit/fixture/search_boundary_country_multi.js +++ b/test/unit/fixture/search_boundary_country_multi.js @@ -57,14 +57,6 @@ module.exports = { 'missing': 1 }, 'weight': 1 - }, - { - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 } ], 'score_mode': 'avg', diff --git a/test/unit/fixture/search_boundary_country_original.js b/test/unit/fixture/search_boundary_country_original.js index 588c6ea68..896c51eaa 100644 --- a/test/unit/fixture/search_boundary_country_original.js +++ b/test/unit/fixture/search_boundary_country_original.js @@ -50,32 +50,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match': { - 'phrase.default': { - 'query': 'test', - 'cutoff_frequency': 0.01, - 'analyzer': 'peliasPhrase', - 'type': 'phrase', - 'slop': 2, - 'boost': 1 - } - } - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 - }] - } }], 'filter': [ { diff --git a/test/unit/fixture/search_boundary_gid.js b/test/unit/fixture/search_boundary_gid.js index 131029b27..0130264ad 100644 --- a/test/unit/fixture/search_boundary_gid.js +++ b/test/unit/fixture/search_boundary_gid.js @@ -50,14 +50,6 @@ module.exports = { 'missing': 1 }, 'weight': 1 - }, - { - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 } ], 'score_mode': 'avg', diff --git a/test/unit/fixture/search_boundary_gid_original.js b/test/unit/fixture/search_boundary_gid_original.js index b7f9d023d..1f2c3f503 100644 --- a/test/unit/fixture/search_boundary_gid_original.js +++ b/test/unit/fixture/search_boundary_gid_original.js @@ -50,32 +50,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match': { - 'phrase.default': { - 'query': 'test', - 'analyzer': 'peliasPhrase', - 'cutoff_frequency': 0.01, - 'type': 'phrase', - 'slop': 2, - 'boost': 1 - } - } - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 - }] - } }], 'filter': [ { diff --git a/test/unit/fixture/search_fallback.js b/test/unit/fixture/search_fallback.js index 3725dff1d..e42d3a85d 100644 --- a/test/unit/fixture/search_fallback.js +++ b/test/unit/fixture/search_fallback.js @@ -836,14 +836,6 @@ module.exports = { 'missing': 1 }, 'weight': 1 - }, - { - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 } ], 'score_mode': 'avg', diff --git a/test/unit/fixture/search_fallback_postalcode_only.js b/test/unit/fixture/search_fallback_postalcode_only.js index 76b2dbbfa..adce2676e 100644 --- a/test/unit/fixture/search_fallback_postalcode_only.js +++ b/test/unit/fixture/search_fallback_postalcode_only.js @@ -38,14 +38,6 @@ module.exports = { 'missing': 1 }, 'weight': 1 - }, - { - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 } ], 'score_mode': 'avg', diff --git a/test/unit/fixture/search_full_address_original.js b/test/unit/fixture/search_full_address_original.js index 1a2d6aa33..15b106bd3 100644 --- a/test/unit/fixture/search_full_address_original.js +++ b/test/unit/fixture/search_full_address_original.js @@ -51,32 +51,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match': { - 'phrase.default': { - 'query': '123 main st', - 'cutoff_frequency': 0.01, - 'analyzer': 'peliasPhrase', - 'type': 'phrase', - 'slop': 2, - 'boost': 1 - } - } - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 - }] - } },{ 'match': { 'address_parts.number': { diff --git a/test/unit/fixture/search_geodisambiguation.js b/test/unit/fixture/search_geodisambiguation.js index 5db0af98c..8e3812941 100644 --- a/test/unit/fixture/search_geodisambiguation.js +++ b/test/unit/fixture/search_geodisambiguation.js @@ -235,14 +235,6 @@ module.exports = { 'missing': 1 }, 'weight': 1 - }, - { - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 } ], 'score_mode': 'avg', diff --git a/test/unit/fixture/search_linguistic_bbox.js b/test/unit/fixture/search_linguistic_bbox.js index 1692b8b9f..7f61a6e81 100644 --- a/test/unit/fixture/search_linguistic_bbox.js +++ b/test/unit/fixture/search_linguistic_bbox.js @@ -60,14 +60,6 @@ module.exports = { 'missing': 1 }, 'weight': 1 - }, - { - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 } ], 'score_mode': 'avg', diff --git a/test/unit/fixture/search_linguistic_bbox_original.js b/test/unit/fixture/search_linguistic_bbox_original.js index 7a5e56271..c75dcb098 100644 --- a/test/unit/fixture/search_linguistic_bbox_original.js +++ b/test/unit/fixture/search_linguistic_bbox_original.js @@ -48,32 +48,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match': { - 'phrase.default': { - 'query': 'test', - 'cutoff_frequency': 0.01, - 'analyzer': 'peliasPhrase', - 'type': 'phrase', - 'slop': 2, - 'boost': 1 - } - } - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 - }] - } }], 'filter': [{ 'geo_bounding_box': { diff --git a/test/unit/fixture/search_linguistic_focus.js b/test/unit/fixture/search_linguistic_focus.js index 095844323..8c81f33fa 100644 --- a/test/unit/fixture/search_linguistic_focus.js +++ b/test/unit/fixture/search_linguistic_focus.js @@ -63,14 +63,6 @@ module.exports = { 'missing': 1 }, 'weight': 1 - }, - { - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 } ], 'score_mode': 'avg', diff --git a/test/unit/fixture/search_linguistic_focus_bbox.js b/test/unit/fixture/search_linguistic_focus_bbox.js index 9a4a6a88b..bf2f0ba30 100644 --- a/test/unit/fixture/search_linguistic_focus_bbox.js +++ b/test/unit/fixture/search_linguistic_focus_bbox.js @@ -74,14 +74,6 @@ module.exports = { 'missing': 1 }, 'weight': 1 - }, - { - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 } ], 'score_mode': 'avg', diff --git a/test/unit/fixture/search_linguistic_focus_bbox_original.js b/test/unit/fixture/search_linguistic_focus_bbox_original.js index fd671088a..049e543ae 100644 --- a/test/unit/fixture/search_linguistic_focus_bbox_original.js +++ b/test/unit/fixture/search_linguistic_focus_bbox_original.js @@ -79,32 +79,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match': { - 'phrase.default': { - 'query': 'test', - 'cutoff_frequency': 0.01, - 'analyzer': 'peliasPhrase', - 'type': 'phrase', - 'slop': 2, - 'boost': 1 - } - } - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 - }] - } }], 'filter': [{ 'geo_bounding_box': { diff --git a/test/unit/fixture/search_linguistic_focus_null_island.js b/test/unit/fixture/search_linguistic_focus_null_island.js index e137a1682..3e92f583b 100644 --- a/test/unit/fixture/search_linguistic_focus_null_island.js +++ b/test/unit/fixture/search_linguistic_focus_null_island.js @@ -63,14 +63,6 @@ module.exports = { 'missing': 1 }, 'weight': 1 - }, - { - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 } ], 'score_mode': 'avg', diff --git a/test/unit/fixture/search_linguistic_focus_null_island_original.js b/test/unit/fixture/search_linguistic_focus_null_island_original.js index 39e59befe..59f3d5c4f 100644 --- a/test/unit/fixture/search_linguistic_focus_null_island_original.js +++ b/test/unit/fixture/search_linguistic_focus_null_island_original.js @@ -79,32 +79,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match': { - 'phrase.default': { - 'query': 'test', - 'cutoff_frequency': 0.01, - 'analyzer': 'peliasPhrase', - 'type': 'phrase', - 'slop': 2, - 'boost': 1 - } - } - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 - }] - } }], 'filter':[{ 'terms': { diff --git a/test/unit/fixture/search_linguistic_focus_original.js b/test/unit/fixture/search_linguistic_focus_original.js index f89ae7fe8..8968752cd 100644 --- a/test/unit/fixture/search_linguistic_focus_original.js +++ b/test/unit/fixture/search_linguistic_focus_original.js @@ -79,32 +79,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match': { - 'phrase.default': { - 'query': 'test', - 'cutoff_frequency': 0.01, - 'analyzer': 'peliasPhrase', - 'type': 'phrase', - 'slop': 2, - 'boost': 1 - } - } - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 - }] - } }], 'filter': [ { diff --git a/test/unit/fixture/search_linguistic_only.js b/test/unit/fixture/search_linguistic_only.js index e30751ead..119fee81b 100644 --- a/test/unit/fixture/search_linguistic_only.js +++ b/test/unit/fixture/search_linguistic_only.js @@ -49,14 +49,6 @@ module.exports = { 'missing': 1 }, 'weight': 1 - }, - { - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 } ], 'score_mode': 'avg', diff --git a/test/unit/fixture/search_linguistic_only_original.js b/test/unit/fixture/search_linguistic_only_original.js index 4baa9e6d4..9c4e09e15 100644 --- a/test/unit/fixture/search_linguistic_only_original.js +++ b/test/unit/fixture/search_linguistic_only_original.js @@ -48,32 +48,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match': { - 'phrase.default': { - 'query': 'test', - 'cutoff_frequency': 0.01, - 'analyzer': 'peliasPhrase', - 'type': 'phrase', - 'slop': 2, - 'boost': 1 - } - } - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 - }] - } }], 'filter': [ { diff --git a/test/unit/fixture/search_partial_address_original.js b/test/unit/fixture/search_partial_address_original.js index 2c1336fcf..7835002fb 100644 --- a/test/unit/fixture/search_partial_address_original.js +++ b/test/unit/fixture/search_partial_address_original.js @@ -50,32 +50,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match': { - 'phrase.default': { - 'query': 'soho grand', - 'cutoff_frequency': 0.01, - 'analyzer': 'peliasPhrase', - 'type': 'phrase', - 'slop': 2, - 'boost': 1 - } - } - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 - }] - } }, { 'match': { 'parent.region_a': { diff --git a/test/unit/fixture/search_regions_address_original.js b/test/unit/fixture/search_regions_address_original.js index 59dcb2aa1..963937c7a 100644 --- a/test/unit/fixture/search_regions_address_original.js +++ b/test/unit/fixture/search_regions_address_original.js @@ -50,32 +50,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match': { - 'phrase.default': { - 'query': '1 water st', - 'cutoff_frequency': 0.01, - 'analyzer': 'peliasPhrase', - 'type': 'phrase', - 'slop': 2, - 'boost': 1 - } - } - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 - }] - } },{ 'match': { 'address_parts.number': { diff --git a/test/unit/fixture/search_with_category_filtering.js b/test/unit/fixture/search_with_category_filtering.js index 739355871..e65b3fb0f 100644 --- a/test/unit/fixture/search_with_category_filtering.js +++ b/test/unit/fixture/search_with_category_filtering.js @@ -50,14 +50,6 @@ module.exports = { 'missing': 1 }, 'weight': 1 - }, - { - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 } ], 'score_mode': 'avg', diff --git a/test/unit/fixture/search_with_category_filtering_original.js b/test/unit/fixture/search_with_category_filtering_original.js index 014712d47..3a9cd38aa 100644 --- a/test/unit/fixture/search_with_category_filtering_original.js +++ b/test/unit/fixture/search_with_category_filtering_original.js @@ -48,32 +48,6 @@ module.exports = { 'weight': 1 }] } - }, { - 'function_score': { - 'query': { - 'match': { - 'phrase.default': { - 'query': 'test', - 'cutoff_frequency': 0.01, - 'analyzer': 'peliasPhrase', - 'type': 'phrase', - 'slop': 2, - 'boost': 1 - } - } - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 - }] - } }], 'filter': [{ 'terms': { diff --git a/test/unit/fixture/search_with_custom_boosts.json b/test/unit/fixture/search_with_custom_boosts.json index fd61cd10d..530658408 100644 --- a/test/unit/fixture/search_with_custom_boosts.json +++ b/test/unit/fixture/search_with_custom_boosts.json @@ -51,32 +51,6 @@ }] } },{ - "function_score": { - "query": { - "match": { - "phrase.default": { - "query": "test", - "analyzer": "peliasPhrase", - "cutoff_frequency": 0.01, - "type": "phrase", - "slop": 2, - "boost": 1 - } - } - }, - "max_boost": 20, - "score_mode": "first", - "boost_mode": "replace", - "functions": [{ - "field_value_factor": { - "modifier": "log1p", - "field": "population", - "missing": 1 - }, - "weight": 2 - }] - } - },{ "function_score": { "query": { "match_all": {} diff --git a/test/unit/fixture/search_with_source_filtering.js b/test/unit/fixture/search_with_source_filtering.js index 6797aecf5..4f6b2f350 100644 --- a/test/unit/fixture/search_with_source_filtering.js +++ b/test/unit/fixture/search_with_source_filtering.js @@ -49,14 +49,6 @@ module.exports = { 'missing': 1 }, 'weight': 1 - }, - { - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 } ], 'score_mode': 'avg', diff --git a/test/unit/fixture/search_with_source_filtering_original.js b/test/unit/fixture/search_with_source_filtering_original.js index 413fec92a..4cbec5dfd 100644 --- a/test/unit/fixture/search_with_source_filtering_original.js +++ b/test/unit/fixture/search_with_source_filtering_original.js @@ -48,32 +48,6 @@ module.exports = { 'weight': 1 }] } - },{ - 'function_score': { - 'query': { - 'match': { - 'phrase.default': { - 'query': 'test', - 'cutoff_frequency': 0.01, - 'analyzer': 'peliasPhrase', - 'type': 'phrase', - 'slop': 2, - 'boost': 1 - } - } - }, - 'max_boost': 20, - 'score_mode': 'first', - 'boost_mode': 'replace', - 'functions': [{ - 'field_value_factor': { - 'modifier': 'log1p', - 'field': 'population', - 'missing': 1 - }, - 'weight': 2 - }] - } }], 'filter': [{ 'terms': { diff --git a/test/unit/query/autocomplete_token_matching_permutations.js b/test/unit/query/autocomplete_token_matching_permutations.js index 0806014a9..12e142e47 100644 --- a/test/unit/query/autocomplete_token_matching_permutations.js +++ b/test/unit/query/autocomplete_token_matching_permutations.js @@ -63,8 +63,7 @@ module.exports.tests.single_token = function(test, common) { assert( t, generate( clean ), { must: [ views.ngrams_last_token_only( vs ) ], should: [ - peliasQuery.view.popularity( views.pop_subquery )( vs ), - peliasQuery.view.population( views.pop_subquery )( vs ) + peliasQuery.view.popularity( views.pop_subquery )( vs ) ] }); }); @@ -84,8 +83,7 @@ module.exports.tests.single_token = function(test, common) { must: [ views.phrase_first_tokens_only( vs ) ], should: [ views.boost_exact_matches( vs ), - peliasQuery.view.popularity( views.pop_subquery )( vs ), - peliasQuery.view.population( views.pop_subquery )( vs ) + peliasQuery.view.popularity( views.pop_subquery )( vs ) ] }); }); @@ -104,8 +102,7 @@ module.exports.tests.single_token = function(test, common) { assert( t, generate( clean ), { must: [ views.ngrams_last_token_only( vs ) ], should: [ - peliasQuery.view.popularity( views.pop_subquery )( vs ), - peliasQuery.view.population( views.pop_subquery )( vs ) + peliasQuery.view.popularity( views.pop_subquery )( vs ) ] }); }); @@ -125,8 +122,7 @@ module.exports.tests.single_token = function(test, common) { must: [ views.phrase_first_tokens_only( vs ) ], should: [ views.boost_exact_matches( vs ), - peliasQuery.view.popularity( views.pop_subquery )( vs ), - peliasQuery.view.population( views.pop_subquery )( vs ) + peliasQuery.view.popularity( views.pop_subquery )( vs ) ] }); }); @@ -145,8 +141,7 @@ module.exports.tests.single_token = function(test, common) { assert( t, generate( clean ), { must: [ views.ngrams_last_token_only( vs ) ], should: [ - peliasQuery.view.popularity( views.pop_subquery )( vs ), - peliasQuery.view.population( views.pop_subquery )( vs ) + peliasQuery.view.popularity( views.pop_subquery )( vs ) ] }); }); @@ -166,8 +161,7 @@ module.exports.tests.single_token = function(test, common) { must: [ views.phrase_first_tokens_only( vs ) ], should: [ views.boost_exact_matches( vs ), - peliasQuery.view.popularity( views.pop_subquery )( vs ), - peliasQuery.view.population( views.pop_subquery )( vs ) + peliasQuery.view.popularity( views.pop_subquery )( vs ) ] }); }); @@ -192,8 +186,7 @@ module.exports.tests.multiple_tokens = function(test, common) { ], should: [ views.boost_exact_matches( vs ), - peliasQuery.view.popularity( views.pop_subquery )( vs ), - peliasQuery.view.population( views.pop_subquery )( vs ) + peliasQuery.view.popularity( views.pop_subquery )( vs ) ] }); }); @@ -215,8 +208,7 @@ module.exports.tests.multiple_tokens = function(test, common) { ], should: [ views.boost_exact_matches( vs ), - peliasQuery.view.popularity( views.pop_subquery )( vs ), - peliasQuery.view.population( views.pop_subquery )( vs ) + peliasQuery.view.popularity( views.pop_subquery )( vs ) ] }); }); @@ -239,8 +231,7 @@ module.exports.tests.multiple_tokens = function(test, common) { ], should: [ views.boost_exact_matches( vs ), - peliasQuery.view.popularity( views.pop_subquery )( vs ), - peliasQuery.view.population( views.pop_subquery )( vs ) + peliasQuery.view.popularity( views.pop_subquery )( vs ) ] }); }); @@ -262,8 +253,7 @@ module.exports.tests.multiple_tokens = function(test, common) { ], should: [ views.boost_exact_matches( vs ), - peliasQuery.view.popularity( views.pop_subquery )( vs ), - peliasQuery.view.population( views.pop_subquery )( vs ) + peliasQuery.view.popularity( views.pop_subquery )( vs ) ] }); }); diff --git a/test/unit/query/structured_geocoding.js b/test/unit/query/structured_geocoding.js index b18109127..4e466398d 100644 --- a/test/unit/query/structured_geocoding.js +++ b/test/unit/query/structured_geocoding.js @@ -7,7 +7,6 @@ const MockQuery = require('./MockQuery'); const views = { focus_only_function: () => 'focus_only_function view', popularity_only_function: 'popularity_only_function view', - population_only_function: 'population_only_function view', boundary_country: 'boundary_country view', boundary_circle: 'boundary_circle view', boundary_rect: 'boundary_rect view', @@ -71,8 +70,7 @@ module.exports.tests.query = (test, common) => { t.deepEquals(query.body.score_functions, [ 'focus_only_function view', - 'popularity_only_function view', - 'population_only_function view' + 'popularity_only_function view' ]); t.deepEquals(query.body.filter_functions, [