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

Move getBinEnd function to a class method

Browse Source
This commit is contained in:
Daniel García Aubert 2017-09-06 15:42:29 +02:00
parent 392e004879
commit 49a60caffc
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/cartodb/models/dataview/histogram.js
View File

@ -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;
}