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

Move getWidth function to a class method

Browse Source
This commit is contained in:
Daniel García Aubert 2017-09-06 15:47:21 +02:00
parent e84f30488f
commit 9e3e1cad9a
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -584,7 +584,7 @@ module.exports = class Histogram extends BaseWidget {
var buckets = []; var buckets = [];
var binsCount = this.getBinsCount(override); var binsCount = this.getBinsCount(override);
var width = getWidth(override); var width = this.getWidth(override);
var binsStart = this.getBinStart(override); var binsStart = this.getBinStart(override);
var nulls = 0; var nulls = 0;
var infinities = 0; var infinities = 0;
@ -697,6 +697,17 @@ module.exports = class Histogram extends BaseWidget {
getBinsCount (override) { getBinsCount (override) {
return override.bins || 0; return override.bins || 0;
} }
getWidth (override) {
var width = 0;
var binsCount = override.bins;
if (binsCount && Number.isFinite(override.start) && Number.isFinite(override.end)) {
width = (override.end - override.start) / binsCount;
}
return width;
}
}; };
var DATE_AGGREGATIONS = { var DATE_AGGREGATIONS = {
@ -710,16 +721,6 @@ var DATE_AGGREGATIONS = {
'year': true 'year': true
}; };
function getWidth(override) {
var width = 0;
var binsCount = override.bins;
if (binsCount && Number.isFinite(override.start) && Number.isFinite(override.end)) {
width = (override.end - override.start) / binsCount;
}
return width;
}
function parseOffset(offset, aggregation) { function parseOffset(offset, aggregation) {
if (!offset) { if (!offset) {