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

Use aggregation-mapconfig's method to discover columns to be exposed used to aggregate

Browse Source
This commit is contained in:
Daniel García Aubert 2017-12-28 13:12:41 +01:00
parent d42257127b
commit 9a1bc51fdb
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,18 +101,13 @@ module.exports = class AggregationMapConfigAdapter {
aggregationSql = sqlQueryWrap.replace(/<%=\s*sql\s*%>/g, aggregationSql); aggregationSql = sqlQueryWrap.replace(/<%=\s*sql\s*%>/g, aggregationSql);
} }
if (!mapConfig.isDefaultLayerAggregation(index)) {
layer.options.sql = aggregationSql; layer.options.sql = aggregationSql;
return resolve({ layer, index, adapted: shouldAdapt });
}
const skipGeoms = true; mapConfig.getLayerAggregationColumns(index, (err, columns) => {
mapConfig.getLayerColumns(index, skipGeoms, (err, columns) => {
if (err) { if (err) {
return reject(err); return reject(err);
} }
layer.options.sql = aggregationSql;
layer.options.columns = columns; layer.options.columns = columns;
return resolve({ layer, index, adapted: shouldAdapt }); return resolve({ layer, index, adapted: shouldAdapt });