pelias
/
api
mirror of https://github.com/pelias/api.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Merge branch 'refactor/flat-clean-object'

pull/275/merge
Julian Simioni 9 years ago
parent
aa361e68c4 f3acf3b308
commit
4ad640c7a4
17 changed files with 292 additions and 128 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      query/autocomplete.js
  2. 18
      query/reverse.js
  3. 14
      query/search.js
  4. 6
      sanitiser/_geo_common.js
  5. 10
      sanitiser/_geo_reverse.js
  6. 5
      sanitiser/_geo_search.js
  7. 1
      sanitiser/_text.js
  8. 63
      test/unit/fixture/autocomplete_linguistic_focus_null_island.js
  9. 45
      test/unit/fixture/reverse_null_island.js
  10. 63
      test/unit/fixture/search_linguistic_focus_null_island.js
  11. 18
      test/unit/query/autocomplete.js
  12. 34
      test/unit/query/reverse.js
  13. 21
      test/unit/query/search.js
  14. 9
      test/unit/sanitiser/_geo_common.js
  15. 24
      test/unit/sanitiser/_text.js
  16. 22
      test/unit/sanitiser/reverse.js
  17. 56
      test/unit/sanitiser/search.js

9
query/autocomplete.js
Unescape View File

@ -1,6 +1,7 @@
var peliasQuery = require('pelias-query'),
defaults = require('./defaults');
defaults = require('./defaults'),
check = require('check-types');
//------------------------------
// autocomplete query
@ -31,10 +32,10 @@ function generateQuery( clean ){
vs.var( 'size', 10 );
// focus point
if( clean.lat && clean.lon ){
if( check.number(clean['focus.point.lat']) && check.number(clean['focus.point.lon']) ){
vs.set({
'focus:point:lat': clean.lat,
'focus:point:lon': clean.lon
'focus:point:lat': clean['focus.point.lat'],
'focus:point:lon': clean['focus.point.lon']
});
}

18
query/reverse.js
Unescape View File

@ -1,6 +1,6 @@
var peliasQuery = require('pelias-query'),
defaults = require('./defaults');
defaults = require('./defaults'),
check = require('check-types');
//------------------------------
// reverse geocode query
@ -34,20 +34,20 @@ function generateQuery( clean ){
// set radius, default to 500km if not specified in request
var radius = 500;
if (clean.hasOwnProperty('boundary_circle_radius')) {
radius = clean.boundary_circle_radius;
if (clean.hasOwnProperty('boundary.circle.radius')) {
radius = clean['boundary.circle.radius'];
}
// focus point centroid
if( clean.lat && clean.lon ){
if( check.number(clean['point.lat']) && check.number(clean['point.lon']) ){
vs.set({
// focus point to score by distance
'focus:point:lat': clean.lat,
'focus:point:lon': clean.lon,
'focus:point:lat': clean['point.lat'],
'focus:point:lon': clean['point.lon'],
// bounding circle
'boundary:circle:lat': clean.lat,
'boundary:circle:lon': clean.lon,
'boundary:circle:lat': clean['point.lat'],
'boundary:circle:lon': clean['point.lon'],
'boundary:circle:radius': radius + 'km'
});
}

14
query/search.js
Unescape View File

@ -1,7 +1,7 @@
var peliasQuery = require('pelias-query'),
defaults = require('./defaults'),
textParser = require('./text_parser');
textParser = require('./text_parser'),
check = require('check-types');
//------------------------------
// general-purpose search query
@ -59,10 +59,10 @@ function generateQuery( clean ){
}
// focus point
if( clean.lat && clean.lon ){
if( check.number(clean['focus.point.lat']) && check.number(clean['focus.point.lon']) ){
vs.set({
'focus:point:lat': clean.lat,
'focus:point:lon': clean.lon
'focus:point:lat': clean['focus.point.lat'],
'focus:point:lon': clean['focus.point.lon']
});
}
@ -98,9 +98,9 @@ function generateQuery( clean ){
}
// boundary country
if( clean.boundary && clean.boundary.country ){
if( clean['boundary.country'] ){
vs.set({
'boundary:country': clean.boundary.country
'boundary:country': clean['boundary.country']
});
}

6
sanitiser/_geo_common.js
Unescape View File

@ -64,9 +64,9 @@ function sanitize_coord( coord, clean, param, latlon_is_required ) {
*/
function sanitize_boundary_circle( clean, params, is_required, all_required ) {
var props = {
lat: 'boundary_circle_lat',
lon: 'boundary_circle_lon',
rad: 'boundary_circle_radius'
lat: 'boundary.circle.lat',
lon: 'boundary.circle.lon',
rad: 'boundary.circle.radius'
};
// get values for each property

10
sanitiser/_geo_reverse.js
Unescape View File

@ -11,14 +11,14 @@ module.exports = function sanitize( raw, clean ){
var messages = { errors: [], warnings: [] };
try {
geo_common.sanitize_coord( 'lat', clean, raw['point.lat'], LAT_LON_IS_REQUIRED );
geo_common.sanitize_coord( 'lon', clean, raw['point.lon'], LAT_LON_IS_REQUIRED );
geo_common.sanitize_coord( 'point.lat', clean, raw['point.lat'], LAT_LON_IS_REQUIRED );
geo_common.sanitize_coord( 'point.lon', clean, raw['point.lon'], LAT_LON_IS_REQUIRED );
// remove both if only one is set
// @todo: clean this up!
if( !clean.hasOwnProperty('lat') || !clean.hasOwnProperty('lon') ){
delete clean.lat;
delete clean.lon;
if( !clean.hasOwnProperty('point.lat') || !clean.hasOwnProperty('point.lon') ){
delete clean['point.lat'];
delete clean['point.lon'];
}
// boundary.circle.* is not mandatory, and only specifying radius is fine,

5
sanitiser/_geo_search.js
Unescape View File

@ -1,4 +1,3 @@
var geo_common = require ('./_geo_common');
var LAT_LON_IS_REQUIRED = false;
@ -9,8 +8,8 @@ module.exports = function sanitize( raw, clean ){
var messages = { errors: [], warnings: [] };
try {
geo_common.sanitize_coord( 'lat', clean, raw['focus.point.lat'], LAT_LON_IS_REQUIRED );
geo_common.sanitize_coord( 'lon', clean, raw['focus.point.lon'], LAT_LON_IS_REQUIRED );
geo_common.sanitize_coord( 'focus.point.lat', clean, raw['focus.point.lat'], LAT_LON_IS_REQUIRED );
geo_common.sanitize_coord( 'focus.point.lon', clean, raw['focus.point.lon'], LAT_LON_IS_REQUIRED );
geo_common.sanitize_bbox(raw, clean);
}
catch (err) {

1
sanitiser/_text.js
Unescape View File

@ -1,4 +1,3 @@
var check = require('check-types'),
query_parser = require('../helper/query_parser');

63
test/unit/fixture/autocomplete_linguistic_focus_null_island.js
Unescape View File

@ -0,0 +1,63 @@
module.exports = {
'query': {
'filtered': {
'query': {
'bool': {
'must': [{
'match': {
'name.default': {
'query': 'test',
'boost': 1,
'analyzer': 'peliasOneEdgeGram'
}
}
}],
'should': [{
'match': {
'phrase.default': {
'query': 'test',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'boost': 1,
'slop': 2
}
}
}, {
'function_score': {
'query': {
'match': {
'phrase.default': {
'analyzer': 'peliasPhrase',
'type': 'phrase',
'boost': 1,
'slop': 2,
'query': 'test'
}
}
},
'functions': [{
'linear': {
'center_point': {
'origin': {
'lat': 0,
'lon': 0
},
'offset': '1km',
'scale': '50km',
'decay': 0.5
}
}
}],
'score_mode': 'avg',
'boost_mode': 'replace'
}
}]
}
}
}
},
'sort': [ '_score' ],
'size': 10,
'track_scores': true
};

45
test/unit/fixture/reverse_null_island.js
Unescape View File

@ -0,0 +1,45 @@
module.exports = {
'query': {
'filtered': {
'query': {
'bool': {
'must': []
}
},
'filter': {
'bool': {
'must': [
{
'geo_distance': {
'distance': '500km',
'distance_type': 'plane',
'optimize_bbox': 'indexed',
'_cache': true,
'center_point': {
'lat': 0,
'lon': 0
}
}
}
]
}
}
}
},
'sort': [
'_score',
{
'_geo_distance': {
'center_point': {
'lat': 0,
'lon': 0
},
'order': 'asc',
'distance_type': 'plane'
}
}
],
'size': 1,
'track_scores': true
};

63
test/unit/fixture/search_linguistic_focus_null_island.js
Unescape View File

@ -0,0 +1,63 @@
module.exports = {
'query': {
'filtered': {
'query': {
'bool': {
'must': [{
'match': {
'name.default': {
'query': 'test',
'boost': 1,
'analyzer': 'peliasOneEdgeGram'
}
}
}],
'should': [{
'match': {
'phrase.default': {
'query': 'test',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'boost': 1,
'slop': 2
}
}
}, {
'function_score': {
'query': {
'match': {
'phrase.default': {
'analyzer': 'peliasPhrase',
'type': 'phrase',
'boost': 1,
'slop': 2,
'query': 'test'
}
}
},
'functions': [{
'linear': {
'center_point': {
'origin': {
'lat': 0,
'lon': 0
},
'offset': '1km',
'scale': '50km',
'decay': 0.5
}
}
}],
'score_mode': 'avg',
'boost_mode': 'replace'
}
}]
}
}
}
},
'sort': [ '_sort' ],
'size': 10,
'track_scores': true
};

18
test/unit/query/autocomplete.js
Unescape View File

@ -27,8 +27,8 @@ module.exports.tests.query = function(test, common) {
test('autocomplete + focus', function(t) {
var query = generate({
text: 'test',
lat: 29.49136,
lon: -82.50622
'focus.point.lat': 29.49136,
'focus.point.lon': -82.50622
});
var compiled = JSON.parse( JSON.stringify( query ) );
@ -37,6 +37,20 @@ module.exports.tests.query = function(test, common) {
t.deepEqual(compiled, expected, 'valid autocomplete query');
t.end();
});
test('autocomplete + focus on null island', function(t) {
var query = generate({
text: 'test',
'focus.point.lat': 0,
'focus.point.lon': 0
});
var compiled = JSON.parse( JSON.stringify( query ) );
var expected = require('../fixture/autocomplete_linguistic_focus_null_island');
t.deepEqual(compiled, expected, 'valid autocomplete query');
t.end();
});
};
module.exports.all = function (tape, common) {

34
test/unit/query/reverse.js
Unescape View File

@ -12,7 +12,7 @@ module.exports.tests.interface = function(test, common) {
module.exports.tests.query = function(test, common) {
test('valid query', function(t) {
var query = generate({
lat: 29.49136, lon: -82.50622
'point.lat': 29.49136, 'point.lon': -82.50622
});
var compiled = JSON.parse( JSON.stringify( query ) );
@ -21,9 +21,22 @@ module.exports.tests.query = function(test, common) {
t.deepEqual(compiled, expected, 'valid reverse query');
t.end();
});
test('valid query', function(t) {
var query = generate({
'point.lat': 0, 'point.lon': 0
});
var compiled = JSON.parse( JSON.stringify( query ) );
var expected = require('../fixture/reverse_null_island');
t.deepEqual(compiled, expected, 'valid reverse query');
t.end();
});
test('valid query with radius', function(t) {
var query = generate({
lat: 29.49136, lon: -82.50622, boundary_circle_radius: 123
'point.lat': 29.49136, 'point.lon': -82.50622, 'boundary.circle.radius': 123
});
var compiled = JSON.parse( JSON.stringify( query )).query.filtered.filter.bool.must[0].geo_distance.distance;
@ -32,27 +45,29 @@ module.exports.tests.query = function(test, common) {
t.deepEqual(compiled, expected, 'distance set to boundary circle radius');
t.end();
});
test('valid query with boundary.circle lat/lon/radius', function(t) {
var clean = {
lat: 29.49136,
lon: -82.50622,
boundary_circle_lat: 111,
boundary_circle_long: 333
'point.lat': 29.49136,
'point.lon': -82.50622,
'boundary.circle.lat': 111,
'boundary.circle.long': 333
};
var query = generate(clean);
var compiled = JSON.parse( JSON.stringify( query )).query.filtered.filter.bool.must[0].geo_distance.center_point;
var expected = { lat: clean.lat, lon: clean.lon };
var expected = { lat: clean['point.lat'], lon: clean['point.lon'] };
t.deepEqual(compiled, expected, 'point.lat/lon overrides boundary.circle.lat/lon');
t.end();
});
test('size fuzz test', function(t) {
// test different sizes
var sizes = [1,2,10,undefined,null];
sizes.forEach( function( size ){
var query = generate({
lat: 29.49136, lon: -82.50622, size: size
'point.lat': 29.49136, 'point.lon': -82.50622, size: size
});
var compiled = JSON.parse( JSON.stringify( query ) );
@ -63,7 +78,7 @@ module.exports.tests.query = function(test, common) {
test('valid boundary.country reverse search', function(t) {
var query = generate({
lat: 29.49136, lon: -82.50622,
'point.lat': 29.49136, 'point.lon': -82.50622,
boundary: { country: 'ABC' }
});
@ -73,7 +88,6 @@ module.exports.tests.query = function(test, common) {
t.deepEqual(compiled, expected, 'valid reverse query with boundary.country');
t.end();
});
};
module.exports.all = function (tape, common) {

21
test/unit/query/search.js
Unescape View File

@ -16,7 +16,7 @@ module.exports.tests.query = function(test, common) {
test('valid search + focus + bbox', function(t) {
var query = generate({
text: 'test', size: 10,
lat: 29.49136, lon: -82.50622,
'focus.point.lat': 29.49136, 'focus.point.lon': -82.50622,
bbox: {
top: 47.47,
right: -61.84,
@ -71,7 +71,7 @@ module.exports.tests.query = function(test, common) {
test('search search + focus', function(t) {
var query = generate({
text: 'test', size: 10,
lat: 29.49136, lon: -82.50622,
'focus.point.lat': 29.49136, 'focus.point.lon': -82.50622,
layers: ['test']
});
@ -83,6 +83,21 @@ module.exports.tests.query = function(test, common) {
t.end();
});
test('search search + focus on null island', function(t) {
var query = generate({
text: 'test', size: 10,
'focus.point.lat': 0, 'focus.point.lon': 0,
layers: ['test']
});
var compiled = JSON.parse( JSON.stringify( query ) );
var expected = require('../fixture/search_linguistic_focus_null_island');
expected.sort = sort;
t.deepEqual(compiled, expected, 'valid search query');
t.end();
});
test('valid query with a full valid address', function(t) {
var address = '123 main st new york ny 10010 US';
var query = generate({ text: address,
@ -138,7 +153,7 @@ module.exports.tests.query = function(test, common) {
var query = generate({
text: 'test', size: 10,
layers: ['test'],
boundary: { country: 'ABC' }
'boundary.country': 'ABC'
});
var compiled = JSON.parse( JSON.stringify( query ) );

9
test/unit/sanitiser/_geo_common.js
Unescape View File

@ -23,11 +23,12 @@ module.exports.tests.sanitize = function(test, common) {
var all_required = true;
sanitize.sanitize_boundary_circle(clean, params, is_required, all_required);
t.equal(clean.boundary_circle_lat, params['boundary.circle.lat'], 'lat approved');
t.equal(clean.boundary_circle_lon, params['boundary.circle.lon'], 'lon approved');
t.equal(clean.boundary_circle_radius, params['boundary.circle.radius'], 'radius approved');
t.equal(clean['boundary.circle.lat'], params['boundary.circle.lat'], 'lat approved');
t.equal(clean['boundary.circle.lon'], params['boundary.circle.lon'], 'lon approved');
t.equal(clean['boundary.circle.radius'], params['boundary.circle.radius'], 'radius approved');
t.end();
});
test('valid circle, radius only, all not required', function (t) {
var clean = {};
var params = {
@ -37,7 +38,7 @@ module.exports.tests.sanitize = function(test, common) {
var all_required = false;
sanitize.sanitize_boundary_circle(clean, params, is_required, all_required);
t.equal(clean.boundary_circle_radius, params['boundary.circle.radius'], 'radius approved');
t.equal(clean['boundary.circle.radius'], params['boundary.circle.radius'], 'radius approved');
t.end();
});
};

24
test/unit/sanitiser/_text.js
Unescape View File

@ -1,24 +0,0 @@
var text = require('../../../sanitiser/_text'),
parser = require('../../../helper/query_parser'),
allLayers = [ 'geoname', 'osmnode', 'osmway', 'admin0', 'admin1', 'admin2', 'neighborhood',
'locality', 'local_admin', 'osmaddress', 'openaddresses' ],
defaultParsed= { },
defaultClean = { text: 'test',
layers: allLayers,
size: 10,
parsed_text: defaultParsed,
lat:0,
lon:0
},
getTargetLayers = function(query) {
var address = parser.get_parsed_address(query);
return address.target_layer;
};
module.exports = {
defaultParsed: defaultParsed,
defaultClean : defaultClean,
getTargetLayers: getTargetLayers
};

22
test/unit/sanitiser/reverse.js
Unescape View File

@ -5,10 +5,10 @@ var reverse = require('../../../sanitiser/reverse'),
sanitize = reverse.sanitize,
middleware = reverse.middleware,
defaultError = 'missing param \'lat\'',
defaultClean = { lat:0,
defaultClean = { 'point.lat': 0,
types: {
},
lon: 0,
'point.lon': 0,
size: 10,
private: false,
boundary: { }
@ -51,7 +51,7 @@ module.exports.tests.sanitize_lat = function(test, common) {
lats.invalid.forEach( function( lat ){
var req = { query: { 'point.lat': lat, 'point.lon': 0 } };
sanitize(req, function(){
t.equal(req.errors[0], 'invalid param \'lat\': must be >-90 and <90', lat + ' is an invalid latitude');
t.equal(req.errors[0], 'invalid param \'point.lat\': must be >-90 and <90', lat + ' is an invalid latitude');
t.deepEqual(req.clean, emptyClean, 'clean only has default values set');
});
});
@ -61,10 +61,9 @@ module.exports.tests.sanitize_lat = function(test, common) {
lats.valid.forEach( function( lat ){
var req = { query: { 'point.lat': lat, 'point.lon': 0 } };
sanitize(req, function(){
var expected = JSON.parse(JSON.stringify( defaultClean ));
expected.lat = parseFloat( lat );
var expected_lat = parseFloat( lat );
t.deepEqual(req.errors, [], 'no errors');
t.equal(req.clean.lat, parseFloat(lat), 'clean set correctly (' + lat + ')');
t.equal(req.clean['point.lat'], expected_lat, 'clean set correctly (' + lat + ')');
});
});
t.end();
@ -73,7 +72,7 @@ module.exports.tests.sanitize_lat = function(test, common) {
lats.missing.forEach( function( lat ){
var req = { query: { 'point.lat': lat, 'point.lon': 0 } };
sanitize(req, function(){
t.equal(req.errors[0], 'missing param \'lat\'', 'latitude is a required field');
t.equal(req.errors[0], 'missing param \'point.lat\'', 'latitude is a required field');
t.deepEqual(req.clean, emptyClean, 'clean only has default values set');
});
});
@ -90,10 +89,9 @@ module.exports.tests.sanitize_lon = function(test, common) {
lons.valid.forEach( function( lon ){
var req = { query: { 'point.lat': 0, 'point.lon': lon } };
sanitize(req, function(){
var expected = JSON.parse(JSON.stringify( defaultClean ));
expected.lon = parseFloat( lon );
var expected_lon = parseFloat( lon );
t.deepEqual(req.errors, [], 'no errors');
t.equal(req.clean.lon, parseFloat(lon), 'clean set correctly (' + lon + ')');
t.equal(req.clean['point.lon'], expected_lon, 'clean set correctly (' + lon + ')');
});
});
t.end();
@ -103,9 +101,9 @@ module.exports.tests.sanitize_lon = function(test, common) {
var req = { query: { 'point.lat': 0, 'point.lon': lon } };
// @todo: why is lat set?
var expected = { boundary: {}, lat: 0, private: false, size: 10, types: {} };
var expected = { boundary: {}, 'point.lat': 0, private: false, size: 10, types: {} };
sanitize(req, function(){
t.equal(req.errors[0], 'missing param \'lon\'', 'longitude is a required field');
t.equal(req.errors[0], 'missing param \'point.lon\'', 'longitude is a required field');
t.deepEqual(req.clean, expected, 'clean only has default values set');
});
});

56
test/unit/sanitiser/search.js
Unescape View File

@ -1,18 +1,8 @@
var search = require('../../../sanitiser/search'),
_text = require('../sanitiser/_text'),
parser = require('../../../helper/query_parser'),
defaultParsed = _text.defaultParsed,
sanitize = search.sanitize,
middleware = search.middleware,
defaultError = 'invalid param \'text\': text length, must be >0',
defaultClean = { text: 'test',
types: {
},
size: 10,
parsed_text: defaultParsed,
};
defaultError = 'invalid param \'text\': text length, must be >0';
// these are the default values you would expect when no input params are specified.
// @todo: why is this different from $defaultClean?
var emptyClean = { boundary: {}, private: false, size: 10, types: {} };
@ -86,13 +76,13 @@ module.exports.tests.sanitize_text_with_delim = function(test, common) {
test('valid texts with a comma', function(t) {
texts.forEach( function( text ){
var req = { query: { text: text } };
sanitize(req, function(){
var expected = JSON.parse(JSON.stringify( defaultClean ));
expected.text = text;
sanitize( req, function( ){
var expected_text = text;
expected.parsed_text = parser.get_parsed_address(text);
var expected_parsed_text = parser.get_parsed_address(text);
t.equal(req.errors[0], undefined, 'no error');
t.equal(req.clean.parsed_text.name, expected.parsed_text.name, 'clean name set correctly');
t.equal(req.clean.parsed_text.name, expected_parsed_text.name, 'clean name set correctly');
t.equal(req.clean.text, expected_text, 'text should match');
});
});
@ -131,27 +121,14 @@ module.exports.tests.sanitize_private_explicit_false_value = function(test, comm
};
module.exports.tests.sanitize_lat = function(test, common) {
var lats = {
invalid: [],
valid: [ 0, 45, 90, -0, '0', '45', '90', -181, -120, -91, 91, 120, 181 ]
};
test('invalid lat', function(t) {
lats.invalid.forEach( function( lat ){
var req = { query: { text: 'test', 'focus.point.lat': lat, 'focus.point.lon': 0 } };
sanitize(req, function(){
t.equal(req.errors[0], 'invalid param \'lat\': must be >-90 and <90', lat + ' is an invalid latitude');
t.deepEqual(req.clean, emptyClean, 'clean only has default values set');
});
});
t.end();
});
var valid_lats = [ 0, 45, 90, -0, '0', '45', '90', -181, -120, -91, 91, 120, 181 ];
test('valid lat', function(t) {
lats.valid.forEach( function( lat ){
valid_lats.forEach( function( lat ){
var req = { query: { text: 'test', 'focus.point.lat': lat, 'focus.point.lon': 0 } };
sanitize(req, function(){
var expected_lat = parseFloat( lat );
t.equal(req.errors[0], undefined, 'no error');
t.equal(req.clean.lat, expected_lat, 'clean lat set correctly (' + lat + ')');
t.equal(req.clean['focus.point.lat'], expected_lat, 'clean lat set correctly (' + lat + ')');
});
});
t.end();
@ -165,11 +142,10 @@ module.exports.tests.sanitize_lon = function(test, common) {
test('valid lon', function(t) {
lons.valid.forEach( function( lon ){
var req = { query: { text: 'test', 'focus.point.lat': 0, 'focus.point.lon': lon } };
sanitize(req, function(){
var expected = JSON.parse(JSON.stringify( defaultClean ));
expected.lon = parseFloat( lon );
sanitize( req, function(){
var expected_lon = parseFloat( lon );
t.equal(req.errors[0], undefined, 'no error');
t.equal(req.clean.lon, expected.lon, 'clean set correctly (' + lon + ')');
t.deepEqual(req.clean['focus.point.lon'], expected_lon, 'clean set correctly (' + lon + ')');
});
});
t.end();
@ -181,8 +157,8 @@ module.exports.tests.sanitize_optional_geo = function(test, common) {
var req = { query: { text: 'test' } };
sanitize(req, function(){
t.equal(req.errors[0], undefined, 'no error');
t.equal(req.clean.lat, undefined, 'clean set without lat');
t.equal(req.clean.lon, undefined, 'clean set without lon');
t.equal(req.clean['focus.point.lat'], undefined, 'clean set without lat');
t.equal(req.clean['focus.point.lon'], undefined, 'clean set without lon');
});
t.end();
});
@ -191,7 +167,7 @@ module.exports.tests.sanitize_optional_geo = function(test, common) {
sanitize(req, function(){
var expected_lon = 0;
t.equal(req.errors[0], undefined, 'no error');
t.deepEqual(req.clean.lon, expected_lon, 'clean set correctly (without any lat)');
t.deepEqual(req.clean['focus.point.lon'], expected_lon, 'clean set correctly (without any lat)');
});
t.end();
});
@ -200,7 +176,7 @@ module.exports.tests.sanitize_optional_geo = function(test, common) {
sanitize(req, function(){
var expected_lat = 0;
t.equal(req.errors[0], undefined, 'no error');
t.deepEqual(req.clean.lat, expected_lat, 'clean set correctly (without any lon)');
t.deepEqual(req.clean['focus.point.lat'], expected_lat, 'clean set correctly (without any lon)');
});
t.end();
});

Write Preview
Loading…
Cancel
Save