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

Move validation to the constructor

Browse Source
This commit is contained in:
Daniel García Aubert
2017-12-18 19:19:02 +01:00
parent fb03cd3424
commit e2bd97eea6
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,13 @@ module.exports = class AggregationMapConfig extends MapConfig {
constructor (config, datasource) {
super(config, datasource);
this.validate();
const validate = aggregationValidator(this);
const numberValidator = createNumberValidator(this);
const includesValidPlacementsValidator = createIncludesValueValidator(this, AggregationMapConfig.PLACEMENTS);
validate('resolution', numberValidator);
validate('placement', includesValidPlacementsValidator);
validate('threshold', numberValidator);
}
getAggregatedQuery (index) {
@@ -112,13 +118,4 @@ module.exports = class AggregationMapConfig extends MapConfig {
return featureCount >= threshold;
}
validate () {
const validate = aggregationValidator(this);
const numberValidator = createNumberValidator(this);
const includesValidPlacementsValidator = createIncludesValueValidator(this, AggregationMapConfig.PLACEMENTS);
validate('resolution', numberValidator);
validate('placement', includesValidPlacementsValidator);
validate('threshold', numberValidator);
}
};