From c63226cd267f99b71c3ff9a7aa477c0f70365947 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 18 Dec 2017 19:51:55 +0100 Subject: [PATCH] Improve function naming --- lib/cartodb/models/aggregation/aggregation-mapconfig.js | 4 ++-- lib/cartodb/models/aggregation/aggregation-validator.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/cartodb/models/aggregation/aggregation-mapconfig.js b/lib/cartodb/models/aggregation/aggregation-mapconfig.js index a22e8316..f68417ef 100644 --- a/lib/cartodb/models/aggregation/aggregation-mapconfig.js +++ b/lib/cartodb/models/aggregation/aggregation-mapconfig.js @@ -2,7 +2,7 @@ const MapConfig = require('windshaft').model.MapConfig; const aggregationQuery = require('./aggregation-query'); const aggregationValidator = require('./aggregation-validator'); const { - createNumberValidator, + createPositiveNumberValidator, createIncludesValueValidator } = aggregationValidator; @@ -41,7 +41,7 @@ module.exports = class AggregationMapConfig extends MapConfig { super(config, datasource); const validate = aggregationValidator(this); - const numberValidator = createNumberValidator(this); + const numberValidator = createPositiveNumberValidator(this); const includesValidPlacementsValidator = createIncludesValueValidator(this, AggregationMapConfig.PLACEMENTS); validate('resolution', numberValidator); diff --git a/lib/cartodb/models/aggregation/aggregation-validator.js b/lib/cartodb/models/aggregation/aggregation-validator.js index db3eb629..2dcc4ad7 100644 --- a/lib/cartodb/models/aggregation/aggregation-validator.js +++ b/lib/cartodb/models/aggregation/aggregation-validator.js @@ -30,9 +30,9 @@ module.exports.createIncludesValueValidator = function (mapconfig, validValues) }; }; -module.exports.createNumberValidator = function (mapconfig) { - return function validateNumber (prop, key, index) { - if (!Number.isFinite(prop) || prop <= 0) { +module.exports.createPositiveNumberValidator = function (mapconfig) { + return function validatePositiveNumber (prop, key, index) { + if (!Number.isFinite(prop) || prop <= 0) { const error = new Error(`Invalid ${key}, should be a number greather than 0`); error.type = 'layer'; error.layer = {