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

Improve readability, using extract method pattern

Browse Source
This commit is contained in:
Daniel García Aubert 2017-06-07 16:11:09 +02:00
parent 42e2f9e4b1
commit 35d4fb4d27
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -399,11 +399,7 @@ Histogram.prototype.format = function(result, override) {
width = firstRow.bin_width || width;
avg = firstRow.avg_val;
nulls = firstRow.nulls_count;
binsStart = override.hasOwnProperty('start') ?
getBinStart(override) :
firstRow.hasOwnProperty('timestamp') ?
firstRow.timestamp :
firstRow.min;
binsStart = populateBinStart(override, firstRow);
buckets = result.rows.map(function(row) {
return _.omit(row, 'bins_number', 'bin_width', 'nulls_count', 'avg_val');
@ -457,6 +453,20 @@ function getTimezone(timezone) {
return '' + timezoneInHours;
}
function populateBinStart(override, firstRow) {
var binStart;
if (override.hasOwnProperty('start')) {
binStart = getBinStart(override);
} else if (firstRow.hasOwnProperty('timestamp')) {
binStart = firstRow.timestamp;
} else {
binStart = firstRow.min;
}
return binStart;
}
Histogram.prototype.getType = function() {
return TYPE;
};