From 78b95d05d000446ed33d35f32c0282a278fac963 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 8 Sep 2017 12:21:22 +0200 Subject: [PATCH] make private functions --- .../models/dataview/numeric-histogram.js | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/cartodb/models/dataview/numeric-histogram.js b/lib/cartodb/models/dataview/numeric-histogram.js index 3f1f9840..56167492 100644 --- a/lib/cartodb/models/dataview/numeric-histogram.js +++ b/lib/cartodb/models/dataview/numeric-histogram.js @@ -212,8 +212,8 @@ module.exports = class NumericHistogram extends BaseDataview { _column: this._columnType === 'date' ? columnCastTpl({ column: this.column }) : this.column, _isFloatColumn: this._columnType === 'float', _query: this.query, - _start: this.getBinStart(override), - _end: this.getBinEnd(override), + _start: this._getBinStart(override), + _end: this._getBinEnd(override), _minBins: BIN_MIN_NUMBER, _maxBins: BIN_MAX_NUMBER, }); @@ -254,9 +254,9 @@ module.exports = class NumericHistogram extends BaseDataview { override = override || {}; var buckets = []; - var binsCount = this.getBinsCount(override); - var width = this.getWidth(override); - var binsStart = this.getBinStart(override); + var binsCount = this._getBinsCount(override); + var width = this._getWidth(override); + var binsStart = this._getBinStart(override); var nulls = 0; var infinities = 0; var nans = 0; @@ -270,7 +270,7 @@ module.exports = class NumericHistogram extends BaseDataview { nulls = firstRow.nulls_count; infinities = firstRow.infinities_count; nans = firstRow.nans_count; - binsStart = this.populateBinStart(override, firstRow); + binsStart = this._populateBinStart(override, firstRow); buckets = result.rows.map(row => ({ bin, min, max, avg, freq } = row)); } @@ -299,18 +299,18 @@ module.exports = class NumericHistogram extends BaseDataview { }); } - getBinStart (override) { + _getBinStart (override) { if (override.hasOwnProperty('start') && override.hasOwnProperty('end')) { return Math.min(override.start, override.end); } return override.start || 0; } - populateBinStart (override, firstRow) { + _populateBinStart (override, firstRow) { var binStart; if (override.hasOwnProperty('start')) { - binStart = this.getBinStart(override); + binStart = this._getBinStart(override); } else { binStart = firstRow.min; } @@ -318,18 +318,18 @@ module.exports = class NumericHistogram extends BaseDataview { return binStart; } - getBinEnd (override) { + _getBinEnd (override) { if (override.hasOwnProperty('start') && override.hasOwnProperty('end')) { return Math.max(override.start, override.end); } return override.end || 0; } - getBinsCount (override) { + _getBinsCount (override) { return override.bins || 0; } - getWidth (override) { + _getWidth (override) { var width = 0; var binsCount = override.bins;