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

Lint fixes

Browse Source
This commit is contained in:
Javier Goizueta 2019-03-06 18:32:17 +01:00
parent 113b3728b1
commit c91b28ee92
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/cartodb/models/aggregation/aggregation-mapconfig.js
View File

@ -110,7 +110,9 @@ module.exports = class AggregationMapConfig extends MapConfig {
isAggregationLayer (index) { isAggregationLayer (index) {
let hasAggregation = this.hasLayerAggregation(index); let hasAggregation = this.hasLayerAggregation(index);
// for vector-only MapConfig are aggregated unless explicitly disabled // for vector-only MapConfig are aggregated unless explicitly disabled
return hasAggregation || (this.isVectorOnlyMapConfig() && hasAggregation !== AggregationMapConfig.HAS_AGGREGATION_DISABLED); return hasAggregation || (
this.isVectorOnlyMapConfig() && hasAggregation !== AggregationMapConfig.HAS_AGGREGATION_DISABLED
);
} }
isAggregationMapConfig () { isAggregationMapConfig () {
@ -140,8 +142,6 @@ module.exports = class AggregationMapConfig extends MapConfig {
return true; return true;
} }
return false; return false;
return aggregation !== undefined && (typeof aggregation === 'object' || typeof aggregation === 'boolean');
} }
getAggregation (index) { getAggregation (index) {