Merge remote-tracking branch 'origin/master' into mapconfig-reorg

lib/cartodb/models/mapconfig/adapter/analysis-mapconfig-adapter.js

@@ -145,6 +145,7 @@ AnalysisMapConfigAdapter.prototype.getMapConfig = function(analysisConfiguration
                     var analysisSql = layerQuery(layerNode);
                     var sqlQueryWrap = layer.options.sql_wrap;
                     if (sqlQueryWrap) {
+                        layer.options.sql_raw = analysisSql;
                         analysisSql = sqlQueryWrap.replace(/<%=\s*sql\s*%>/g, analysisSql);
                     }
                     layer.options.sql = analysisSql;

lib/cartodb/models/mapconfig/adapter/turbo-carto-adapter.js

@@ -1,5 +1,7 @@
 'use strict';
 
+var dot = require('dot');
+dot.templateSettings.strip = false;
 var queue = require('queue-async');
 var SubstitutionTokens = require('../../../utils/substitution-tokens');
 
@@ -31,19 +33,49 @@ TurboCartoAdapter.prototype.getLayers = function (username, layers, callback) {
     });
 };
 
+var bboxTemplate = dot.template('(select ST_SetSRID(st_extent(the_geom_webmercator), 3857) from ({{=it._sql}}) __c)');
+var zoomTemplate = dot.template([
+    'GREATEST(',
+    'ceil(log(40075017000 / 256 / GREATEST(',
+    '  st_xmax({{=it._bbox}}) - st_xmin({{=it._bbox}}),',
+    '  st_ymax({{=it._bbox}}) - st_ymin({{=it._bbox}})',
+    '))/log(2)),',
+    '0',
+    ')'
+].join('\n'));
+var pixelSizeTemplate = dot.template('40075017 * cos(ST_Y(ST_Centroid({{=it._bbox}}))) / 2 ^ (({{=it._zoom}}) + 8)');
+var scaleDenominatorTemplate = dot.template('({{=it._pixelSize}} / 0.00028)::numeric');
+
+
 TurboCartoAdapter.prototype._parseCartoCss = function (username, layer, callback) {
-    if (isNotLayerToParseCartocss(layer)) {
-        return process.nextTick(function () {
-            callback(null, layer);
-        });
+    if (!shouldParseLayerCartocss(layer)) {
+        return callback(null, layer);
     }
 
-    var sql = SubstitutionTokens.replace(layer.options.sql, {
+    var tokens = {
         bbox: 'ST_MakeEnvelope(-20037508.34,-20037508.34,20037508.34,20037508.34,3857)',
         scale_denominator: '500000001',
         pixel_width: '156412',
         pixel_height: '156412'
-    });
+    };
+
+    var layerSql = layer.options.sql;
+    var layerRawSql = layer.options.sql_raw;
+    if (SubstitutionTokens.hasTokens(layerSql) && layerRawSql) {
+        var bbox = bboxTemplate({ _sql: layerRawSql });
+        var zoom = zoomTemplate({ _bbox: bbox });
+        var pixelSize = pixelSizeTemplate({ _bbox: bbox, _zoom: zoom });
+        var scaleDenominator = scaleDenominatorTemplate({ _pixelSize: pixelSize });
+
+        tokens = {
+            bbox: bbox,
+            scale_denominator: scaleDenominator,
+            pixel_width: pixelSize,
+            pixel_height: pixelSize
+        };
+    }
+
+    var sql = SubstitutionTokens.replace(layerSql, tokens);
 
     this.turboCartoParser.process(username, layer.options.cartocss, sql, function (err, cartocss) {
         // Only return turbo-carto errors
@@ -61,10 +93,6 @@ TurboCartoAdapter.prototype._parseCartoCss = function (username, layer, callback
     });
 };
 
-function isNotLayerToParseCartocss(layer) {
-    if (!layer || !layer.options || !layer.options.cartocss || !layer.options.sql) {
-        return true;
-    }
-
-    return false;
+function shouldParseLayerCartocss(layer) {
+    return layer && layer.options && layer.options.cartocss && layer.options.sql;
 }

lib/cartodb/utils/substitution-tokens.js

@@ -6,6 +6,16 @@ var SUBSTITUTION_TOKENS = {
 };
 
 var SubstitutionTokens = {
+    tokens: function(sql) {
+        return Object.keys(SUBSTITUTION_TOKENS).filter(function(tokenName) {
+            return !!sql.match(SUBSTITUTION_TOKENS[tokenName]);
+        });
+    },
+
+    hasTokens: function(sql) {
+        return this.tokens(sql).length > 0;
+    },
+
     replace: function(sql, replaceValues) {
         Object.keys(replaceValues).forEach(function(token) {
             if (SUBSTITUTION_TOKENS[token]) {