Browse Source

disable viewport scale

pull/388/head
Peter Johnson 9 years ago
parent
commit
f1ead56e60
  1. 4
      query/search.js
  2. 2
      test/unit/fixture/search_linguistic_viewport.js
  3. 34
      test/unit/query/search.js

4
query/search.js

@ -73,8 +73,8 @@ function generateQuery( clean ){
// calculate the centroid from the viewport box // calculate the centroid from the viewport box
vs.set({ vs.set({
'focus:point:lat': clean['focus.viewport.min_lat'] + ( clean['focus.viewport.max_lat'] - clean['focus.viewport.min_lat'] ) / 2, 'focus:point:lat': clean['focus.viewport.min_lat'] + ( clean['focus.viewport.max_lat'] - clean['focus.viewport.min_lat'] ) / 2,
'focus:point:lon': clean['focus.viewport.min_lon'] + ( clean['focus.viewport.max_lon'] - clean['focus.viewport.min_lon'] ) / 2, 'focus:point:lon': clean['focus.viewport.min_lon'] + ( clean['focus.viewport.max_lon'] - clean['focus.viewport.min_lon'] ) / 2
'focus:scale': calculateDiagonalDistance(clean) + 'km' //, 'focus:scale': calculateDiagonalDistance(clean) + 'km'
}); });
} }

2
test/unit/fixture/search_linguistic_viewport.js

@ -49,7 +49,7 @@ module.exports = {
'lon': -82.50622 'lon': -82.50622
}, },
'offset': '1km', 'offset': '1km',
'scale': '994km', 'scale': '50km',
'decay': 0.5 'decay': 0.5
} }
} }

34
test/unit/query/search.js

@ -90,22 +90,24 @@ module.exports.tests.query = function(test, common) {
t.end(); t.end();
}); });
test('search with viewport diagonal < 1km should set scale to 1km', function(t) { // viewport scale sizing currently diabled.
var query = generate({ // ref: https://github.com/pelias/api/pull/388
text: 'test', querySize: 10, // test('search with viewport diagonal < 1km should set scale to 1km', function(t) {
'focus.viewport.min_lat': 28.49135, // var query = generate({
'focus.viewport.max_lat': 28.49137, // text: 'test', querySize: 10,
'focus.viewport.min_lon': -87.50622, // 'focus.viewport.min_lat': 28.49135,
'focus.viewport.max_lon': -87.50624, // 'focus.viewport.max_lat': 28.49137,
layers: ['test'] // 'focus.viewport.min_lon': -87.50622,
}); // 'focus.viewport.max_lon': -87.50624,
// layers: ['test']
var compiled = JSON.parse( JSON.stringify( query ) ); // });
var expected = require('../fixture/search_linguistic_viewport_min_diagonal'); //
// var compiled = JSON.parse( JSON.stringify( query ) );
t.deepEqual(compiled, expected, 'valid search query'); // var expected = require('../fixture/search_linguistic_viewport_min_diagonal');
t.end(); //
}); // t.deepEqual(compiled, expected, 'valid search query');
// t.end();
// });
test('search search + focus on null island', function(t) { test('search search + focus on null island', function(t) {
var query = generate({ var query = generate({

Loading…
Cancel
Save