From 25ef2610aa2e0266562621a4b5df122fc01d5cb3 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 8 Sep 2017 17:43:10 +0200 Subject: [PATCH] Varible declarations to let/const --- lib/cartodb/models/dataview/date-histogram.js | 47 +++++++++---------- .../models/dataview/numeric-histogram.js | 29 +++++------- 2 files changed, 34 insertions(+), 42 deletions(-) diff --git a/lib/cartodb/models/dataview/date-histogram.js b/lib/cartodb/models/dataview/date-histogram.js index a38bd792..0e11befe 100644 --- a/lib/cartodb/models/dataview/date-histogram.js +++ b/lib/cartodb/models/dataview/date-histogram.js @@ -1,5 +1,4 @@ const BaseDataview = require('./base'); -const debug = require('debug')('windshaft:dataview:date-histogram'); const dateIntervalQueryTpl = ctx => ` WITH @@ -187,7 +186,7 @@ module.exports = class DateHistogram extends BaseDataview { } sql (psql, override, callback) { - var self = this; + let self = this; if (!callback) { callback = override; @@ -231,8 +230,8 @@ module.exports = class DateHistogram extends BaseDataview { } _buildQuery (psql, override, callback) { - var _aggregation = override && override.aggregation ? override.aggregation : this.aggregation; - var _offset = override && Number.isFinite(override.offset) ? override.offset : this.offset; + const _aggregation = override && override.aggregation ? override.aggregation : this.aggregation; + const _offset = override && Number.isFinite(override.offset) ? override.offset : this.offset; if (!DATE_AGGREGATIONS.hasOwnProperty(_aggregation)) { return callback(new Error('Invalid aggregation value. Valid ones: ' + @@ -263,26 +262,22 @@ module.exports = class DateHistogram extends BaseDataview { _offset: this._parseOffset(_offset, _aggregation) }); - debug(histogramSql); - return callback(null, histogramSql); } _getAutomaticAggregation (psql, callback) { - var dateIntervalQuery = dateIntervalQueryTpl({ + const dateIntervalQuery = dateIntervalQueryTpl({ query: this.query, column: this.column }); - debug(dateIntervalQuery); - psql.query(dateIntervalQuery, function (err, result) { if (err) { return callback(err); } - var aggegations = result.rows[0]; - var aggregation = Object.keys(aggegations) + const aggegations = result.rows[0]; + const aggregation = Object.keys(aggegations) .map(function (key) { return { name: key, @@ -310,21 +305,21 @@ module.exports = class DateHistogram extends BaseDataview { format (result, override) { override = override || {}; - var buckets = []; + let buckets = []; - var binsCount = this._getBinsCount(override); - var width = this._getWidth(override); - var binsStart = this._getBinStart(override); - var nulls = 0; - var infinities = 0; - var nans = 0; - var avg; - var timestampStart; - var aggregation; - var offset; + let binsCount = this._getBinsCount(override); + let width = this._getWidth(override); + let binsStart = this._getBinStart(override); + let nulls = 0; + let infinities = 0; + let nans = 0; + let avg; + let timestampStart; + let aggregation; + let offset; if (result.rows.length) { - var firstRow = result.rows[0]; + const firstRow = result.rows[0]; binsCount = firstRow.bins_number; width = firstRow.bin_width || width; avg = firstRow.avg_val; @@ -418,8 +413,8 @@ module.exports = class DateHistogram extends BaseDataview { } _getWidth (override) { - var width = 0; - var binsCount = override.bins; + let width = 0; + const binsCount = override.bins; if (binsCount && Number.isFinite(override.start) && Number.isFinite(override.end)) { width = (override.end - override.start) / binsCount; @@ -436,7 +431,7 @@ module.exports = class DateHistogram extends BaseDataview { return '0'; } - var offsetInHours = Math.ceil(offset / 3600); + const offsetInHours = Math.ceil(offset / 3600); return '' + offsetInHours; } }; diff --git a/lib/cartodb/models/dataview/numeric-histogram.js b/lib/cartodb/models/dataview/numeric-histogram.js index 5cf6f96e..891de107 100644 --- a/lib/cartodb/models/dataview/numeric-histogram.js +++ b/lib/cartodb/models/dataview/numeric-histogram.js @@ -1,5 +1,4 @@ const BaseDataview = require('./base'); -const debug = require('debug')('windshaft:dataview:numeric-histogram'); const columnCastTpl = ctx => `date_part('epoch', ${ctx.column})`; @@ -179,7 +178,7 @@ module.exports = class NumericHistogram extends BaseDataview { } sql (psql, override, callback) { - var self = this; + let self = this; if (!callback) { callback = override; @@ -216,8 +215,6 @@ module.exports = class NumericHistogram extends BaseDataview { _maxBins: BIN_MAX_NUMBER, }); - debug(histogramSql); - return callback(null, histogramSql); } @@ -250,18 +247,18 @@ module.exports = class NumericHistogram extends BaseDataview { format (result, override) { override = override || {}; - var buckets = []; + let buckets = []; - var binsCount = this._getBinsCount(override); - var width = this._getWidth(override); - var binsStart = this._getBinStart(override); - var nulls = 0; - var infinities = 0; - var nans = 0; - var avg; + let binsCount = this._getBinsCount(override); + let width = this._getWidth(override); + let binsStart = this._getBinStart(override); + let nulls = 0; + let infinities = 0; + let nans = 0; + let avg; if (result.rows.length) { - var firstRow = result.rows[0]; + const firstRow = result.rows[0]; binsCount = firstRow.bins_number; width = firstRow.bin_width || width; avg = firstRow.avg_val; @@ -308,7 +305,7 @@ module.exports = class NumericHistogram extends BaseDataview { } _populateBinStart (override, firstRow) { - var binStart; + let binStart; if (override.hasOwnProperty('start')) { binStart = this._getBinStart(override); @@ -331,8 +328,8 @@ module.exports = class NumericHistogram extends BaseDataview { } _getWidth (override) { - var width = 0; - var binsCount = override.bins; + let width = 0; + const binsCount = override.bins; if (binsCount && Number.isFinite(override.start) && Number.isFinite(override.end)) { width = (override.end - override.start) / binsCount;