resolve merge conflicts

query/reverse_defaults.js

@@ -29,7 +29,7 @@ module.exports = _.merge({}, peliasQuery.defaults, {
   'phrase:slop': 2,
 
   'focus:function': 'linear',
-  'focus:offset': '1km',
+  'focus:offset': '0km',
   'focus:scale': '50km',
   'focus:decay': 0.5,
   'focus:weight': 2,

query/search_defaults.js

@@ -28,7 +28,7 @@ module.exports = _.merge({}, peliasQuery.defaults, {
   'phrase:slop': 2,
 
   'focus:function': 'linear',
-  'focus:offset': '1km',
+  'focus:offset': '0km',
   'focus:scale': '50km',
   'focus:decay': 0.5,
   'focus:weight': 2,

test/unit/fixture/search_linguistic_focus.js

@@ -41,7 +41,7 @@ module.exports = {
                   'lat': 29.49136,
                   'lon': -82.50622
                 },
-                'offset': '1km',
+                'offset': '0km',
                 'scale': '50km',
                 'decay': 0.5
               }

test/unit/fixture/search_linguistic_focus_bbox.js

@@ -41,7 +41,7 @@ module.exports = {
                   'lat': 29.49136,
                   'lon': -82.50622
                 },
-                'offset': '1km',
+                'offset': '0km',
                 'scale': '50km',
                 'decay': 0.5
               }

test/unit/fixture/search_linguistic_focus_null_island.js

@@ -41,7 +41,7 @@ module.exports = {
                   'lat': 0,
                   'lon': 0
                 },
-                'offset': '1km',
+                'offset': '0km',
                 'scale': '50km',
                 'decay': 0.5
               }

test/unit/fixture/search_linguistic_viewport.js

@@ -46,7 +46,7 @@ module.exports = {
                       'lat': 29.49136,
                       'lon': -82.50622
                     },
-                    'offset': '1km',
+                    'offset': '0km',
                     'scale': '50km',
                     'decay': 0.5
                   }

test/unit/fixture/search_linguistic_viewport_min_diagonal.js

@@ -48,7 +48,7 @@ module.exports = {
                           'lat': 28.49136,
                           'lon': -87.50623
                         },
-                        'offset': '1km',
+                        'offset': '0km',
                         'scale': '1km',
                         'decay': 0.5
                       }