diff --git a/lib/cartodb/models/dataview/overviews/aggregation.js b/lib/cartodb/models/dataview/overviews/aggregation.js index 8da8baae..41685ff5 100644 --- a/lib/cartodb/models/dataview/overviews/aggregation.js +++ b/lib/cartodb/models/dataview/overviews/aggregation.js @@ -1,4 +1,4 @@ -var BaseOverviewsWidget = require('./base'); +var BaseOverviewsDataview = require('./base'); var BaseDataview = require('../aggregation'); var dot = require('dot'); @@ -52,7 +52,7 @@ var aggregationQueryTpl = dot.template([ var CATEGORIES_LIMIT = 6; function Aggregation(query, options, queryRewriter, queryRewriteData, params) { - BaseOverviewsWidget.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params); + BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params); this.query = query; this.column = options.column; @@ -60,7 +60,7 @@ var CATEGORIES_LIMIT = 6; this.aggregationColumn = options.aggregationColumn; } -Aggregation.prototype = Object.create(BaseOverviewsWidget.prototype); +Aggregation.prototype = Object.create(BaseOverviewsDataview.prototype); Aggregation.prototype.constructor = Aggregation; module.exports = Aggregation; diff --git a/lib/cartodb/models/dataview/overviews/base.js b/lib/cartodb/models/dataview/overviews/base.js index 9876e271..bbf70742 100644 --- a/lib/cartodb/models/dataview/overviews/base.js +++ b/lib/cartodb/models/dataview/overviews/base.js @@ -1,5 +1,5 @@ var _ = require('underscore'); -var BaseWidget = require('../base'); +var BaseDataview = require('../base'); function BaseOverviewsDataview(query, queryOptions, BaseDataview, queryRewriter, queryRewriteData, options) { this.BaseDataview = BaseDataview; @@ -13,7 +13,7 @@ function BaseOverviewsDataview(query, queryOptions, BaseDataview, queryRewriter, module.exports = BaseOverviewsDataview; -BaseOverviewsDataview.prototype = new BaseWidget(); +BaseOverviewsDataview.prototype = new BaseDataview(); BaseOverviewsDataview.prototype.constructor = BaseOverviewsDataview; // TODO: parameterized these settings diff --git a/lib/cartodb/models/dataview/overviews/formula.js b/lib/cartodb/models/dataview/overviews/formula.js index 5cf4af32..adad5f58 100644 --- a/lib/cartodb/models/dataview/overviews/formula.js +++ b/lib/cartodb/models/dataview/overviews/formula.js @@ -1,4 +1,4 @@ -var BaseOverviewsWidget = require('./base'); +var BaseOverviewsDataview = require('./base'); var BaseDataview = require('../formula'); var dot = require('dot'); @@ -26,12 +26,12 @@ var formulaQueryTpls = { }; function Formula(query, options, queryRewriter, queryRewriteData, params) { - BaseOverviewsWidget.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params); + BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params); this.column = options.column || '1'; this.operation = options.operation; } -Formula.prototype = Object.create(BaseOverviewsWidget.prototype); +Formula.prototype = Object.create(BaseOverviewsDataview.prototype); Formula.prototype.constructor = Formula; module.exports = Formula; diff --git a/lib/cartodb/models/dataview/overviews/histogram.js b/lib/cartodb/models/dataview/overviews/histogram.js index 7463b29f..20dd7712 100644 --- a/lib/cartodb/models/dataview/overviews/histogram.js +++ b/lib/cartodb/models/dataview/overviews/histogram.js @@ -1,5 +1,5 @@ var _ = require('underscore'); -var BaseOverviewsWidget = require('./base'); +var BaseOverviewsDataview = require('./base'); var BaseDataview = require('../histogram'); var dot = require('dot'); @@ -98,7 +98,7 @@ var histogramQueryTpl = dot.template([ ].join('\n')); function Histogram(query, options, queryRewriter, queryRewriteData, params) { - BaseOverviewsWidget.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params); + BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params); this.query = query; this.column = options.column; @@ -107,7 +107,7 @@ function Histogram(query, options, queryRewriter, queryRewriteData, params) { this._columnType = null; } -Histogram.prototype = Object.create(BaseOverviewsWidget.prototype); +Histogram.prototype = Object.create(BaseOverviewsDataview.prototype); Histogram.prototype.constructor = Histogram; module.exports = Histogram; diff --git a/lib/cartodb/models/dataview/overviews/list.js b/lib/cartodb/models/dataview/overviews/list.js index 5efb55f1..7e3b3161 100644 --- a/lib/cartodb/models/dataview/overviews/list.js +++ b/lib/cartodb/models/dataview/overviews/list.js @@ -1,11 +1,11 @@ -var BaseOverviewsWidget = require('./base'); +var BaseOverviewsDataview = require('./base'); var BaseDataview = require('../list'); function List(query, options, queryRewriter, queryRewriteData, params) { - BaseOverviewsWidget.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params); + BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params); } -List.prototype = Object.create(BaseOverviewsWidget.prototype); +List.prototype = Object.create(BaseOverviewsDataview.prototype); List.prototype.constructor = List; module.exports = List;