diff --git a/query/autocomplete_defaults.js b/query/autocomplete_defaults.js index 29cd819be..6fb2e8d4e 100644 --- a/query/autocomplete_defaults.js +++ b/query/autocomplete_defaults.js @@ -26,9 +26,9 @@ module.exports = _.merge({}, peliasQuery.defaults, { 'phrase:boost': 1, 'phrase:slop': 3, - 'focus:function': 'linear', + 'focus:function': 'exp', 'focus:offset': '0km', - 'focus:scale': '250km', + 'focus:scale': '50km', 'focus:decay': 0.5, 'focus:weight': 15, diff --git a/query/search_defaults.js b/query/search_defaults.js index 8acf3c26b..742df4633 100644 --- a/query/search_defaults.js +++ b/query/search_defaults.js @@ -26,7 +26,7 @@ module.exports = _.merge({}, peliasQuery.defaults, { 'phrase:boost': 1, 'phrase:slop': 2, - 'focus:function': 'linear', + 'focus:function': 'exp', 'focus:offset': '0km', 'focus:scale': '50km', 'focus:decay': 0.5, diff --git a/test/unit/fixture/autocomplete_linguistic_focus.js b/test/unit/fixture/autocomplete_linguistic_focus.js index 2acc0e1dd..9908d0b26 100644 --- a/test/unit/fixture/autocomplete_linguistic_focus.js +++ b/test/unit/fixture/autocomplete_linguistic_focus.js @@ -32,14 +32,14 @@ module.exports = { } }, 'functions': [{ - 'linear': { + 'exp': { 'center_point': { 'origin': { 'lat': 29.49136, 'lon': -82.50622 }, 'offset': '0km', - 'scale': '250km', + 'scale': '50km', 'decay': 0.5 } }, diff --git a/test/unit/fixture/autocomplete_linguistic_focus_null_island.js b/test/unit/fixture/autocomplete_linguistic_focus_null_island.js index d30294558..43a906940 100644 --- a/test/unit/fixture/autocomplete_linguistic_focus_null_island.js +++ b/test/unit/fixture/autocomplete_linguistic_focus_null_island.js @@ -32,14 +32,14 @@ module.exports = { } }, 'functions': [{ - 'linear': { + 'exp': { 'center_point': { 'origin': { 'lat': 0, 'lon': 0 }, 'offset': '0km', - 'scale': '250km', + 'scale': '50km', 'decay': 0.5 } }, diff --git a/test/unit/fixture/search_linguistic_focus.js b/test/unit/fixture/search_linguistic_focus.js index ac48702ed..095844323 100644 --- a/test/unit/fixture/search_linguistic_focus.js +++ b/test/unit/fixture/search_linguistic_focus.js @@ -44,7 +44,7 @@ module.exports = { 'functions': [ { 'weight': 2, - 'linear': { + 'exp': { 'center_point': { 'origin': { 'lat': 29.49136, diff --git a/test/unit/fixture/search_linguistic_focus_bbox.js b/test/unit/fixture/search_linguistic_focus_bbox.js index 0aed49616..9a4a6a88b 100644 --- a/test/unit/fixture/search_linguistic_focus_bbox.js +++ b/test/unit/fixture/search_linguistic_focus_bbox.js @@ -55,7 +55,7 @@ module.exports = { 'functions': [ { 'weight': 2, - 'linear': { + 'exp': { 'center_point': { 'origin': { 'lat': 29.49136, diff --git a/test/unit/fixture/search_linguistic_focus_bbox_original.js b/test/unit/fixture/search_linguistic_focus_bbox_original.js index 43bea77d1..cdf6eb8ba 100644 --- a/test/unit/fixture/search_linguistic_focus_bbox_original.js +++ b/test/unit/fixture/search_linguistic_focus_bbox_original.js @@ -34,7 +34,7 @@ module.exports = { } }, 'functions': [{ - 'linear': { + 'exp': { 'center_point': { 'origin': { 'lat': 29.49136, diff --git a/test/unit/fixture/search_linguistic_focus_null_island.js b/test/unit/fixture/search_linguistic_focus_null_island.js index 6ba7aa7de..e137a1682 100644 --- a/test/unit/fixture/search_linguistic_focus_null_island.js +++ b/test/unit/fixture/search_linguistic_focus_null_island.js @@ -44,7 +44,7 @@ module.exports = { 'functions': [ { 'weight': 2, - 'linear': { + 'exp': { 'center_point': { 'origin': { 'lat': 0, 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 06b598cc8..b0c0e3f3e 100644 --- a/test/unit/fixture/search_linguistic_focus_null_island_original.js +++ b/test/unit/fixture/search_linguistic_focus_null_island_original.js @@ -34,7 +34,7 @@ module.exports = { } }, 'functions': [{ - 'linear': { + 'exp': { 'center_point': { 'origin': { 'lat': 0, diff --git a/test/unit/fixture/search_linguistic_focus_original.js b/test/unit/fixture/search_linguistic_focus_original.js index 9ece3b860..ac69ea68a 100644 --- a/test/unit/fixture/search_linguistic_focus_original.js +++ b/test/unit/fixture/search_linguistic_focus_original.js @@ -34,7 +34,7 @@ module.exports = { } }, 'functions': [{ - 'linear': { + 'exp': { 'center_point': { 'origin': { 'lat': 29.49136, diff --git a/test/unit/query/search_original.js b/test/unit/query/search_original.js index 3ccac0c93..8f23764d2 100644 --- a/test/unit/query/search_original.js +++ b/test/unit/query/search_original.js @@ -35,7 +35,7 @@ module.exports.tests.query = function(test, common) { var expected = require('../fixture/search_linguistic_focus_bbox_original'); t.deepEqual(compiled.type, 'search_original', 'query type set'); - t.deepEqual(compiled.body, expected, 'search_linguistic_focus_bbox'); + t.deepEqual(compiled.body, expected, 'search_linguistic_focus_bbox_original'); t.end(); });