cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable bbox query string param

Browse Source
This commit is contained in:
Raul Ochoa
2015-10-29 16:25:56 +01:00
parent 8e568d0f20
commit 8a81828a3d
2 changed files with 66 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cartodb/controllers/base.js
+1
View File
@@ -11,6 +11,7 @@ var lzmaWorker = new LZMA();
var REQUEST_QUERY_PARAMS_WHITELIST = [
'config',
'filters',
'bbox',
'map_key',
'api_key',
'auth_token',
test/acceptance/widgets.js
+65 -26
View File
@@ -23,15 +23,15 @@ describe('widgets', function() {
helper.deleteRedisKeys(keysToDelete, done);
});
function getWidget(mapConfig, widgetName, filters, callback) {
function getWidget(mapConfig, widgetName, params, callback) {
if (!callback) {
callback = filters;
filters = null;
callback = params;
params = null;
}
var url = '/api/v1/map';
if (filters) {
url += '?' + qs.stringify({filters: JSON.stringify(filters)});
if (params && params.filters) {
url += '?' + qs.stringify({ filters: JSON.stringify(params.filters) });
}
var layergroupId;
@@ -76,9 +76,13 @@ describe('widgets', function() {
var next = this;
layergroupId = _layergroupId;
var url = '/api/v1/map/' + layergroupId + '/0/widget/' + widgetName;
if (params && params.bbox) {
url += '?' + qs.stringify({bbox: params.bbox});
}
assert.response(server,
{
url: '/api/v1/map/' + layergroupId + '/0/widget/' + widgetName,
url: url,
method: 'GET',
headers: {
host: 'localhost'
@@ -225,12 +229,14 @@ describe('widgets', function() {
});
it("should expose a filtered aggregation", function(done) {
var filters = {
layers: [
{country_places_count: {accept: ['CAN']}}
]
var params = {
filters: {
layers: [
{country_places_count: {accept: ['CAN']}}
]
}
};
getWidget(aggregationMapConfig, 'country_places_count', filters, function(err, res) {
getWidget(aggregationMapConfig, 'country_places_count', params, function(err, res) {
if (err) {
return done(err);
}
@@ -282,14 +288,16 @@ describe('widgets', function() {
});
it("should expose a filtered histogram", function(done) {
var filters = {
layers: [
{
country_places_histogram: { min: 4000000 }
}
]
var params = {
filters: {
layers: [
{
country_places_histogram: { min: 4000000 }
}
]
}
};
getWidget(histogramMapConfig, 'country_places_histogram', filters, function(err, res) {
getWidget(histogramMapConfig, 'country_places_histogram', params, function(err, res) {
if (err) {
return done(err);
}
@@ -334,15 +342,46 @@ describe('widgets', function() {
};
it("should expose a filtered aggregation", function(done) {
var filters = {
layers: [
{
country_places_count: { reject: ['CHN'] },
country_places_histogram: { min: 7000000 }
}
]
var params = {
filters: {
layers: [
{
country_places_count: { reject: ['CHN'] }
}
]
}
};
getWidget(combinedWidgetsMapConfig, 'country_places_count', filters, function(err, res) {
getWidget(combinedWidgetsMapConfig, 'country_places_count', params, function(err, res) {
if (err) {
return done(err);
}
var aggregation = JSON.parse(res.body);
// first one would be CHN if reject filter wasn't applied
assert.deepEqual(aggregation.categories[0], {"count":769,"adm0_a3":"USA"});
// confirm 'CHN' was filtered out (reject)
assert.equal(aggregation.categories.reduce(function(sum, row) {
return sum + (row.adm0_a3 === 'CHN' ? 1 : 0);
}, 0), 0);
done();
});
});
it("should expose a filtered aggregation", function(done) {
var params = {
filters: {
layers: [
{
country_places_count: { reject: ['CHN'] },
country_places_histogram: { min: 7000000 }
}
]
}
};
getWidget(combinedWidgetsMapConfig, 'country_places_count', params, function(err, res) {
if (err) {
return done(err);
}