From 4c795515e89671cef75960ed3b5a060c0a79769d Mon Sep 17 00:00:00 2001 From: missinglink Date: Wed, 30 Mar 2022 15:50:04 +0200 Subject: [PATCH 1/3] feat(autocomplete): adjust popularity field weight --- query/autocomplete_defaults.js | 2 +- test/unit/fixture/autocomplete_boundary_country.js | 2 +- test/unit/fixture/autocomplete_boundary_gid.js | 2 +- test/unit/fixture/autocomplete_custom_boosts.json | 2 +- test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js | 2 +- .../fixture/autocomplete_linguistic_circle_san_francisco.js | 2 +- test/unit/fixture/autocomplete_linguistic_final_token.js | 2 +- test/unit/fixture/autocomplete_linguistic_focus.js | 2 +- test/unit/fixture/autocomplete_linguistic_focus_null_island.js | 2 +- test/unit/fixture/autocomplete_linguistic_multiple_tokens.js | 2 +- .../autocomplete_linguistic_multiple_tokens_complete_numeric.js | 2 +- test/unit/fixture/autocomplete_linguistic_one_char_token.js | 2 +- test/unit/fixture/autocomplete_linguistic_only.js | 2 +- test/unit/fixture/autocomplete_linguistic_three_char_token.js | 2 +- test/unit/fixture/autocomplete_linguistic_two_char_token.js | 2 +- test/unit/fixture/autocomplete_linguistic_with_admin.js | 2 +- test/unit/fixture/autocomplete_single_character_street.js | 2 +- test/unit/fixture/autocomplete_with_category_filtering.js | 2 +- test/unit/fixture/autocomplete_with_layer_filtering.js | 2 +- test/unit/fixture/autocomplete_with_source_filtering.js | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/query/autocomplete_defaults.js b/query/autocomplete_defaults.js index 3c634c891..c9c604f08 100644 --- a/query/autocomplete_defaults.js +++ b/query/autocomplete_defaults.js @@ -138,7 +138,7 @@ module.exports = _.merge({}, peliasQuery.defaults, { 'popularity:field': 'popularity', 'popularity:modifier': 'log1p', 'popularity:max_boost': 20, - 'popularity:weight': 1, + 'popularity:weight': 2, 'population:field': 'population', 'population:modifier': 'log1p', diff --git a/test/unit/fixture/autocomplete_boundary_country.js b/test/unit/fixture/autocomplete_boundary_country.js index 64a70552c..9f3423d1c 100644 --- a/test/unit/fixture/autocomplete_boundary_country.js +++ b/test/unit/fixture/autocomplete_boundary_country.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 1 + 'weight': 2 }] } },{ diff --git a/test/unit/fixture/autocomplete_boundary_gid.js b/test/unit/fixture/autocomplete_boundary_gid.js index 5ccb058ca..03c62b20a 100644 --- a/test/unit/fixture/autocomplete_boundary_gid.js +++ b/test/unit/fixture/autocomplete_boundary_gid.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 1 + 'weight': 2 }] } },{ diff --git a/test/unit/fixture/autocomplete_custom_boosts.json b/test/unit/fixture/autocomplete_custom_boosts.json index 556f1452b..acf0c91e1 100644 --- a/test/unit/fixture/autocomplete_custom_boosts.json +++ b/test/unit/fixture/autocomplete_custom_boosts.json @@ -29,7 +29,7 @@ "field": "popularity", "missing": 1 }, - "weight": 1 + "weight": 2 } ], "score_mode": "first", diff --git a/test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js b/test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js index 787450f4a..d7901f93c 100644 --- a/test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js +++ b/test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 1 + 'weight': 2 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_circle_san_francisco.js b/test/unit/fixture/autocomplete_linguistic_circle_san_francisco.js index fdeb8757f..d17ef7767 100644 --- a/test/unit/fixture/autocomplete_linguistic_circle_san_francisco.js +++ b/test/unit/fixture/autocomplete_linguistic_circle_san_francisco.js @@ -33,7 +33,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 1 + 'weight': 2 } ], 'score_mode': 'first', diff --git a/test/unit/fixture/autocomplete_linguistic_final_token.js b/test/unit/fixture/autocomplete_linguistic_final_token.js index 43ffa2783..918de42df 100644 --- a/test/unit/fixture/autocomplete_linguistic_final_token.js +++ b/test/unit/fixture/autocomplete_linguistic_final_token.js @@ -25,7 +25,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 1 + 'weight': 2 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_focus.js b/test/unit/fixture/autocomplete_linguistic_focus.js index bfde87014..1b6a3ef72 100644 --- a/test/unit/fixture/autocomplete_linguistic_focus.js +++ b/test/unit/fixture/autocomplete_linguistic_focus.js @@ -51,7 +51,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 1 + 'weight': 2 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_focus_null_island.js b/test/unit/fixture/autocomplete_linguistic_focus_null_island.js index 5ceed3548..a16fbcc0a 100644 --- a/test/unit/fixture/autocomplete_linguistic_focus_null_island.js +++ b/test/unit/fixture/autocomplete_linguistic_focus_null_island.js @@ -51,7 +51,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 1 + 'weight': 2 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js b/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js index 157c224d1..1f1d4616c 100644 --- a/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js +++ b/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js @@ -53,7 +53,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 1 + 'weight': 2 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_multiple_tokens_complete_numeric.js b/test/unit/fixture/autocomplete_linguistic_multiple_tokens_complete_numeric.js index 3bb89a8fa..211e21132 100644 --- a/test/unit/fixture/autocomplete_linguistic_multiple_tokens_complete_numeric.js +++ b/test/unit/fixture/autocomplete_linguistic_multiple_tokens_complete_numeric.js @@ -40,7 +40,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 1 + 'weight': 2 }] } }, { diff --git a/test/unit/fixture/autocomplete_linguistic_one_char_token.js b/test/unit/fixture/autocomplete_linguistic_one_char_token.js index 7a4286910..5ffde1bbf 100644 --- a/test/unit/fixture/autocomplete_linguistic_one_char_token.js +++ b/test/unit/fixture/autocomplete_linguistic_one_char_token.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 1 + 'weight': 2 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_only.js b/test/unit/fixture/autocomplete_linguistic_only.js index b8c50a99d..ebf01e91e 100644 --- a/test/unit/fixture/autocomplete_linguistic_only.js +++ b/test/unit/fixture/autocomplete_linguistic_only.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 1 + 'weight': 2 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_three_char_token.js b/test/unit/fixture/autocomplete_linguistic_three_char_token.js index 79b2dea27..54f6ebcb9 100644 --- a/test/unit/fixture/autocomplete_linguistic_three_char_token.js +++ b/test/unit/fixture/autocomplete_linguistic_three_char_token.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 1 + 'weight': 2 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_two_char_token.js b/test/unit/fixture/autocomplete_linguistic_two_char_token.js index b95dafacd..eeb646e71 100644 --- a/test/unit/fixture/autocomplete_linguistic_two_char_token.js +++ b/test/unit/fixture/autocomplete_linguistic_two_char_token.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 1 + 'weight': 2 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_with_admin.js b/test/unit/fixture/autocomplete_linguistic_with_admin.js index e162915fb..bf4e5a293 100644 --- a/test/unit/fixture/autocomplete_linguistic_with_admin.js +++ b/test/unit/fixture/autocomplete_linguistic_with_admin.js @@ -50,7 +50,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 1 + 'weight': 2 } ], 'score_mode': 'first', diff --git a/test/unit/fixture/autocomplete_single_character_street.js b/test/unit/fixture/autocomplete_single_character_street.js index 1c7e421e2..1f9335c0b 100644 --- a/test/unit/fixture/autocomplete_single_character_street.js +++ b/test/unit/fixture/autocomplete_single_character_street.js @@ -48,7 +48,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 1 + 'weight': 2 }] } },{ diff --git a/test/unit/fixture/autocomplete_with_category_filtering.js b/test/unit/fixture/autocomplete_with_category_filtering.js index 5ee33d85a..e868da3b2 100644 --- a/test/unit/fixture/autocomplete_with_category_filtering.js +++ b/test/unit/fixture/autocomplete_with_category_filtering.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 1 + 'weight': 2 }] } }, { diff --git a/test/unit/fixture/autocomplete_with_layer_filtering.js b/test/unit/fixture/autocomplete_with_layer_filtering.js index 916e5925a..ca879eb68 100644 --- a/test/unit/fixture/autocomplete_with_layer_filtering.js +++ b/test/unit/fixture/autocomplete_with_layer_filtering.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 1 + 'weight': 2 }] } },{ diff --git a/test/unit/fixture/autocomplete_with_source_filtering.js b/test/unit/fixture/autocomplete_with_source_filtering.js index af3eea8c2..e646de05e 100644 --- a/test/unit/fixture/autocomplete_with_source_filtering.js +++ b/test/unit/fixture/autocomplete_with_source_filtering.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 1 + 'weight': 2 }] } },{ From 0a7b0c0ba8f4d5b8a58d5e61d7d4257103bbfcb8 Mon Sep 17 00:00:00 2001 From: missinglink Date: Wed, 30 Mar 2022 16:05:32 +0200 Subject: [PATCH 2/3] feat(autocomplete): adjust popularity field weight --- query/autocomplete_defaults.js | 2 +- test/unit/fixture/autocomplete_boundary_country.js | 2 +- test/unit/fixture/autocomplete_boundary_gid.js | 2 +- test/unit/fixture/autocomplete_custom_boosts.json | 2 +- test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js | 2 +- .../fixture/autocomplete_linguistic_circle_san_francisco.js | 2 +- test/unit/fixture/autocomplete_linguistic_final_token.js | 2 +- test/unit/fixture/autocomplete_linguistic_focus.js | 2 +- test/unit/fixture/autocomplete_linguistic_focus_null_island.js | 2 +- test/unit/fixture/autocomplete_linguistic_multiple_tokens.js | 2 +- .../autocomplete_linguistic_multiple_tokens_complete_numeric.js | 2 +- test/unit/fixture/autocomplete_linguistic_one_char_token.js | 2 +- test/unit/fixture/autocomplete_linguistic_only.js | 2 +- test/unit/fixture/autocomplete_linguistic_three_char_token.js | 2 +- test/unit/fixture/autocomplete_linguistic_two_char_token.js | 2 +- test/unit/fixture/autocomplete_linguistic_with_admin.js | 2 +- test/unit/fixture/autocomplete_single_character_street.js | 2 +- test/unit/fixture/autocomplete_with_category_filtering.js | 2 +- test/unit/fixture/autocomplete_with_layer_filtering.js | 2 +- test/unit/fixture/autocomplete_with_source_filtering.js | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/query/autocomplete_defaults.js b/query/autocomplete_defaults.js index c9c604f08..cbfe0a237 100644 --- a/query/autocomplete_defaults.js +++ b/query/autocomplete_defaults.js @@ -138,7 +138,7 @@ module.exports = _.merge({}, peliasQuery.defaults, { 'popularity:field': 'popularity', 'popularity:modifier': 'log1p', 'popularity:max_boost': 20, - 'popularity:weight': 2, + 'popularity:weight': 7, 'population:field': 'population', 'population:modifier': 'log1p', diff --git a/test/unit/fixture/autocomplete_boundary_country.js b/test/unit/fixture/autocomplete_boundary_country.js index 9f3423d1c..c0cddfcc6 100644 --- a/test/unit/fixture/autocomplete_boundary_country.js +++ b/test/unit/fixture/autocomplete_boundary_country.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 2 + 'weight': 7 }] } },{ diff --git a/test/unit/fixture/autocomplete_boundary_gid.js b/test/unit/fixture/autocomplete_boundary_gid.js index 03c62b20a..18f193a45 100644 --- a/test/unit/fixture/autocomplete_boundary_gid.js +++ b/test/unit/fixture/autocomplete_boundary_gid.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 2 + 'weight': 7 }] } },{ diff --git a/test/unit/fixture/autocomplete_custom_boosts.json b/test/unit/fixture/autocomplete_custom_boosts.json index acf0c91e1..df6b1c4c4 100644 --- a/test/unit/fixture/autocomplete_custom_boosts.json +++ b/test/unit/fixture/autocomplete_custom_boosts.json @@ -29,7 +29,7 @@ "field": "popularity", "missing": 1 }, - "weight": 2 + "weight": 7 } ], "score_mode": "first", diff --git a/test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js b/test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js index d7901f93c..6d2ceb4aa 100644 --- a/test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js +++ b/test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 2 + 'weight': 7 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_circle_san_francisco.js b/test/unit/fixture/autocomplete_linguistic_circle_san_francisco.js index d17ef7767..6cf3226fa 100644 --- a/test/unit/fixture/autocomplete_linguistic_circle_san_francisco.js +++ b/test/unit/fixture/autocomplete_linguistic_circle_san_francisco.js @@ -33,7 +33,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 2 + 'weight': 7 } ], 'score_mode': 'first', diff --git a/test/unit/fixture/autocomplete_linguistic_final_token.js b/test/unit/fixture/autocomplete_linguistic_final_token.js index 918de42df..6d13e8030 100644 --- a/test/unit/fixture/autocomplete_linguistic_final_token.js +++ b/test/unit/fixture/autocomplete_linguistic_final_token.js @@ -25,7 +25,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 2 + 'weight': 7 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_focus.js b/test/unit/fixture/autocomplete_linguistic_focus.js index 1b6a3ef72..a34a344bf 100644 --- a/test/unit/fixture/autocomplete_linguistic_focus.js +++ b/test/unit/fixture/autocomplete_linguistic_focus.js @@ -51,7 +51,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 2 + 'weight': 7 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_focus_null_island.js b/test/unit/fixture/autocomplete_linguistic_focus_null_island.js index a16fbcc0a..b759c2f79 100644 --- a/test/unit/fixture/autocomplete_linguistic_focus_null_island.js +++ b/test/unit/fixture/autocomplete_linguistic_focus_null_island.js @@ -51,7 +51,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 2 + 'weight': 7 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js b/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js index 1f1d4616c..b032a404c 100644 --- a/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js +++ b/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js @@ -53,7 +53,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 2 + 'weight': 7 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_multiple_tokens_complete_numeric.js b/test/unit/fixture/autocomplete_linguistic_multiple_tokens_complete_numeric.js index 211e21132..82ada04aa 100644 --- a/test/unit/fixture/autocomplete_linguistic_multiple_tokens_complete_numeric.js +++ b/test/unit/fixture/autocomplete_linguistic_multiple_tokens_complete_numeric.js @@ -40,7 +40,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 2 + 'weight': 7 }] } }, { diff --git a/test/unit/fixture/autocomplete_linguistic_one_char_token.js b/test/unit/fixture/autocomplete_linguistic_one_char_token.js index 5ffde1bbf..e9cc38e48 100644 --- a/test/unit/fixture/autocomplete_linguistic_one_char_token.js +++ b/test/unit/fixture/autocomplete_linguistic_one_char_token.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 2 + 'weight': 7 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_only.js b/test/unit/fixture/autocomplete_linguistic_only.js index ebf01e91e..8b705e163 100644 --- a/test/unit/fixture/autocomplete_linguistic_only.js +++ b/test/unit/fixture/autocomplete_linguistic_only.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 2 + 'weight': 7 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_three_char_token.js b/test/unit/fixture/autocomplete_linguistic_three_char_token.js index 54f6ebcb9..2306a8502 100644 --- a/test/unit/fixture/autocomplete_linguistic_three_char_token.js +++ b/test/unit/fixture/autocomplete_linguistic_three_char_token.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 2 + 'weight': 7 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_two_char_token.js b/test/unit/fixture/autocomplete_linguistic_two_char_token.js index eeb646e71..0d67d080e 100644 --- a/test/unit/fixture/autocomplete_linguistic_two_char_token.js +++ b/test/unit/fixture/autocomplete_linguistic_two_char_token.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 2 + 'weight': 7 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_with_admin.js b/test/unit/fixture/autocomplete_linguistic_with_admin.js index bf4e5a293..8d2d2eed9 100644 --- a/test/unit/fixture/autocomplete_linguistic_with_admin.js +++ b/test/unit/fixture/autocomplete_linguistic_with_admin.js @@ -50,7 +50,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 2 + 'weight': 7 } ], 'score_mode': 'first', diff --git a/test/unit/fixture/autocomplete_single_character_street.js b/test/unit/fixture/autocomplete_single_character_street.js index 1f9335c0b..c7b779dd6 100644 --- a/test/unit/fixture/autocomplete_single_character_street.js +++ b/test/unit/fixture/autocomplete_single_character_street.js @@ -48,7 +48,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 2 + 'weight': 7 }] } },{ diff --git a/test/unit/fixture/autocomplete_with_category_filtering.js b/test/unit/fixture/autocomplete_with_category_filtering.js index e868da3b2..850d19f81 100644 --- a/test/unit/fixture/autocomplete_with_category_filtering.js +++ b/test/unit/fixture/autocomplete_with_category_filtering.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 2 + 'weight': 7 }] } }, { diff --git a/test/unit/fixture/autocomplete_with_layer_filtering.js b/test/unit/fixture/autocomplete_with_layer_filtering.js index ca879eb68..bb04a3444 100644 --- a/test/unit/fixture/autocomplete_with_layer_filtering.js +++ b/test/unit/fixture/autocomplete_with_layer_filtering.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 2 + 'weight': 7 }] } },{ diff --git a/test/unit/fixture/autocomplete_with_source_filtering.js b/test/unit/fixture/autocomplete_with_source_filtering.js index e646de05e..bb4427d13 100644 --- a/test/unit/fixture/autocomplete_with_source_filtering.js +++ b/test/unit/fixture/autocomplete_with_source_filtering.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 2 + 'weight': 7 }] } },{ From 20a26ea15c82fb7101d723e6afd1d7a6c6888416 Mon Sep 17 00:00:00 2001 From: missinglink Date: Wed, 30 Mar 2022 16:17:36 +0200 Subject: [PATCH 3/3] feat(autocomplete): adjust popularity field weight --- query/autocomplete_defaults.js | 2 +- test/unit/fixture/autocomplete_boundary_country.js | 2 +- test/unit/fixture/autocomplete_boundary_gid.js | 2 +- test/unit/fixture/autocomplete_custom_boosts.json | 2 +- test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js | 2 +- .../fixture/autocomplete_linguistic_circle_san_francisco.js | 2 +- test/unit/fixture/autocomplete_linguistic_final_token.js | 2 +- test/unit/fixture/autocomplete_linguistic_focus.js | 2 +- test/unit/fixture/autocomplete_linguistic_focus_null_island.js | 2 +- test/unit/fixture/autocomplete_linguistic_multiple_tokens.js | 2 +- .../autocomplete_linguistic_multiple_tokens_complete_numeric.js | 2 +- test/unit/fixture/autocomplete_linguistic_one_char_token.js | 2 +- test/unit/fixture/autocomplete_linguistic_only.js | 2 +- test/unit/fixture/autocomplete_linguistic_three_char_token.js | 2 +- test/unit/fixture/autocomplete_linguistic_two_char_token.js | 2 +- test/unit/fixture/autocomplete_linguistic_with_admin.js | 2 +- test/unit/fixture/autocomplete_single_character_street.js | 2 +- test/unit/fixture/autocomplete_with_category_filtering.js | 2 +- test/unit/fixture/autocomplete_with_layer_filtering.js | 2 +- test/unit/fixture/autocomplete_with_source_filtering.js | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/query/autocomplete_defaults.js b/query/autocomplete_defaults.js index cbfe0a237..b4785465f 100644 --- a/query/autocomplete_defaults.js +++ b/query/autocomplete_defaults.js @@ -138,7 +138,7 @@ module.exports = _.merge({}, peliasQuery.defaults, { 'popularity:field': 'popularity', 'popularity:modifier': 'log1p', 'popularity:max_boost': 20, - 'popularity:weight': 7, + 'popularity:weight': 5, 'population:field': 'population', 'population:modifier': 'log1p', diff --git a/test/unit/fixture/autocomplete_boundary_country.js b/test/unit/fixture/autocomplete_boundary_country.js index c0cddfcc6..5b3772d29 100644 --- a/test/unit/fixture/autocomplete_boundary_country.js +++ b/test/unit/fixture/autocomplete_boundary_country.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 7 + 'weight': 5 }] } },{ diff --git a/test/unit/fixture/autocomplete_boundary_gid.js b/test/unit/fixture/autocomplete_boundary_gid.js index 18f193a45..89e6c413b 100644 --- a/test/unit/fixture/autocomplete_boundary_gid.js +++ b/test/unit/fixture/autocomplete_boundary_gid.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 7 + 'weight': 5 }] } },{ diff --git a/test/unit/fixture/autocomplete_custom_boosts.json b/test/unit/fixture/autocomplete_custom_boosts.json index df6b1c4c4..701ceb269 100644 --- a/test/unit/fixture/autocomplete_custom_boosts.json +++ b/test/unit/fixture/autocomplete_custom_boosts.json @@ -29,7 +29,7 @@ "field": "popularity", "missing": 1 }, - "weight": 7 + "weight": 5 } ], "score_mode": "first", diff --git a/test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js b/test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js index 6d2ceb4aa..0c5a0a173 100644 --- a/test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js +++ b/test/unit/fixture/autocomplete_linguistic_bbox_san_francisco.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 7 + 'weight': 5 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_circle_san_francisco.js b/test/unit/fixture/autocomplete_linguistic_circle_san_francisco.js index 6cf3226fa..28e031a9a 100644 --- a/test/unit/fixture/autocomplete_linguistic_circle_san_francisco.js +++ b/test/unit/fixture/autocomplete_linguistic_circle_san_francisco.js @@ -33,7 +33,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 7 + 'weight': 5 } ], 'score_mode': 'first', diff --git a/test/unit/fixture/autocomplete_linguistic_final_token.js b/test/unit/fixture/autocomplete_linguistic_final_token.js index 6d13e8030..b983d3c63 100644 --- a/test/unit/fixture/autocomplete_linguistic_final_token.js +++ b/test/unit/fixture/autocomplete_linguistic_final_token.js @@ -25,7 +25,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 7 + 'weight': 5 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_focus.js b/test/unit/fixture/autocomplete_linguistic_focus.js index a34a344bf..27d32468a 100644 --- a/test/unit/fixture/autocomplete_linguistic_focus.js +++ b/test/unit/fixture/autocomplete_linguistic_focus.js @@ -51,7 +51,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 7 + 'weight': 5 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_focus_null_island.js b/test/unit/fixture/autocomplete_linguistic_focus_null_island.js index b759c2f79..6acbab32d 100644 --- a/test/unit/fixture/autocomplete_linguistic_focus_null_island.js +++ b/test/unit/fixture/autocomplete_linguistic_focus_null_island.js @@ -51,7 +51,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 7 + 'weight': 5 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js b/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js index b032a404c..f0b96b0c8 100644 --- a/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js +++ b/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js @@ -53,7 +53,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 7 + 'weight': 5 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_multiple_tokens_complete_numeric.js b/test/unit/fixture/autocomplete_linguistic_multiple_tokens_complete_numeric.js index 82ada04aa..1e3de027d 100644 --- a/test/unit/fixture/autocomplete_linguistic_multiple_tokens_complete_numeric.js +++ b/test/unit/fixture/autocomplete_linguistic_multiple_tokens_complete_numeric.js @@ -40,7 +40,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 7 + 'weight': 5 }] } }, { diff --git a/test/unit/fixture/autocomplete_linguistic_one_char_token.js b/test/unit/fixture/autocomplete_linguistic_one_char_token.js index e9cc38e48..bd57da1ee 100644 --- a/test/unit/fixture/autocomplete_linguistic_one_char_token.js +++ b/test/unit/fixture/autocomplete_linguistic_one_char_token.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 7 + 'weight': 5 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_only.js b/test/unit/fixture/autocomplete_linguistic_only.js index 8b705e163..3474e3b75 100644 --- a/test/unit/fixture/autocomplete_linguistic_only.js +++ b/test/unit/fixture/autocomplete_linguistic_only.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 7 + 'weight': 5 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_three_char_token.js b/test/unit/fixture/autocomplete_linguistic_three_char_token.js index 2306a8502..dbe0a3bd2 100644 --- a/test/unit/fixture/autocomplete_linguistic_three_char_token.js +++ b/test/unit/fixture/autocomplete_linguistic_three_char_token.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 7 + 'weight': 5 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_two_char_token.js b/test/unit/fixture/autocomplete_linguistic_two_char_token.js index 0d67d080e..99e085899 100644 --- a/test/unit/fixture/autocomplete_linguistic_two_char_token.js +++ b/test/unit/fixture/autocomplete_linguistic_two_char_token.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 7 + 'weight': 5 }] } },{ diff --git a/test/unit/fixture/autocomplete_linguistic_with_admin.js b/test/unit/fixture/autocomplete_linguistic_with_admin.js index 8d2d2eed9..b070eac55 100644 --- a/test/unit/fixture/autocomplete_linguistic_with_admin.js +++ b/test/unit/fixture/autocomplete_linguistic_with_admin.js @@ -50,7 +50,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 7 + 'weight': 5 } ], 'score_mode': 'first', diff --git a/test/unit/fixture/autocomplete_single_character_street.js b/test/unit/fixture/autocomplete_single_character_street.js index c7b779dd6..9501df638 100644 --- a/test/unit/fixture/autocomplete_single_character_street.js +++ b/test/unit/fixture/autocomplete_single_character_street.js @@ -48,7 +48,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 7 + 'weight': 5 }] } },{ diff --git a/test/unit/fixture/autocomplete_with_category_filtering.js b/test/unit/fixture/autocomplete_with_category_filtering.js index 850d19f81..486da2127 100644 --- a/test/unit/fixture/autocomplete_with_category_filtering.js +++ b/test/unit/fixture/autocomplete_with_category_filtering.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 7 + 'weight': 5 }] } }, { diff --git a/test/unit/fixture/autocomplete_with_layer_filtering.js b/test/unit/fixture/autocomplete_with_layer_filtering.js index bb04a3444..271a8b5b4 100644 --- a/test/unit/fixture/autocomplete_with_layer_filtering.js +++ b/test/unit/fixture/autocomplete_with_layer_filtering.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 7 + 'weight': 5 }] } },{ diff --git a/test/unit/fixture/autocomplete_with_source_filtering.js b/test/unit/fixture/autocomplete_with_source_filtering.js index bb4427d13..58b5cbc7d 100644 --- a/test/unit/fixture/autocomplete_with_source_filtering.js +++ b/test/unit/fixture/autocomplete_with_source_filtering.js @@ -29,7 +29,7 @@ module.exports = { 'field': 'popularity', 'missing': 1 }, - 'weight': 7 + 'weight': 5 }] } },{