From 49a60caffcf6d94b615211cd32e5263bf937b890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 6 Sep 2017 15:42:29 +0200 Subject: [PATCH] Move getBinEnd function to a class method --- lib/cartodb/models/dataview/histogram.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/cartodb/models/dataview/histogram.js b/lib/cartodb/models/dataview/histogram.js index 6a5081c1..01b62148 100644 --- a/lib/cartodb/models/dataview/histogram.js +++ b/lib/cartodb/models/dataview/histogram.js @@ -380,7 +380,7 @@ module.exports = class Histogram extends BaseWidget { _query: _query, _column: _column, _start: this.getBinStart(override), - _end: getBinEnd(override) + _end: this.getBinEnd(override) }); binsQuery = [ @@ -494,7 +494,7 @@ module.exports = class Histogram extends BaseWidget { _column: _column, _aggregation: _aggregation, _start: this.getBinStart(override), - _end: getBinEnd(override), + _end: this.getBinEnd(override), _offset: parseOffset(_offset, _aggregation) }); } else { @@ -686,6 +686,14 @@ module.exports = class Histogram extends BaseWidget { return binStart; } + + getBinEnd (override) { + if (override.hasOwnProperty('start') && override.hasOwnProperty('end')) { + return Math.max(override.start, override.end); + } + return override.end || 0; + } + }; var DATE_AGGREGATIONS = { @@ -699,13 +707,6 @@ var DATE_AGGREGATIONS = { 'year': true }; -function getBinEnd(override) { - if (override.hasOwnProperty('start') && override.hasOwnProperty('end')) { - return Math.max(override.start, override.end); - } - return override.end || 0; -} - function getBinsCount(override) { return override.bins || 0; }