Refactor overviews formula dataview

2016-05-23 17:20:04 +02:00
parent 657b262d92
commit 4a646d4700
1 changed files with 2 additions and 5 deletions
@@ -39,17 +39,14 @@ Formula.prototype.constructor = Formula;
 module.exports = Formula;

 Formula.prototype.sql = function(psql, filters, override, callback) {
-    var _query = this.query;
    var formulaQueryTpl = formulaQueryTpls[this.operation];

    if ( formulaQueryTpl ) {
        // supported formula for use with overviews
-        var zoom_level = this.zoomLevelForBbox(this.options.bbox);
-        _query = this.queryRewriter.query(_query, this.queryRewriteData, { zoom_level: zoom_level });
        var formulaSql = formulaQueryTpl({
-            _query: _query,
+            _query:     this.rewrittenQuery(this.query),
            _operation: this.operation,
-            _column: this.column
+            _column:    this.column
        });
        debug(formulaSql);
        callback = callback || override;