Merge pull request #551 from pelias/master

Merge master into staging

query/reverse_defaults.js

@@ -12,7 +12,8 @@ module.exports = _.merge({}, peliasQuery.defaults, {
   'sort:distance:order': 'asc',
   'sort:distance:distance_type': 'plane',
 
-  'boundary:circle:radius': '500km',
+  'boundary:circle:radius': '1km',
+  'boundary:circle:radius:coarse': '500km',
   'boundary:circle:distance_type': 'plane',
   'boundary:circle:optimize_bbox': 'indexed',
   'boundary:circle:_cache': true,

sanitiser/_geo_reverse.js

@@ -1,4 +1,3 @@
-
 var geo_common = require ('./_geo_common');
 var _ = require('lodash');
 var defaults = require('../query/reverse_defaults');
@@ -30,8 +29,13 @@ module.exports = function sanitize( raw, clean ){
 
     // if no radius was passed, set the default
     if ( _.isUndefined( raw['boundary.circle.radius'] ) ) {
+      // the default is small unless layers other than venue or address were explicitly specified
+      if (clean.layers && clean.layers.length > 0 && !_.includes(clean.layers, 'venue') && !_.includes(clean.layers, 'address')) {
+        raw['boundary.circle.radius'] = defaults['boundary:circle:radius:coarse'];
+      } else {
         raw['boundary.circle.radius'] = defaults['boundary:circle:radius'];
       }
+    }
 
     // santize the boundary.circle
     geo_common.sanitize_circle( 'boundary.circle', clean, raw, CIRCLE_IS_REQUIRED );

test/unit/sanitiser/_geo_reverse.js

@@ -72,7 +72,7 @@ module.exports.tests.sanitize_boundary_country = function(test, common) {
     t.end();
   });
 
-  test('no boundary.circle.radius supplied should be set to default', function(t) {
+  test('no boundary.circle.radius and no layers supplied should be set to default', function(t) {
     var raw = {
       'point.lat': '12.121212',
       'point.lon': '21.212121'
@@ -83,7 +83,32 @@ module.exports.tests.sanitize_boundary_country = function(test, common) {
     t.equals(raw['boundary.circle.radius'], defaults['boundary:circle:radius'], 'should be from defaults');
     t.equals(clean['boundary.circle.radius'], parseFloat(defaults['boundary:circle:radius']), 'should be same as raw');
     t.end();
+  });
+
+  test('no boundary.circle.radius and coarse layers supplied should be set to coarse default', function(t) {
+    var raw = {
+      'point.lat': '12.121212',
+      'point.lon': '21.212121'
+    };
+    var clean = { layers: 'coarse' };
+    var errorsAndWarnings = sanitize(raw, clean);
 
+    t.equals(raw['boundary.circle.radius'], defaults['boundary:circle:radius:coarse'], 'should be from defaults');
+    t.equals(clean['boundary.circle.radius'], parseFloat(defaults['boundary:circle:radius:coarse']), 'should be same as raw');
+    t.end();
+  });
+
+  test('no boundary.circle.radius and coarse layer supplied should be set to coarse default', function(t) {
+    var raw = {
+      'point.lat': '12.121212',
+      'point.lon': '21.212121'
+    };
+    var clean = { layers: 'locality' };
+    var errorsAndWarnings = sanitize(raw, clean);
+
+    t.equals(raw['boundary.circle.radius'], defaults['boundary:circle:radius:coarse'], 'should be from defaults');
+    t.equals(clean['boundary.circle.radius'], parseFloat(defaults['boundary:circle:radius:coarse']), 'should be same as raw');
+    t.end();
   });
 
   test('explicit boundary.circle.radius should be used instead of default', function(t) {
@@ -98,9 +123,7 @@ module.exports.tests.sanitize_boundary_country = function(test, common) {
     t.equals(raw['boundary.circle.radius'], '3248732857km', 'should be parsed float');
     t.equals(clean['boundary.circle.radius'], 3248732857.0, 'should be copied from raw');
     t.end();
-
   });
-
 };
 
 module.exports.all = function (tape, common) {

test/unit/sanitiser/_private.js

@@ -1,53 +0,0 @@
-var sanitize = require('../../../sanitiser/_private');
-
-module.exports.tests = {};
-
-module.exports.tests.sanitize_private = function(test, common) {
-  var invalid_values = [null, -1, 123, NaN, 'abc'];
-  invalid_values.forEach(function(privateValue) {
-    test('invalid private param ' + privateValue, function(t) {
-      var req = {query: { private: privateValue }};
-      sanitize(req);
-      t.equal(req.clean.private, false, 'default private set (to false)');
-      t.end();
-    });
-  });
-
-  var valid_values = ['true', true, 1, '1', 'yes', 'y'];
-  valid_values.forEach(function(privateValue) {
-    test('valid private param ' + privateValue, function(t) {
-      var req = {query: { private: privateValue }};
-      sanitize(req);
-      t.equal(req.clean.private, true, 'private set to true');
-      t.end();
-    });
-  });
-
-  var valid_false_values = ['false', false, 0, '0', 'no', 'n'];
-  valid_false_values.forEach(function(privateValue) {
-    test('test setting false explicitly ' + privateValue, function(t) {
-      var req = {query: { private: privateValue }};
-      sanitize(req);
-      t.equal(req.clean.private, false, 'private set to false');
-      t.end();
-    });
-  });
-
-  test('test default behavior', function(t) {
-    var req = {query: {}};
-    sanitize(req);
-    t.equal(req.clean.private, true, 'private set to true');
-    t.end();
-  });
-};
-
-module.exports.all = function (tape, common) {
-
-  function test(name, testFunction) {
-    return tape('SANTIZE _private ' + name, testFunction);
-  }
-
-  for( var testCase in module.exports.tests ){
-    module.exports.tests[testCase](test, common);
-  }
-};