adjust balance between population/popularity and focus

package.json

@@ -51,7 +51,7 @@
     "pelias-config": "^1.0.1",
     "pelias-esclient": "0.0.25",
     "pelias-logger": "^0.0.8",
-    "pelias-query": "4.0.0",
+    "pelias-query": "^5.0.0",
     "pelias-schema": "1.0.0",
     "pelias-suggester-pipeline": "2.0.2",
     "stats-lite": "^1.0.3",

query/defaults.js

@@ -33,6 +33,7 @@ module.exports = extend( false, peliasQuery.defaults, {
   'focus:offset': '1km',
   'focus:scale': '50km',
   'focus:decay': 0.5,
+  'focus:weight': 2,
 
   'function_score:score_mode': 'avg',
   'function_score:boost_mode': 'replace',

test/unit/fixture/autocomplete_linguistic_focus.js

@@ -45,7 +45,8 @@ module.exports = {
                     'scale': '50km',
                     'decay': 0.5
                   }
-                }
+                },
+                'weight': 2
               }],
               'score_mode': 'avg',
               'boost_mode': 'replace'

test/unit/fixture/autocomplete_linguistic_focus_null_island.js

@@ -45,7 +45,8 @@ module.exports = {
                     'scale': '50km',
                     'decay': 0.5
                   }
-                }
+                },
+                'weight': 2
               }],
               'score_mode': 'avg',
               'boost_mode': 'replace'

test/unit/fixture/search_linguistic_focus.js

@@ -47,7 +47,8 @@ module.exports = {
                     'scale': '50km',
                     'decay': 0.5
                   }
-                }
+                },
+                'weight': 2
               }],
               'score_mode': 'avg',
               'boost_mode': 'replace'

test/unit/fixture/search_linguistic_focus_bbox.js

@@ -47,7 +47,8 @@ module.exports = {
                     'scale': '50km',
                     'decay': 0.5
                   }
-                }
+                },
+                'weight': 2
               }],
               'score_mode': 'avg',
               'boost_mode': 'replace'

test/unit/fixture/search_linguistic_focus_null_island.js

@@ -47,7 +47,8 @@ module.exports = {
                     'scale': '50km',
                     'decay': 0.5
                   }
-                }
+                },
+                'weight': 2
               }],
               'score_mode': 'avg',
               'boost_mode': 'replace'