From f133794e0fae482d1c9415872970a4ed6834648f Mon Sep 17 00:00:00 2001
From: missinglink <insomnia@rcpt.at>
Date: Wed, 24 Feb 2016 12:37:54 +0100
Subject: [PATCH] Tweak weights for focus

---
 query/autocomplete_defaults.js                              | 6 +++---
 test/unit/fixture/autocomplete_linguistic_final_token.js    | 2 +-
 test/unit/fixture/autocomplete_linguistic_focus.js          | 6 +++---
 .../fixture/autocomplete_linguistic_focus_null_island.js    | 6 +++---
 .../unit/fixture/autocomplete_linguistic_multiple_tokens.js | 2 +-
 test/unit/fixture/autocomplete_linguistic_only.js           | 2 +-
 test/unit/fixture/autocomplete_linguistic_with_admin.js     | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/query/autocomplete_defaults.js b/query/autocomplete_defaults.js
index 634f5165..df1b206f 100644
--- a/query/autocomplete_defaults.js
+++ b/query/autocomplete_defaults.js
@@ -30,10 +30,10 @@ module.exports = _.merge({}, peliasQuery.defaults, {
   'phrase:slop': 2,
 
   'focus:function': 'linear',
-  'focus:offset': '10km',
+  'focus:offset': '0km',
   'focus:scale': '250km',
   'focus:decay': 0.5,
-  'focus:weight': 3,
+  'focus:weight': 10,
 
   'function_score:score_mode': 'avg',
   'function_score:boost_mode': 'multiply',
@@ -90,6 +90,6 @@ module.exports = _.merge({}, peliasQuery.defaults, {
   'population:field': 'population',
   'population:modifier': 'log1p',
   'population:max_boost': 20,
-  'population:weight': 2
+  'population:weight': 3
 
 });
diff --git a/test/unit/fixture/autocomplete_linguistic_final_token.js b/test/unit/fixture/autocomplete_linguistic_final_token.js
index e63c84b6..1641ac44 100644
--- a/test/unit/fixture/autocomplete_linguistic_final_token.js
+++ b/test/unit/fixture/autocomplete_linguistic_final_token.js
@@ -70,7 +70,7 @@ module.exports = {
                   'modifier': 'log1p',
                   'field': 'population'
                 },
-                'weight': 2
+                'weight': 3
               }]
             }
           }]
diff --git a/test/unit/fixture/autocomplete_linguistic_focus.js b/test/unit/fixture/autocomplete_linguistic_focus.js
index 83156c0b..513136b9 100644
--- a/test/unit/fixture/autocomplete_linguistic_focus.js
+++ b/test/unit/fixture/autocomplete_linguistic_focus.js
@@ -35,12 +35,12 @@ module.exports = {
                       'lat': 29.49136,
                       'lon': -82.50622
                     },
-                    'offset': '10km',
+                    'offset': '0km',
                     'scale': '250km',
                     'decay': 0.5
                   }
                 },
-                'weight': 3
+                'weight': 10
               }],
               'score_mode': 'avg',
               'boost_mode': 'multiply',
@@ -114,7 +114,7 @@ module.exports = {
                   'modifier': 'log1p',
                   'field': 'population'
                 },
-                'weight': 2
+                '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 f28b6234..3985d061 100644
--- a/test/unit/fixture/autocomplete_linguistic_focus_null_island.js
+++ b/test/unit/fixture/autocomplete_linguistic_focus_null_island.js
@@ -35,12 +35,12 @@ module.exports = {
                       'lat': 0,
                       'lon': 0
                     },
-                    'offset': '10km',
+                    'offset': '0km',
                     'scale': '250km',
                     'decay': 0.5
                   }
                 },
-                'weight': 3
+                'weight': 10
               }],
               'score_mode': 'avg',
               'boost_mode': 'multiply',
@@ -114,7 +114,7 @@ module.exports = {
                   'modifier': 'log1p',
                   'field': 'population'
                 },
-                'weight': 2
+                'weight': 3
               }]
             }
           }]
diff --git a/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js b/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js
index dab5e31a..16a25605 100644
--- a/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js
+++ b/test/unit/fixture/autocomplete_linguistic_multiple_tokens.js
@@ -81,7 +81,7 @@ module.exports = {
                   'modifier': 'log1p',
                   'field': 'population'
                 },
-                'weight': 2
+                'weight': 3
               }]
             }
           }]
diff --git a/test/unit/fixture/autocomplete_linguistic_only.js b/test/unit/fixture/autocomplete_linguistic_only.js
index 2ec025d4..05ff6c43 100644
--- a/test/unit/fixture/autocomplete_linguistic_only.js
+++ b/test/unit/fixture/autocomplete_linguistic_only.js
@@ -70,7 +70,7 @@ module.exports = {
                   'modifier': 'log1p',
                   'field': 'population'
                 },
-                'weight': 2
+                'weight': 3
               }]
             }
           }]
diff --git a/test/unit/fixture/autocomplete_linguistic_with_admin.js b/test/unit/fixture/autocomplete_linguistic_with_admin.js
index 215a5fda..2174fcbf 100644
--- a/test/unit/fixture/autocomplete_linguistic_with_admin.js
+++ b/test/unit/fixture/autocomplete_linguistic_with_admin.js
@@ -133,7 +133,7 @@ module.exports = {
                       'modifier': 'log1p',
                       'field': 'population'
                     },
-                    'weight': 2
+                    'weight': 3
                   }
                 ],
                 'score_mode': 'first',