Release 2.61.1

Use mapconfig to to store/retrieve dataviews queries

NEWS.md

@@ -1,8 +1,64 @@
 # Changelog
 
+## 2.61.1
+
+Released 2016-07-06
+
+Enhancements:
+ - Dataviews use mapconfig to store/retrieve their queries instead of instantiating analyses again.
+
+
+## 2.61.0
+
+Released 2016-07-06
+
+Enhancements:
+ - More clear turbo-carto error messages: no context in message.
+ - Return multiple turbo-carto errors #541.
+
+Announcements:
+ - Upgrades turbo-carto to [0.14.0](https://github.com/CartoDB/turbo-carto/releases/tag/0.14.0).
+ - Upgrades camshaft to [0.33.2](https://github.com/CartoDB/camshaft/releases/tag/0.33.2).
+
+
+## 2.60.0
+
+Released 2016-07-05
+
+Announcements:
+ - Upgrades camshaft to [0.32.0](https://github.com/CartoDB/camshaft/releases/tag/0.32.0).
+
+
+## 2.59.1
+
+Released 2016-07-05
+
+Announcements:
+ - Upgrades camshaft to [0.31.0](https://github.com/CartoDB/camshaft/releases/tag/0.31.0).
+
+
+## 2.59.0
+
+Released 2016-07-05
+
+Announcements:
+ - Upgrades camshaft to [0.30.0](https://github.com/CartoDB/camshaft/releases/tag/0.30.0).
+
+
+## 2.58.0
+
+Released 2016-07-05
+
+Announcements:
+ - Upgrades camshaft to [0.29.2](https://github.com/CartoDB/camshaft/releases/tag/0.29.2).
+
+Bug fixes:
+ - Return full list of nodes in response metadata.
+
+
 ## 2.57.0
 
-Released 2016-04-07
+Released 2016-07-04
 
 Announcements:
  - Upgrades camshaft to [0.28.1](https://github.com/CartoDB/camshaft/releases/tag/0.28.1).

lib/cartodb/api/filter_stats_api.js

@@ -1,6 +1,6 @@
 var _ = require('underscore');
 var step = require('step');
-var CamshaftFilter = require('../models/filter/camshaft');
+var AnalysisFilter = require('../models/filter/analysis');
 
 function FilterStatsApi(pgQueryRunner) {
     this.pgQueryRunner = pgQueryRunner;
@@ -40,8 +40,8 @@ FilterStatsApi.prototype.getFilterStats = function (username, unfiltered_query,
       },
       function getFilteredRows() {
           if ( filters && !_.isEmpty(filters)) {
-              var camshaftFilter = new CamshaftFilter(filters);
-              var query = camshaftFilter.sql(unfiltered_query);
+              var analysisFilter = new AnalysisFilter(filters);
+              var query = analysisFilter.sql(unfiltered_query);
               getEstimatedRows(self.pgQueryRunner, username, query, this);
           } else {
               this(null, null);

lib/cartodb/backends/analysis-status.js

@@ -9,7 +9,10 @@ module.exports = AnalysisStatusBackend;
 AnalysisStatusBackend.prototype.getNodeStatus = function (params, callback) {
     var nodeId = params.nodeId;
 
-    var statusQuery = 'SELECT node_id, status, updated_at FROM cdb_analysis_catalog where node_id = \'' + nodeId + '\'';
+    var statusQuery = [
+        'SELECT node_id, status, updated_at, last_error_message as error_message',
+        'FROM cdb_analysis_catalog where node_id = \'' + nodeId + '\''
+    ].join(' ');
 
     var pg = new PSQL(dbParamsFromReqParams(params));
     pg.query(statusQuery, function(err, result) {
@@ -21,10 +24,16 @@ AnalysisStatusBackend.prototype.getNodeStatus = function (params, callback) {
 
         var rows = result.rows || [];
 
-        return callback(null, rows[0] || {
+        var statusResponse = rows[0] || {
             node_id: nodeId,
             status: 'unknown'
-        });
+        };
+
+        if (statusResponse.status !== 'failed') {
+            delete statusResponse.error_message;
+        }
+
+        return callback(null, statusResponse);
     }, true); // use read-only transaction
 };
 

lib/cartodb/backends/dataview.js

@@ -2,11 +2,8 @@ var assert = require('assert');
 
 var _ = require('underscore');
 var PSQL = require('cartodb-psql');
-var camshaft = require('camshaft');
 var step = require('step');
 
-var Timer = require('../stats/timer');
-
 var BBoxFilter = require('../models/filter/bbox');
 
 var DataviewFactory = require('../models/dataview/factory');
@@ -26,110 +23,36 @@ function DataviewBackend(analysisBackend) {
 module.exports = DataviewBackend;
 
 DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, params, callback) {
-    var self = this;
-
-    var timer = new Timer();
 
     var dataviewName = params.dataviewName;
-
-    var mapConfig;
-    var dataviewDefinition;
     step(
         function getMapConfig() {
             mapConfigProvider.getMapConfig(this);
         },
-        function _getDataviewDefinition(err, _mapConfig) {
+        function runDataviewQuery(err, mapConfig) {
             assert.ifError(err);
 
-            mapConfig = _mapConfig;
-
-            var _dataviewDefinition = getDataviewDefinition(mapConfig.obj(), dataviewName);
-            if (!_dataviewDefinition) {
+            var dataviewDefinition = getDataviewDefinition(mapConfig.obj(), dataviewName);
+            if (!dataviewDefinition) {
                 throw new Error("Dataview '" + dataviewName + "' does not exists");
             }
 
-            dataviewDefinition = _dataviewDefinition;
-
-            return dataviewDefinition;
-        },
-        function loadAnalysis(err) {
-            assert.ifError(err);
-
-            var analysisConfiguration = {
-                user: user,
-                db: {
-                    host: params.dbhost,
-                    port: params.dbport,
-                    dbname: params.dbname,
-                    user: params.dbuser,
-                    pass: params.dbpassword
-                },
-                batch: {
-                    username: user,
-                    apiKey: params.api_key
-                }
-            };
-
-            var sourceId = dataviewDefinition.source.id;
-            var analysisDefinition = getAnalysisDefinition(mapConfig.obj().analyses, sourceId);
-
-            var next = this;
-
-            self.analysisBackend.create(analysisConfiguration, analysisDefinition, function(err, analysis) {
-                if (err) {
-                    return next(err);
-                }
-
-                var sourceId2Node = {};
-                var rootNode = analysis.getRoot();
-                if (rootNode.params && rootNode.params.id) {
-                    sourceId2Node[rootNode.params.id] = rootNode;
-                }
-
-                analysis.getNodes().forEach(function(node) {
-                    if (node.params && node.params.id) {
-                        sourceId2Node[node.params.id] = node;
-                    }
-                });
-
-                var node = sourceId2Node[sourceId];
-
-                if (!node) {
-                    return next(new Error('Analysis node not found for dataview'));
-                }
-
-                return next(null, node);
-            });
-        },
-        function runDataviewQuery(err, node) {
-            assert.ifError(err);
-
             var pg = new PSQL(dbParamsFromReqParams(params));
 
             var ownFilter = +params.own_filter;
             ownFilter = !!ownFilter;
 
-            var query = layerQuery(node, dataviewName, ownFilter);
-
+            var query = (ownFilter) ? dataviewDefinition.sql.own_filter_on : dataviewDefinition.sql.own_filter_off;
             var sourceId =  dataviewDefinition.source.id; // node.id
-            var layer = _.find(
-                mapConfig.obj().layers,
-                function(l){ return l.options.source && (l.options.source.id === sourceId); }
-            );
+            var layer = _.find(mapConfig.obj().layers, function(l) {
+                return l.options.source && (l.options.source.id === sourceId);
+            });
             var queryRewriteData = layer && layer.options.query_rewrite_data;
-            if ( queryRewriteData ) {
-                if ( node.type === 'source' ) {
-                    var filters = node.getFilters();
-                    var filters_disabler = Object.keys(filters).reduce(
-                        function(disabler, filter_id){ disabler[filter_id] = false; return disabler; },
-                        {}
-                    );
-                    var unfiltered_query = node.getQuery(filters_disabler);
-                    queryRewriteData = _.extend(
-                        {},
-                        queryRewriteData, { filters: filters, unfiltered_query: unfiltered_query }
-                    );
-                }
+            if (queryRewriteData && dataviewDefinition.node.type === 'source') {
+                queryRewriteData = _.extend({}, queryRewriteData, {
+                    filters: dataviewDefinition.node.filters,
+                    unfiltered_query: dataviewDefinition.sql.own_filter_on
+                });
             }
 
             if (params.bbox) {
@@ -166,98 +89,32 @@ DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, param
             dataview.getResult(pg, overrideParams, this);
         },
         function returnCallback(err, result) {
-            return callback(err, result, timer.getTimes());
+            return callback(err, result);
         }
     );
 };
 
 DataviewBackend.prototype.search = function (mapConfigProvider, user, params, callback) {
-    var self = this;
-
-    var timer = new Timer();
-
     var dataviewName = params.dataviewName;
 
-    var mapConfig;
-    var dataviewDefinition;
     step(
         function getMapConfig() {
             mapConfigProvider.getMapConfig(this);
         },
-        function _getDataviewDefinition(err, _mapConfig) {
+        function runDataviewSearchQuery(err, mapConfig) {
             assert.ifError(err);
 
-            mapConfig = _mapConfig;
-
-            var _dataviewDefinition = getDataviewDefinition(mapConfig.obj(), dataviewName);
-            if (!_dataviewDefinition) {
+            var dataviewDefinition = getDataviewDefinition(mapConfig.obj(), dataviewName);
+            if (!dataviewDefinition) {
                 throw new Error("Dataview '" + dataviewName + "' does not exists");
             }
 
-            dataviewDefinition = _dataviewDefinition;
-
-            return dataviewDefinition;
-        },
-        function loadAnalysis(err) {
-            assert.ifError(err);
-
-            var analysisConfiguration = {
-                user: user,
-                db: {
-                    host: params.dbhost,
-                    port: params.dbport,
-                    dbname: params.dbname,
-                    user: params.dbuser,
-                    pass: params.dbpassword
-                },
-                batch: {
-                    // TODO load this from configuration
-                    endpoint: 'http://127.0.0.1:8080/api/v1/sql/job',
-                    username: user,
-                    apiKey: params.api_key
-                }
-            };
-
-            var sourceId = dataviewDefinition.source.id;
-            var analysisDefinition = getAnalysisDefinition(mapConfig.obj().analyses, sourceId);
-
-            var next = this;
-
-            self.analysisBackend.create(analysisConfiguration, analysisDefinition, function(err, analysis) {
-                if (err) {
-                    return next(err);
-                }
-
-                var sourceId2Node = {};
-                var rootNode = analysis.getRoot();
-                if (rootNode.params && rootNode.params.id) {
-                    sourceId2Node[rootNode.params.id] = rootNode;
-                }
-
-                analysis.getNodes().forEach(function(node) {
-                    if (node.params && node.params.id) {
-                        sourceId2Node[node.params.id] = node;
-                    }
-                });
-
-                var node = sourceId2Node[sourceId];
-
-                if (!node) {
-                    return next(new Error('Analysis node not found for dataview'));
-                }
-
-                return next(null, node);
-            });
-        },
-        function runDataviewQuery(err, node) {
-            assert.ifError(err);
-
             var pg = new PSQL(dbParamsFromReqParams(params));
 
             var ownFilter = +params.own_filter;
             ownFilter = !!ownFilter;
 
-            var query = layerQuery(node, dataviewName, ownFilter);
+            var query = (ownFilter) ? dataviewDefinition.sql.own_filter_on : dataviewDefinition.sql.own_filter_off;
 
             if (params.bbox) {
                 var bboxFilter = new BBoxFilter({column: 'the_geom', srid: 4326}, {bbox: params.bbox});
@@ -270,23 +127,11 @@ DataviewBackend.prototype.search = function (mapConfigProvider, user, params, ca
             dataview.search(pg, userQuery, this);
         },
         function returnCallback(err, result) {
-            return callback(err, result, timer.getTimes());
+            return callback(err, result);
         }
     );
 };
 
-function getAnalysisDefinition(mapConfigAnalyses, sourceId) {
-    mapConfigAnalyses = mapConfigAnalyses || [];
-    for (var i = 0; i < mapConfigAnalyses.length; i++) {
-        var analysisGraph = new camshaft.reference.AnalysisGraph(mapConfigAnalyses[i]);
-        var nodes = analysisGraph.getNodesWithId();
-        if (nodes.hasOwnProperty(sourceId)) {
-            return mapConfigAnalyses[i];
-        }
-    }
-    throw new Error('There is no associated analysis for the dataview source id');
-}
-
 function getDataviewDefinition(mapConfig, dataviewName) {
     var dataviews = mapConfig.dataviews || {};
     return dataviews[dataviewName];
@@ -311,31 +156,3 @@ function dbParamsFromReqParams(params) {
     }
     return dbParams;
 }
-
-var SKIP_COLUMNS = {
-    'the_geom': true,
-    'the_geom_webmercator': true
-};
-
-function skipColumns(columnNames) {
-    return columnNames
-        .filter(function(columnName) { return !SKIP_COLUMNS[columnName]; });
-}
-
-var layerQueryTemplate = dot.template([
-    'SELECT {{=it._columns}}',
-    'FROM ({{=it._query}}) _cdb_analysis_query'
-].join('\n'));
-
-function layerQuery(node, dataviewName, ownFilter) {
-    var applyFilters = {};
-    if (!ownFilter) {
-        applyFilters[dataviewName] = false;
-    }
-
-    if (node.type === 'source') {
-        return node.getQuery(applyFilters);
-    }
-    var _columns = ['ST_Transform(the_geom, 3857) the_geom_webmercator'].concat(skipColumns(node.getColumns()));
-    return layerQueryTemplate({ _query: node.getQuery(applyFilters), _columns: _columns.join(', ') });
-}

lib/cartodb/controllers/map.js

@@ -330,7 +330,7 @@ function getLastUpdatedTime(analysesResults, lastUpdateTime) {
         return lastUpdateTime;
     }
     return analysesResults.reduce(function(lastUpdateTime, analysis) {
-        return analysis.getSortedNodes().reduce(function(lastNodeUpdatedAtTime, node) {
+        return analysis.getNodes().reduce(function(lastNodeUpdatedAtTime, node) {
             var nodeUpdatedAtDate = node.getUpdatedAt();
             var nodeUpdatedTimeAt = (nodeUpdatedAtDate && nodeUpdatedAtDate.getTime()) || 0;
             return nodeUpdatedTimeAt > lastNodeUpdatedAtTime ? nodeUpdatedTimeAt : lastNodeUpdatedAtTime;
@@ -344,7 +344,7 @@ function addAnalysesMetadata(username, layergroup, analysesResults, includeQuery
     layergroup.metadata.analyses = [];
 
     analysesResults.forEach(function(analysis) {
-        var nodes = analysis.getSortedNodes();
+        var nodes = analysis.getNodes();
         layergroup.metadata.analyses.push({
             nodes: nodes.reduce(function(nodesIdMap, node) {
                 if (node.params.id) {

lib/cartodb/models/filter/analysis.js

@@ -1,6 +1,6 @@
 var filters = {
-    category: require('./camshaft/category'),
-    range: require('./camshaft/range')
+    category: require('./analysis/category'),
+    range: require('./analysis/range')
 };
 
 function createFilter(filterDefinition) {
@@ -11,11 +11,11 @@ function createFilter(filterDefinition) {
     return new filters[filterType](filterDefinition.column, filterDefinition.params);
 }
 
-function CamshaftFilters(filters) {
+function AnalysisFilters(filters) {
     this.filters = filters;
 }
 
-CamshaftFilters.prototype.sql = function(rawSql) {
+AnalysisFilters.prototype.sql = function(rawSql) {
   var filters = this.filters || {};
   var applyFilters = {};
 
@@ -32,4 +32,4 @@ CamshaftFilters.prototype.sql = function(rawSql) {
       }, rawSql);
 };
 
-module.exports = CamshaftFilters;
+module.exports = AnalysisFilters;

lib/cartodb/models/filter/analysis/category.js

@@ -6,7 +6,7 @@ dot.templateSettings.strip = false;
 
 var filterQueryTpl = dot.template([
     'SELECT *',
-    'FROM ({{=it._sql}}) _camshaft_category_filter',
+    'FROM ({{=it._sql}}) _analysis_category_filter',
     'WHERE {{=it._filters}}'
 ].join('\n'));
 var escapeStringTpl = dot.template('$escape_{{=it._i}}${{=it._value}}$escape_{{=it._i}}$');

lib/cartodb/models/filter/analysis/range.js

@@ -6,7 +6,7 @@ dot.templateSettings.strip = false;
 var betweenFilterTpl = dot.template('{{=it._column}} BETWEEN {{=it._min}} AND {{=it._max}}');
 var minFilterTpl = dot.template('{{=it._column}} >= {{=it._min}}');
 var maxFilterTpl = dot.template('{{=it._column}} <= {{=it._max}}');
-var filterQueryTpl = dot.template('SELECT * FROM ({{=it._sql}}) _camshaft_range_filter WHERE {{=it._filter}}');
+var filterQueryTpl = dot.template('SELECT * FROM ({{=it._sql}}) _analysis_range_filter WHERE {{=it._filter}}');
 
 function Range(column, filterParams) {
     this.column = column;

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

@@ -123,14 +123,37 @@ AnalysisMapConfigAdapter.prototype.getMapConfig = function(user, requestMapConfi
             return layer;
         });
 
-
-        debug('mapconfig output', JSON.stringify(requestMapConfig, null, 4));
-
         var missingDataviewsNodesErrors = getMissingDataviewsSourceIds(dataviews, sourceId2Node);
         if (missingNodesErrors.length > 0 || missingDataviewsNodesErrors.length > 0) {
             return callback(missingNodesErrors.concat(missingDataviewsNodesErrors));
         }
 
+        // Augment dataviews with sql from analyses
+        Object.keys(dataviews).forEach(function(dataviewName) {
+            var dataview = requestMapConfig.dataviews[dataviewName];
+            var dataviewSourceId = dataview.source.id;
+            var dataviewNode = sourceId2Node[dataviewSourceId];
+            dataview.node = {
+                type: dataviewNode.type,
+                filters: dataviewNode.getFilters()
+            };
+            dataview.sql = {
+                own_filter_on: dataviewQuery(dataviewNode, dataviewName, true),
+                own_filter_off: dataviewQuery(dataviewNode, dataviewName, false),
+                no_filters: dataviewNode.getQuery(Object.keys(dataviewNode.getFilters())
+                    .reduce(function(applyFilters, filterId) {
+                        applyFilters[filterId] = false;
+                        return applyFilters;
+                    }, {})
+                )
+            };
+        });
+        if (Object.keys(dataviews).length > 0) {
+            requestMapConfig.dataviews = dataviews;
+        }
+
+        debug('mapconfig output', JSON.stringify(requestMapConfig, null, 4));
+
         context.analysesResults = analysesResults;
 
         return callback(null, requestMapConfig);
@@ -147,7 +170,7 @@ function skipColumns(columnNames) {
         .filter(function(columnName) { return !SKIP_COLUMNS[columnName]; });
 }
 
-var layerQueryTemplate = dot.template([
+var wrappedQueryTpl = dot.template([
     'SELECT {{=it._columns}}',
     'FROM ({{=it._query}}) _cdb_analysis_query'
 ].join('\n'));
@@ -157,7 +180,20 @@ function layerQuery(node) {
         return node.getQuery();
     }
     var _columns = ['ST_Transform(the_geom, 3857) the_geom_webmercator'].concat(skipColumns(node.getColumns()));
-    return layerQueryTemplate({ _query: node.getQuery(), _columns: _columns.join(', ') });
+    return wrappedQueryTpl({ _query: node.getQuery(), _columns: _columns.join(', ') });
+}
+
+function dataviewQuery(node, dataviewName, ownFilter) {
+    var applyFilters = {};
+    if (!ownFilter) {
+        applyFilters[dataviewName] = false;
+    }
+
+    if (node.type === 'source') {
+        return node.getQuery(applyFilters);
+    }
+    var _columns = ['ST_Transform(the_geom, 3857) the_geom_webmercator'].concat(skipColumns(node.getColumns()));
+    return wrappedQueryTpl({ _query: node.getQuery(applyFilters), _columns: _columns.join(', ') });
 }
 
 function appendFiltersToNodes(requestMapConfig, dataviewsFiltersBySourceId) {

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

@@ -32,12 +32,22 @@ TurboCartoAdapter.prototype.getMapConfig = function (user, requestMapConfig, par
         parseCartoQueue.defer(self._parseCartoCss.bind(self), user, params, layer, index, layerId);
     });
 
-    parseCartoQueue.awaitAll(function (err, layers) {
+    parseCartoQueue.awaitAll(function (err, results) {
         if (err) {
             return callback(err);
         }
 
-        requestMapConfig.layers = layers;
+        var errors = results.reduce(function(errors, result) {
+            if (result.error) {
+                errors.push(result.error);
+            }
+            return errors;
+        }, []);
+        if (errors.length > 0) {
+            return callback(errors);
+        }
+
+        requestMapConfig.layers = results.map(function(result) { return result.layer; });
 
         return callback(null, requestMapConfig);
     });
@@ -70,14 +80,14 @@ var tokensQueryTpl = dot.template([
 
 TurboCartoAdapter.prototype._parseCartoCss = function (username, params, layer, layerIndex, layerId, callback) {
     if (!shouldParseLayerCartocss(layer)) {
-        return callback(null, layer);
+        return callback(null, { layer: layer });
     }
 
     var pg = new PSQL(dbParamsFromReqParams(params));
     function processCallback(err, cartocss) {
         // Only return turbo-carto errors
         if (err && err.name === 'TurboCartoError') {
-            var error = new Error('turbo-carto: ' + err.message);
+            var error = new Error(err.message);
             error.http_status = 400;
             error.type = 'layer';
             error.subtype = 'turbo-carto';
@@ -88,14 +98,14 @@ TurboCartoAdapter.prototype._parseCartoCss = function (username, params, layer,
                 context: err.context
             };
 
-            return callback(error);
+            return callback(null, { error: error });
         }
 
         // Try to continue in the rest of the cases
         if (cartocss) {
             layer.options.cartocss = cartocss;
         }
-        return callback(null, layer);
+        return callback(null, { layer: layer });
     }
 
     var layerSql = layer.options.sql;
@@ -105,9 +115,7 @@ TurboCartoAdapter.prototype._parseCartoCss = function (username, params, layer,
         var tokensQuery = tokensQueryTpl({_sql: layerRawSql});
         return pg.query(tokensQuery, function(err, resultSet) {
             if (err) {
-                var error = new Error('turbo-carto: ' + err.message);
-                error.type = 'turbo-carto';
-                return callback(error);
+                return processCallback(err);
             }
 
             resultSet = resultSet || {};

lib/cartodb/utils/overviews_query_rewriter.js

@@ -2,7 +2,7 @@ var _ = require('underscore');
 var TableNameParser = require('./table_name_parser');
 
 var BBoxFilter = require('../models/filter/bbox');
-var CamshaftFilter = require('../models/filter/camshaft');
+var AnalysisFilter = require('../models/filter/analysis');
 
 // Minimim number of filtered rows to use overviews
 var FILTER_MIN_ROWS = 65536;
@@ -11,8 +11,8 @@ var FILTER_MAX_FRACTION = 0.2;
 
 function apply_filters_to_query(query, filters, bbox_filter) {
     if ( filters && !_.isEmpty(filters)) {
-        var camshaftFilter = new CamshaftFilter(filters);
-        query = camshaftFilter.sql(query);
+        var analysisFilter = new AnalysisFilter(filters);
+        query = analysisFilter.sql(query);
     }
     if ( bbox_filter ) {
         var bboxFilter = new BBoxFilter(bbox_filter.options, bbox_filter.params);

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.57.0",
+  "version": "2.61.1",
   "dependencies": {
     "body-parser": {
       "version": "1.14.2",
@@ -52,7 +52,7 @@
             "ee-first": {
               "version": "1.1.1",
               "from": "ee-first@1.1.1",
-              "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
+              "resolved": "http://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz"
             }
           }
         },
@@ -90,7 +90,7 @@
             },
             "mime-types": {
               "version": "2.1.11",
-              "from": "mime-types@>=2.1.2 <2.2.0",
+              "from": "mime-types@>=2.1.11 <2.2.0",
               "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
               "dependencies": {
                 "mime-db": {
@@ -105,9 +105,9 @@
       }
     },
     "camshaft": {
-      "version": "0.28.1",
-      "from": "camshaft@0.28.1",
-      "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.28.1.tgz",
+      "version": "0.33.2",
+      "from": "camshaft@0.33.2",
+      "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.33.2.tgz",
       "dependencies": {
         "async": {
           "version": "1.5.2",
@@ -558,7 +558,7 @@
     "debug": {
       "version": "2.2.0",
       "from": "debug@>=2.2.0 <2.3.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+      "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.2.0.tgz",
       "dependencies": {
         "ms": {
           "version": "0.7.1",
@@ -676,7 +676,7 @@
             "ee-first": {
               "version": "1.1.1",
               "from": "ee-first@1.1.1",
-              "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
+              "resolved": "http://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz"
             }
           }
         },
@@ -742,7 +742,7 @@
             "mime": {
               "version": "1.3.4",
               "from": "mime@1.3.4",
-              "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"
+              "resolved": "http://registry.npm.taobao.org/mime/download/mime-1.3.4.tgz"
             },
             "ms": {
               "version": "0.7.1",
@@ -786,7 +786,7 @@
                 "mime": {
                   "version": "1.3.4",
                   "from": "mime@1.3.4",
-                  "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"
+                  "resolved": "http://registry.npm.taobao.org/mime/download/mime-1.3.4.tgz"
                 },
                 "ms": {
                   "version": "0.7.1",
@@ -804,7 +804,7 @@
         },
         "type-is": {
           "version": "1.6.13",
-          "from": "type-is@>=1.6.10 <1.7.0",
+          "from": "type-is@>=1.6.6 <1.7.0",
           "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz",
           "dependencies": {
             "media-typer": {
@@ -866,7 +866,7 @@
             "isarray": {
               "version": "0.0.1",
               "from": "isarray@0.0.1",
-              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+              "resolved": "http://registry.npm.taobao.org/isarray/download/isarray-0.0.1.tgz"
             },
             "string_decoder": {
               "version": "0.10.31",
@@ -1017,7 +1017,7 @@
           "dependencies": {
             "async": {
               "version": "1.5.2",
-              "from": "async@>=1.5.2 <2.0.0",
+              "from": "async@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
             }
           }
@@ -1029,7 +1029,7 @@
         },
         "mime-types": {
           "version": "2.1.11",
-          "from": "mime-types@>=2.1.2 <2.2.0",
+          "from": "mime-types@>=2.1.11 <2.2.0",
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
           "dependencies": {
             "mime-db": {
@@ -1257,24 +1257,24 @@
       "resolved": "https://registry.npmjs.org/step-profiler/-/step-profiler-0.3.0.tgz"
     },
     "turbo-carto": {
-      "version": "0.12.1",
-      "from": "turbo-carto@0.12.1",
-      "resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.12.1.tgz",
+      "version": "0.14.0",
+      "from": "turbo-carto@0.14.0",
+      "resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.14.0.tgz",
       "dependencies": {
         "colorbrewer": {
           "version": "1.0.0",
           "from": "colorbrewer@1.0.0",
-          "resolved": "https://registry.npmjs.org/colorbrewer/-/colorbrewer-1.0.0.tgz"
+          "resolved": "http://registry.npm.taobao.org/colorbrewer/download/colorbrewer-1.0.0.tgz"
         },
         "cartocolor": {
-          "version": "1.1.0",
-          "from": "cartocolor@1.1.0",
-          "resolved": "https://registry.npmjs.org/cartocolor/-/cartocolor-1.1.0.tgz"
+          "version": "2.0.2",
+          "from": "cartocolor@2.0.2",
+          "resolved": "https://registry.npmjs.org/cartocolor/-/cartocolor-2.0.2.tgz"
         },
         "es6-promise": {
           "version": "3.1.2",
           "from": "es6-promise@3.1.2",
-          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.1.2.tgz"
+          "resolved": "http://registry.npm.taobao.org/es6-promise/download/es6-promise-3.1.2.tgz"
         },
         "postcss": {
           "version": "5.0.19",
@@ -1308,7 +1308,7 @@
         "postcss-value-parser": {
           "version": "3.3.0",
           "from": "postcss-value-parser@3.3.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz"
+          "resolved": "http://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-3.3.0.tgz"
         }
       }
     },
@@ -2966,36 +2966,41 @@
                       "from": "node-pre-gyp@>=0.6.28 <0.7.0",
                       "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.28.tgz"
                     },
-                    "ansi": {
-                      "version": "0.3.1",
-                      "from": "ansi@>=0.3.1 <0.4.0",
-                      "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz"
-                    },
                     "abbrev": {
                       "version": "1.0.7",
                       "from": "abbrev@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz"
                     },
+                    "ansi": {
+                      "version": "0.3.1",
+                      "from": "ansi@>=0.3.1 <0.4.0",
+                      "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz"
+                    },
                     "ansi-regex": {
                       "version": "2.0.0",
                       "from": "ansi-regex@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
                     },
-                    "are-we-there-yet": {
-                      "version": "1.1.2",
-                      "from": "are-we-there-yet@>=1.1.2 <1.2.0",
-                      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz"
-                    },
                     "ansi-styles": {
                       "version": "2.2.1",
                       "from": "ansi-styles@>=2.2.1 <3.0.0",
                       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
                     },
+                    "are-we-there-yet": {
+                      "version": "1.1.2",
+                      "from": "are-we-there-yet@>=1.1.2 <1.2.0",
+                      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz"
+                    },
                     "asn1": {
                       "version": "0.2.3",
                       "from": "asn1@>=0.2.3 <0.3.0",
                       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
                     },
+                    "assert-plus": {
+                      "version": "0.2.0",
+                      "from": "assert-plus@>=0.2.0 <0.3.0",
+                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
+                    },
                     "async": {
                       "version": "1.5.2",
                       "from": "async@>=1.5.2 <2.0.0",
@@ -3011,11 +3016,6 @@
                       "from": "aws4@>=1.2.1 <2.0.0",
                       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz"
                     },
-                    "assert-plus": {
-                      "version": "0.2.0",
-                      "from": "assert-plus@>=0.2.0 <0.3.0",
-                      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
-                    },
                     "balanced-match": {
                       "version": "0.4.1",
                       "from": "balanced-match@>=0.4.1 <0.5.0",
@@ -3031,16 +3031,16 @@
                       "from": "boom@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
                     },
-                    "caseless": {
-                      "version": "0.11.0",
-                      "from": "caseless@>=0.11.0 <0.12.0",
-                      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
-                    },
                     "brace-expansion": {
                       "version": "1.1.4",
                       "from": "brace-expansion@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.4.tgz"
                     },
+                    "caseless": {
+                      "version": "0.11.0",
+                      "from": "caseless@>=0.11.0 <0.12.0",
+                      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
+                    },
                     "chalk": {
                       "version": "1.1.3",
                       "from": "chalk@>=1.1.1 <2.0.0",
@@ -3056,16 +3056,16 @@
                       "from": "commander@>=2.9.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
                     },
-                    "concat-map": {
-                      "version": "0.0.1",
-                      "from": "concat-map@0.0.1",
-                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-                    },
                     "core-util-is": {
                       "version": "1.0.2",
                       "from": "core-util-is@>=1.0.0 <1.1.0",
                       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
                     },
+                    "concat-map": {
+                      "version": "0.0.1",
+                      "from": "concat-map@0.0.1",
+                      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+                    },
                     "cryptiles": {
                       "version": "2.0.5",
                       "from": "cryptiles@>=2.0.0 <3.0.0",
@@ -3076,6 +3076,11 @@
                       "from": "debug@>=2.2.0 <2.3.0",
                       "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
                     },
+                    "deep-extend": {
+                      "version": "0.4.1",
+                      "from": "deep-extend@>=0.4.0 <0.5.0",
+                      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz"
+                    },
                     "delayed-stream": {
                       "version": "1.0.0",
                       "from": "delayed-stream@>=1.0.0 <1.1.0",
@@ -3091,11 +3096,6 @@
                       "from": "ecc-jsbn@>=0.1.1 <0.2.0",
                       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
                     },
-                    "escape-string-regexp": {
-                      "version": "1.0.5",
-                      "from": "escape-string-regexp@>=1.0.2 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
-                    },
                     "extend": {
                       "version": "3.0.0",
                       "from": "extend@>=3.0.0 <3.1.0",
@@ -3111,31 +3111,41 @@
                       "from": "forever-agent@>=0.6.1 <0.7.0",
                       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
                     },
-                    "form-data": {
-                      "version": "1.0.0-rc4",
-                      "from": "form-data@>=1.0.0-rc3 <1.1.0",
-                      "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz"
-                    },
-                    "fstream": {
-                      "version": "1.0.9",
-                      "from": "fstream@>=1.0.2 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.9.tgz"
-                    },
                     "fstream-ignore": {
                       "version": "1.0.4",
                       "from": "fstream-ignore@>=1.0.3 <1.1.0",
                       "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.4.tgz"
                     },
+                    "escape-string-regexp": {
+                      "version": "1.0.5",
+                      "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
+                    },
+                    "form-data": {
+                      "version": "1.0.0-rc4",
+                      "from": "form-data@>=1.0.0-rc3 <1.1.0",
+                      "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz"
+                    },
                     "gauge": {
                       "version": "1.2.7",
                       "from": "gauge@>=1.2.5 <1.3.0",
                       "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz"
                     },
+                    "fstream": {
+                      "version": "1.0.9",
+                      "from": "fstream@>=1.0.2 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.9.tgz"
+                    },
                     "generate-function": {
                       "version": "2.0.0",
                       "from": "generate-function@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
                     },
+                    "generate-object-property": {
+                      "version": "1.2.0",
+                      "from": "generate-object-property@>=1.1.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
+                    },
                     "glob": {
                       "version": "7.0.3",
                       "from": "glob@>=7.0.0 <8.0.0",
@@ -3151,21 +3161,16 @@
                       "from": "graceful-readlink@>=1.0.0",
                       "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
                     },
-                    "har-validator": {
-                      "version": "2.0.6",
-                      "from": "har-validator@>=2.0.6 <2.1.0",
-                      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"
-                    },
-                    "generate-object-property": {
-                      "version": "1.2.0",
-                      "from": "generate-object-property@>=1.1.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
-                    },
                     "has-ansi": {
                       "version": "2.0.0",
                       "from": "has-ansi@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
                     },
+                    "har-validator": {
+                      "version": "2.0.6",
+                      "from": "har-validator@>=2.0.6 <2.1.0",
+                      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"
+                    },
                     "has-unicode": {
                       "version": "2.0.0",
                       "from": "has-unicode@>=2.0.0 <3.0.0",
@@ -3176,20 +3181,20 @@
                       "from": "hawk@>=3.1.3 <3.2.0",
                       "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"
                     },
-                    "http-signature": {
-                      "version": "1.1.1",
-                      "from": "http-signature@>=1.1.0 <1.2.0",
-                      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"
+                    "hoek": {
+                      "version": "2.16.3",
+                      "from": "hoek@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
                     },
                     "inflight": {
                       "version": "1.0.4",
                       "from": "inflight@>=1.0.4 <2.0.0",
                       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"
                     },
-                    "deep-extend": {
-                      "version": "0.4.1",
-                      "from": "deep-extend@>=0.4.0 <0.5.0",
-                      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz"
+                    "http-signature": {
+                      "version": "1.1.1",
+                      "from": "http-signature@>=1.1.0 <1.2.0",
+                      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"
                     },
                     "inherits": {
                       "version": "2.0.1",
@@ -3206,16 +3211,16 @@
                       "from": "is-my-json-valid@>=2.12.4 <3.0.0",
                       "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"
                     },
+                    "is-property": {
+                      "version": "1.0.2",
+                      "from": "is-property@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
+                    },
                     "is-typedarray": {
                       "version": "1.0.0",
                       "from": "is-typedarray@>=1.0.0 <1.1.0",
                       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
                     },
-                    "hoek": {
-                      "version": "2.16.3",
-                      "from": "hoek@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
-                    },
                     "isarray": {
                       "version": "1.0.0",
                       "from": "isarray@>=1.0.0 <1.1.0",
@@ -3261,16 +3266,16 @@
                       "from": "lodash._baseslice@>=4.0.0 <4.1.0",
                       "resolved": "https://registry.npmjs.org/lodash._baseslice/-/lodash._baseslice-4.0.0.tgz"
                     },
-                    "lodash._basetostring": {
-                      "version": "4.12.0",
-                      "from": "lodash._basetostring@>=4.12.0 <4.13.0",
-                      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-4.12.0.tgz"
-                    },
                     "lodash.pad": {
                       "version": "4.4.0",
                       "from": "lodash.pad@>=4.1.0 <5.0.0",
                       "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.4.0.tgz"
                     },
+                    "lodash._basetostring": {
+                      "version": "4.12.0",
+                      "from": "lodash._basetostring@>=4.12.0 <4.13.0",
+                      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-4.12.0.tgz"
+                    },
                     "lodash.padend": {
                       "version": "4.5.0",
                       "from": "lodash.padend@>=4.1.0 <5.0.0",
@@ -3301,6 +3306,11 @@
                       "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"
                     },
+                    "minimist": {
+                      "version": "0.0.8",
+                      "from": "minimist@0.0.8",
+                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                    },
                     "mkdirp": {
                       "version": "0.5.1",
                       "from": "mkdirp@>=0.5.0 <0.6.0",
@@ -3311,25 +3321,20 @@
                       "from": "ms@0.7.1",
                       "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
                     },
-                    "is-property": {
-                      "version": "1.0.2",
-                      "from": "is-property@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
-                    },
-                    "node-uuid": {
-                      "version": "1.4.7",
-                      "from": "node-uuid@>=1.4.7 <1.5.0",
-                      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
+                    "nopt": {
+                      "version": "3.0.6",
+                      "from": "nopt@>=3.0.1 <3.1.0",
+                      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"
                     },
                     "npmlog": {
                       "version": "2.0.3",
                       "from": "npmlog@>=2.0.0 <2.1.0",
                       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-2.0.3.tgz"
                     },
-                    "nopt": {
-                      "version": "3.0.6",
-                      "from": "nopt@>=3.0.1 <3.1.0",
-                      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"
+                    "node-uuid": {
+                      "version": "1.4.7",
+                      "from": "node-uuid@>=1.4.7 <1.5.0",
+                      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
                     },
                     "oauth-sign": {
                       "version": "0.8.2",
@@ -3341,31 +3346,31 @@
                       "from": "once@>=1.3.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz"
                     },
-                    "pinkie": {
-                      "version": "2.0.4",
-                      "from": "pinkie@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
-                    },
                     "path-is-absolute": {
                       "version": "1.0.0",
                       "from": "path-is-absolute@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
                     },
+                    "pinkie": {
+                      "version": "2.0.4",
+                      "from": "pinkie@>=2.0.0 <3.0.0",
+                      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
+                    },
                     "pinkie-promise": {
                       "version": "2.0.1",
                       "from": "pinkie-promise@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
                     },
-                    "qs": {
-                      "version": "6.1.0",
-                      "from": "qs@>=6.1.0 <6.2.0",
-                      "resolved": "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz"
-                    },
                     "process-nextick-args": {
                       "version": "1.0.7",
                       "from": "process-nextick-args@>=1.0.6 <1.1.0",
                       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
                     },
+                    "qs": {
+                      "version": "6.1.0",
+                      "from": "qs@>=6.1.0 <6.2.0",
+                      "resolved": "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz"
+                    },
                     "request": {
                       "version": "2.72.0",
                       "from": "request@>=2.0.0 <3.0.0",
@@ -3376,20 +3381,15 @@
                       "from": "readable-stream@>=2.0.0 <3.0.0||>=1.1.13 <2.0.0",
                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.2.tgz"
                     },
-                    "semver": {
-                      "version": "5.1.0",
-                      "from": "semver@>=5.1.0 <5.2.0",
-                      "resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz"
-                    },
                     "rimraf": {
                       "version": "2.5.2",
                       "from": "rimraf@>=2.5.0 <2.6.0",
                       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.2.tgz"
                     },
-                    "minimist": {
-                      "version": "0.0.8",
-                      "from": "minimist@0.0.8",
-                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+                    "semver": {
+                      "version": "5.1.0",
+                      "from": "semver@>=5.1.0 <5.2.0",
+                      "resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz"
                     },
                     "sntp": {
                       "version": "1.0.9",
@@ -3446,16 +3446,16 @@
                       "from": "uid-number@>=0.0.6 <0.1.0",
                       "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
                     },
-                    "verror": {
-                      "version": "1.3.6",
-                      "from": "verror@1.3.6",
-                      "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
-                    },
                     "util-deprecate": {
                       "version": "1.0.2",
                       "from": "util-deprecate@>=1.0.1 <1.1.0",
                       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
                     },
+                    "verror": {
+                      "version": "1.3.6",
+                      "from": "verror@1.3.6",
+                      "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
+                    },
                     "wrappy": {
                       "version": "1.0.1",
                       "from": "wrappy@>=1.0.0 <2.0.0",
@@ -3502,18 +3502,6 @@
                         }
                       }
                     },
-                    "sshpk": {
-                      "version": "1.8.3",
-                      "from": "sshpk@>=1.7.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz",
-                      "dependencies": {
-                        "assert-plus": {
-                          "version": "1.0.0",
-                          "from": "assert-plus@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
-                        }
-                      }
-                    },
                     "rc": {
                       "version": "1.1.6",
                       "from": "rc@>=1.1.0 <1.2.0",
@@ -3537,6 +3525,18 @@
                           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
                         }
                       }
+                    },
+                    "sshpk": {
+                      "version": "1.8.3",
+                      "from": "sshpk@>=1.7.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz",
+                      "dependencies": {
+                        "assert-plus": {
+                          "version": "1.0.0",
+                          "from": "assert-plus@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+                        }
+                      }
                     }
                   }
                 },

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "windshaft-cartodb",
-  "version": "2.57.0",
+  "version": "2.61.1",
   "description": "A map tile server for CartoDB",
   "keywords": [
     "cartodb"
@@ -20,7 +20,7 @@
   ],
   "dependencies": {
     "body-parser": "~1.14.0",
-    "camshaft": "0.28.1",
+    "camshaft": "0.33.2",
     "cartodb-psql": "~0.6.1",
     "cartodb-query-tables": "~0.1.0",
     "cartodb-redis": "~0.13.0",
@@ -37,7 +37,7 @@
     "request": "~2.62.0",
     "step": "~0.0.6",
     "step-profiler": "~0.3.0",
-    "turbo-carto": "0.12.1",
+    "turbo-carto": "0.14.0",
     "underscore": "~1.6.0",
     "windshaft": "2.4.0"
   },

test/acceptance/analysis/analysis-layers.js

@@ -202,7 +202,7 @@ describe('analysis-layers', function() {
             assert.equal(analyses.length, 1, 'Invalid number of analyses in metadata');
             var nodes = analyses[0].nodes;
             var nodesIds = Object.keys(nodes);
-            assert.deepEqual(nodesIds, ['2570e105-7b37-40d2-bdf4-1af889598745', 'HEAD']);
+            assert.deepEqual(nodesIds, ['HEAD', '2570e105-7b37-40d2-bdf4-1af889598745']);
             nodesIds.forEach(function(nodeId) {
                 var node = nodes[nodeId];
                 assert.ok(node.hasOwnProperty('url'), 'Missing "url" attribute in node');

test/acceptance/analysis/named-maps.js

@@ -141,7 +141,7 @@ describe('named-maps analysis', function() {
                     assert.equal(analyses.length, 1, 'Invalid number of analyses in metadata');
                     var nodes = analyses[0].nodes;
                     var nodesIds = Object.keys(nodes);
-                    assert.deepEqual(nodesIds, ['2570e105-7b37-40d2-bdf4-1af889598745', 'HEAD']);
+                    assert.deepEqual(nodesIds, ['HEAD', '2570e105-7b37-40d2-bdf4-1af889598745']);
                     nodesIds.forEach(function(nodeId) {
                         var node = nodes[nodeId];
                         assert.ok(node.hasOwnProperty('url'), 'Missing "url" attribute in node');

test/acceptance/analysis/regressions.js

@@ -46,9 +46,9 @@ describe('analysis-layers regressions', function() {
             "analyses": [
                 {
                     "id": "a4",
-                    "type": "intersection",
+                    "type": "point-in-polygon",
                     "params": {
-                        "source": {
+                        "polygons_source": {
                             "id": "a3",
                             "type": "buffer",
                             "params": {
@@ -76,7 +76,7 @@ describe('analysis-layers regressions', function() {
                                 "radius": 200000
                             }
                         },
-                        "target": {
+                        "points_source": {
                             "id": "customer_home_locations",
                             "type": "source",
                             "params": {
@@ -100,10 +100,13 @@ describe('analysis-layers regressions', function() {
             assert.equal(analyses.length, 1);
 
             var expectedIds = ['customer_home_locations', 'b0', 'b1', 'a2', 'a3', 'a4'];
-            assert.equal(Object.keys(analyses[0].nodes).length, expectedIds.length, Object.keys(analyses[0].nodes));
             expectedIds.forEach(function(expectedId) {
-                analyses[0].nodes.hasOwnProperty(expectedId);
+                assert.ok(
+                    analyses[0].nodes.hasOwnProperty(expectedId),
+                    'Missing "' + expectedId + '" from node list.'
+                );
             });
+            assert.equal(Object.keys(analyses[0].nodes).length, expectedIds.length, Object.keys(analyses[0].nodes));
 
             testClient.drain(done);
         });

test/acceptance/turbo-cartocss/error-cases.js

@@ -56,7 +56,7 @@ describe('turbo-carto error cases', function() {
 
             assert.ok(layergroup.hasOwnProperty('errors'));
             assert.equal(layergroup.errors.length, 1);
-            assert.ok(layergroup.errors[0].match(/^turbo-carto/));
+            assert.ok(layergroup.errors[0].match(/^Failed\sto\sprocess/));
             assert.ok(layergroup.errors[0].match(/invalid\sramp\slength/i));
 
             done();
@@ -70,7 +70,7 @@ describe('turbo-carto error cases', function() {
 
             assert.ok(layergroup.hasOwnProperty('errors'));
             assert.equal(layergroup.errors.length, 1);
-            assert.ok(layergroup.errors[0].match(/^turbo-carto/));
+            assert.ok(layergroup.errors[0].match(/^Failed\sto\sprocess/));
             assert.ok(layergroup.errors[0].match(/unable\sto\scompute\sramp/i));
             assert.ok(layergroup.errors[0].match(/wadus_column/));
 
@@ -85,7 +85,7 @@ describe('turbo-carto error cases', function() {
 
             assert.ok(layergroup.hasOwnProperty('errors'));
             assert.equal(layergroup.errors.length, 1);
-            assert.ok(layergroup.errors[0].match(/^turbo-carto/));
+            assert.ok(layergroup.errors[0].match(/^Failed\sto\sprocess/));
             assert.ok(layergroup.errors[0].match(/unable\sto\scompute\sramp/i));
             assert.ok(layergroup.errors[0].match(/invalid\smethod\s\"wadusmethod\"/i));
 
@@ -100,7 +100,7 @@ describe('turbo-carto error cases', function() {
 
             assert.ok(layergroup.hasOwnProperty('errors'));
             assert.equal(layergroup.errors.length, 1);
-            assert.ok(!layergroup.errors[0].match(/^turbo-carto/));
+            assert.ok(!layergroup.errors[0].match(/^Failed\sto\sprocess/));
             assert.ok(layergroup.errors[0].match(/invalid\scode/i));
 
             done();
@@ -116,7 +116,7 @@ describe('turbo-carto error cases', function() {
             assert.equal(layergroup.errors_with_context.length, 1);
             assert.equal(layergroup.errors_with_context[0].type, 'layer');
             assert.equal(layergroup.errors_with_context[0].subtype, 'turbo-carto');
-            assert.ok(layergroup.errors_with_context[0].message.match(/^turbo-carto/));
+            assert.ok(layergroup.errors_with_context[0].message.match(/^Failed\sto\sprocess/));
             assert.ok(layergroup.errors_with_context[0].message.match(/unable\sto\scompute\sramp/i));
             assert.ok(layergroup.errors_with_context[0].message.match(/wadus_column/));
 
@@ -138,4 +138,53 @@ describe('turbo-carto error cases', function() {
             done();
         });
     });
+
+    it('should return multiple errors', function(done) {
+
+        var multipleErrorsMapConfig = {
+            "version": "1.4.0",
+            "layers": [
+                {
+                    "type": 'mapnik',
+                    "options": {
+                        "cartocss_version": '2.3.0',
+                        "sql": 'SELECT * FROM populated_places_simple_reduced',
+                        "cartocss": createCartocss(null, 'ramp([wadus_column], (red, green, blue))')
+                    }
+                },
+                {
+                    "type": 'mapnik',
+                    "options": {
+                        "cartocss_version": '2.3.0',
+                        "sql": 'SELECT * FROM populated_places_simple_reduced',
+                        "cartocss": createCartocss('ramp([invalid_column], (red, green, blue))')
+                    }
+                }
+            ]
+        };
+
+        this.testClient = new TestClient(multipleErrorsMapConfig);
+        this.testClient.getLayergroup(ERROR_RESPONSE, function(err, layergroup) {
+            assert.ok(!err, err);
+
+            assert.ok(layergroup.hasOwnProperty('errors'));
+            assert.equal(layergroup.errors_with_context.length, 2);
+
+            assert.equal(layergroup.errors_with_context[0].type, 'layer');
+            assert.equal(layergroup.errors_with_context[0].subtype, 'turbo-carto');
+            assert.ok(layergroup.errors_with_context[0].message.match(/^Failed\sto\sprocess/));
+            assert.ok(layergroup.errors_with_context[0].message.match(/unable\sto\scompute\sramp/i));
+            assert.ok(layergroup.errors_with_context[0].message.match(/wadus_column/));
+            assert.equal(layergroup.errors_with_context[0].layer.id, 'layer0');
+
+            assert.equal(layergroup.errors_with_context[1].type, 'layer');
+            assert.equal(layergroup.errors_with_context[1].subtype, 'turbo-carto');
+            assert.ok(layergroup.errors_with_context[1].message.match(/^Failed\sto\sprocess/));
+            assert.ok(layergroup.errors_with_context[1].message.match(/unable\sto\scompute\sramp/i));
+            assert.ok(layergroup.errors_with_context[1].message.match(/invalid_column/));
+            assert.equal(layergroup.errors_with_context[1].layer.id, 'layer1');
+
+            done();
+        });
+    });
 });

test/unit/cartodb/overviews_query_rewriter.js

@@ -527,7 +527,7 @@ describe('Overviews query rewriter', function() {
     it('generates query with filters', function(){
         var sql = "SELECT ST_Transform(the_geom, 3857) the_geom_webmercator, cartodb_id, name\
                    FROM (SELECT *\
-                   FROM (select * from table1) _camshaft_category_filter\
+                   FROM (select * from table1) _analysis_category_filter\
                    WHERE name IN ($escape_0$X$escape_0$)) _cdb_analysis_query";
         var data = {
             overviews: {
@@ -555,7 +555,7 @@ describe('Overviews query rewriter', function() {
                   SELECT * FROM table1_ov3, _vovw_scale WHERE _vovw_z = 3\
                   UNION ALL\
                   SELECT * FROM table1, _vovw_scale WHERE _vovw_z > 3\
-                ) AS _vovw_table1) _camshaft_category_filter\
+                ) AS _vovw_table1) _analysis_category_filter\
              WHERE name IN ($escape_0$X$escape_0$)\
         ";
         assertSameSql(overviews_sql, expected_sql);
@@ -564,7 +564,7 @@ describe('Overviews query rewriter', function() {
     it('generates query with filters for specific zoom level', function(){
         var sql = "SELECT ST_Transform(the_geom, 3857) the_geom_webmercator, cartodb_id, name\
                    FROM (SELECT *\
-                   FROM (select * from table1) _camshaft_category_filter\
+                   FROM (select * from table1) _analysis_category_filter\
                    WHERE name IN ($escape_0$X$escape_0$)) _cdb_analysis_query";
         var data = {
             overviews: {
@@ -581,7 +581,7 @@ describe('Overviews query rewriter', function() {
         };
         var overviews_sql = overviewsQueryRewriter.query(sql, data, { zoom_level: 2 });
         var expected_sql = "\
-            SELECT * FROM (SELECT * FROM table1_ov2) _camshaft_category_filter\
+            SELECT * FROM (SELECT * FROM table1_ov2) _analysis_category_filter\
             WHERE name IN ($escape_0$X$escape_0$)\
         ";
         assertSameSql(overviews_sql, expected_sql);
@@ -590,7 +590,7 @@ describe('Overviews query rewriter', function() {
     it('does not generates query with aggressive filtering', function(){
         var sql = "SELECT ST_Transform(the_geom, 3857) the_geom_webmercator, cartodb_id, name\
                    FROM (SELECT *\
-                   FROM (select * from table1) _camshaft_category_filter\
+                   FROM (select * from table1) _analysis_category_filter\
                    WHERE name IN ($escape_0$X$escape_0$)) _cdb_analysis_query";
         var data = {
             overviews: {