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

Check if query retrieves results

Browse Source
This commit is contained in:
Daniel García Aubert 2017-12-12 12:53:29 +01:00
parent 869f2ac322
commit 0b27d174ef
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
View File

@ -172,7 +172,8 @@ module.exports = class AggregationMapConfigAdapter {
return callback(null, shouldAdapt); return callback(null, shouldAdapt);
} }
const estimatedFeatureCount = res.rows[0].count; const result = res.rows[0] || {};
const estimatedFeatureCount = result.count;
const threshold = layer.options.aggregation && layer.options.aggregation.threshold ? const threshold = layer.options.aggregation && layer.options.aggregation.threshold ?
layer.options.aggregation.threshold : layer.options.aggregation.threshold :
@ -182,7 +183,7 @@ module.exports = class AggregationMapConfigAdapter {
return callback(null, shouldAdapt); return callback(null, shouldAdapt);
} }
const geometryType = res.rows[0].type; const geometryType = result.type;
if (geometryType !== 'ST_Point') { if (geometryType !== 'ST_Point') {
return callback(new Error(unsupportedGeometryTypeErrorMessage({ geometryType }))); return callback(new Error(unsupportedGeometryTypeErrorMessage({ geometryType })));