Release 2.41.0

Upgrade camshaft to 0.7.0

.jshintrc

@@ -82,13 +82,14 @@
 //    "wsh"           : false,    // Windows Scripting Host
 //    "yui"           : false,    // Yahoo User Interface
 
-    // Custom Globals
-    "globals"       : { // additional predefined global variables
-        "describe": true,
-        "before": true,
-        "after": true,
-        "beforeEach": true,
-        "afterEach": true,
-        "it": true
-    }
+    // Custom predefined global variables
+    "predef": [
+        "-console", // disallows console, use debug
+        "beforeEach",
+        "afterEach",
+        "before",
+        "after",
+        "describe",
+        "it"
+    ]
 }

NEWS.md

@@ -1,5 +1,75 @@
 # Changelog
 
+## 2.41.0
+
+Released 2016-05-11
+
+Announcements:
+ - Upgrades camshaft to [0.7.0](https://github.com/CartoDB/camshaft/releases/tag/0.7.0)
+
+
+## 2.40.0
+
+Released 2016-05-10
+
+Enhancements:
+ - Use original query from source nodes #444
+
+New features:
+ - Allow override zoom+center or bbox for static named maps previews #443
+ - Analysis layers can have a sql_wrap option to wrap node queries #441
+
+
+## 2.39.0
+
+Released 2016-05-05
+
+Announcements:
+ - Upgrades step-profiler to 0.3.0 to avoid dots in json keys #438
+ - Use a more aggressive cache control header for node status endpoint
+
+
+## 2.38.1
+
+Released 2016-05-05
+
+Announcements:
+ - Fixes problem in turbo-carto dependency
+ - Removes console usages
+
+
+## 2.38.0
+
+Released 2016-05-05
+
+Announcements:
+ - Upgrades turbo-carto to [0.7.0](https://github.com/CartoDB/turbo-carto/releases/tag/0.7.0)
+
+
+## 2.37.0
+
+Released 2016-05-03
+
+Announcements:
+ - Upgrades camshaft to [0.6.0](https://github.com/CartoDB/camshaft/releases/tag/0.6.0)
+
+
+## 2.36.1
+
+Released 2016-04-29
+
+Announcements:
+ - Upgrades camshaft to [0.5.1](https://github.com/CartoDB/camshaft/releases/tag/0.5.1)
+
+
+## 2.36.0
+
+Released 2016-04-28
+
+Announcements:
+ - Upgrades windshaft to [1.19.0](https://github.com/CartoDB/Windshaft/releases/tag/1.19.0)
+
+
 ## 2.35.0
 
 Released 2016-04-27

app.js

@@ -14,6 +14,11 @@ if ( process.argv[2] ) {
     ENVIRONMENT = 'development';
 }
 
+// jshint undef:false
+var log = console.log.bind(console);
+var logError = console.error.bind(console);
+// jshint undef:true
+
 var availableEnvironments = {
     production: true,
     staging: true,
@@ -22,8 +27,8 @@ var availableEnvironments = {
 
 // sanity check
 if (!availableEnvironments[ENVIRONMENT]){
-    console.error('node app.js [environment]');
-    console.error('environments: %s', Object.keys(availableEnvironments).join(', '));
+    logError('node app.js [environment]');
+    logError('environments: %s', Object.keys(availableEnvironments).join(', '));
     process.exit(1);
 }
 
@@ -58,10 +63,10 @@ if ( global.environment.log_filename ) {
   // See cwd inlog4js.configure call below
   logdir = path.resolve(__dirname, logdir);
   if ( ! fs.existsSync(logdir) ) {
-    console.error("Log filename directory does not exist: " + logdir);
+    logError("Log filename directory does not exist: " + logdir);
     process.exit(1);
   }
-  console.log("Logs will be written to " + global.environment.log_filename);
+  log("Logs will be written to " + global.environment.log_filename);
   log4js_config.appenders.push(
     { type: "file", filename: global.environment.log_filename }
   );
@@ -94,7 +99,7 @@ var listener = server.listen(serverOptions.bind.port, serverOptions.bind.host, b
 var version = require("./package").version;
 
 listener.on('listening', function() {
-    console.log(
+    log(
         "Windshaft tileserver %s started on %s:%s PID=%d (%s)",
         version, serverOptions.bind.host, serverOptions.bind.port, process.pid, ENVIRONMENT
     );
@@ -111,7 +116,7 @@ process.on('SIGHUP', function() {
     global.log4js.clearAndShutdownAppenders(function() {
         global.log4js.configure(log4js_config);
         global.logger = global.log4js.getLogger();
-        console.log('Log files reloaded');
+        log('Log files reloaded');
     });
 });
 

config/environments/development.js.example

@@ -163,6 +163,10 @@ var config = {
               // Returning the portion of a geometry falling within a rectangle
               // It will only work if snapToGrid is enabled
               clipByBox2d: false, // this requires postgis >=2.2 and geos >=3.5
+              // geometries will be simplified using ST_RemoveRepeatedPoints
+              // which cost is no more expensive than snapping and results are
+              // much closer to the original geometry
+              removeRepeatedPoints: false // this requires postgis >=2.2
           }
 
       },

config/environments/production.js.example

@@ -157,6 +157,10 @@ var config = {
               // Returning the portion of a geometry falling within a rectangle
               // It will only work if snapToGrid is enabled
               clipByBox2d: false, // this requires postgis >=2.2 and geos >=3.5
+              // geometries will be simplified using ST_RemoveRepeatedPoints
+              // which cost is no more expensive than snapping and results are
+              // much closer to the original geometry
+              removeRepeatedPoints: false // this requires postgis >=2.2
           }
 
       },

config/environments/staging.js.example

@@ -157,6 +157,10 @@ var config = {
               // Returning the portion of a geometry falling within a rectangle
               // It will only work if snapToGrid is enabled
               clipByBox2d: false, // this requires postgis >=2.2 and geos >=3.5
+              // geometries will be simplified using ST_RemoveRepeatedPoints
+              // which cost is no more expensive than snapping and results are
+              // much closer to the original geometry
+              removeRepeatedPoints: false // this requires postgis >=2.2
           }
 
       },

config/environments/test.js.example

@@ -156,7 +156,11 @@ var config = {
               // SQL queries will be wrapped with ST_ClipByBox2D
               // Returning the portion of a geometry falling within a rectangle
               // It will only work if snapToGrid is enabled
-              clipByBox2d: false // this requires postgis >=2.2 and geos >=3.5
+              clipByBox2d: false, // this requires postgis >=2.2 and geos >=3.5
+              // geometries will be simplified using ST_RemoveRepeatedPoints
+              // which cost is no more expensive than snapping and results are
+              // much closer to the original geometry
+              removeRepeatedPoints: false // this requires postgis >=2.2
           }
       },
       http: {

docs/named_maps.md

@@ -451,6 +451,7 @@ callback({
 ```
 
 ## CartoDB.js for Named Maps
+
 You can use a Named Map that you created (which is defined by its `name`), to create a map using CartoDB.js. This is achieved by adding the [`namedmap` type](http://docs.cartodb.com/cartodb-platform/cartodb-js/layer-source-object/#named-maps-layer-source-object-type-namedmap) layer source object to draw the Named Map.
 
 ```javascript
@@ -478,16 +479,48 @@ You can use a Named Map that you created (which is defined by its `name`), to cr
   }
 }
 ```
+
 **Note:** Instantiating a Named Map over a `createLayer` does not require an API Key and by default, does not include auth tokens. _If_ you defined auth tokens for the Named Map configuration, then you will have to include them.
 
 [CartoDB.js](http://docs.cartodb.com/cartodb-platform/cartodb-js/) has methods for accessing your Named Maps.
 
 1. [layer.setParams()](http://docs.cartodb.com/cartodb-platform/cartodb-js/api-methods/#layersetparamskey-value) allows you to change the template variables (in the placeholders object) via JavaScript
 
-    **Note:** The CartoDB.js `layer.setParams()` function is not supported when using Named Maps for Torque.
+    **Note:** The CartoDB.js `layer.setParams()` function is not supported when using Named Maps for Torque. Alternatively, you can create a [Torque layer in a Named Map](http://bl.ocks.org/iriberri/de37be6406f9cc7cfe5a)
 
 2. [layer.setAuthToken()](http://docs.cartodb.com/cartodb-platform/cartodb-js/api-methods/#layersetauthtokenauthtoken) allows you to set the auth tokens to create the layer
 
+### Torque Layer in a Named Map
+
+If you are creating a Torque layer in a Named Map without using the Torque.js library, you can apply the Torque layer by applying the following code with CartoDBjs:
+
+```javascript
+ // add cartodb layer with one sublayer
+  cartodb.createLayer(map, {
+    user_name: '{username}',
+    type: 'torque',
+    order: 1,
+    options: {
+            query: "",
+            table_name: "named_map_tutorial_table",
+            user_name: "{username}",
+            tile_style: 'Map { -torque-frame-count:512; -torque-animation-duration:10; -torque-time-attribute:"cartodb_id"; -torque-aggregation-function:"count(cartodb_id)"; -torque-resolution:2; -torque-data-aggregation:linear; } #named_map_tutorial_table_copy{ comp-op: lighter; marker-fill-opacity: 0.9; marker-line-color: #FFF; marker-line-width: 1.5; marker-line-opacity: 1; marker-type: ellipse; marker-width: 6; marker-fill: #FF9900; } #named_map_tutorial_table_copy[frame-offset=1] { marker-width:8; marker-fill-opacity:0.45; } #named_map_tutorial_table_copy[frame-offset=2] { marker-width:10; marker-fill-opacity:0.225; }'      
+
+            },
+    named_map: {
+      name: "{namedmap_example}",
+      layers: [{
+        layer_name: "t"
+       }]
+     }
+    })
+    .addTo(map)
+    .done(function(layer) {
+  
+    });
+}
+```
+
 #### Examples of Named Maps created with CartoDB.js
 
 - [Named Map selectors with interaction](http://bl.ocks.org/ohasselblad/515a8af1f99d5e690484)

lib/cartodb/controllers/base.js

@@ -14,6 +14,9 @@ var REQUEST_QUERY_PARAMS_WHITELIST = [
     'api_key',
     'auth_token',
     'callback',
+    'zoom',
+    'lon',
+    'lat',
     // widgets & filters
     'filters', // json
     'own_filter', // 0, 1

lib/cartodb/controllers/layergroup.js

@@ -116,7 +116,10 @@ LayergroupController.prototype.analysisNodeStatus = function(req, res) {
             if (err) {
                 self.sendError(req, res, err, 'GET NODE STATUS');
             } else {
-                self.sendResponse(req, res, nodeStatus, 200);
+                self.sendResponse(req, res, nodeStatus, 200, {
+                    'Cache-Control': 'public,max-age=5',
+                    'Last-Modified': new Date().toUTCString()
+                });
             }
         }
     );

lib/cartodb/controllers/named_maps.js

@@ -140,7 +140,7 @@ NamedMapsController.prototype.staticMap = function(req, res) {
         function prepareImageOptions(err, _namedMapProvider) {
             assert.ifError(err);
             namedMapProvider = _namedMapProvider;
-            self.getStaticImageOptions(cdbUser, namedMapProvider, this);
+            self.getStaticImageOptions(cdbUser, req.params, namedMapProvider, this);
         },
         function getImage(err, imageOpts) {
             assert.ifError(err);
@@ -192,9 +192,37 @@ var DEFAULT_ZOOM_CENTER = {
     }
 };
 
-NamedMapsController.prototype.getStaticImageOptions = function(cdbUser, namedMapProvider, callback) {
+function numMapper(n) {
+    return +n;
+}
+
+NamedMapsController.prototype.getStaticImageOptions = function(cdbUser, params, namedMapProvider, callback) {
     var self = this;
 
+    if ([params.zoom, params.lon, params.lat].map(numMapper).every(Number.isFinite)) {
+        return callback(null, {
+            zoom: params.zoom,
+            center: {
+                lng: params.lon,
+                lat: params.lat
+            }
+        });
+    }
+
+    if (params.bbox) {
+        var bbox = params.bbox.split(',').map(numMapper);
+        if (bbox.length === 4 && bbox.every(Number.isFinite)) {
+            return callback(null, {
+                bounds: {
+                    west: bbox[0],
+                    south: bbox[1],
+                    east: bbox[2],
+                    north: bbox[3]
+                }
+            });
+        }
+    }
+
     step(
         function getTemplate() {
             namedMapProvider.getTemplate(this);
@@ -205,6 +233,9 @@ NamedMapsController.prototype.getStaticImageOptions = function(cdbUser, namedMap
             if (template.view) {
                 var zoomCenter = templateZoomCenter(template.view);
                 if (zoomCenter) {
+                    if (Number.isFinite(+params.zoom)) {
+                        zoomCenter.zoom = +params.zoom;
+                    }
                     return zoomCenter;
                 }
 

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

@@ -26,9 +26,12 @@ var layerQueryTemplate = dot.template([
     'FROM ({{=it._query}}) _cdb_analysis_query'
 ].join('\n'));
 
-function layerQuery(query, columnNames) {
-    var _columns = ['ST_Transform(the_geom, 3857) the_geom_webmercator'].concat(skipColumns(columnNames));
-    return layerQueryTemplate({ _query: query, _columns: _columns.join(', ') });
+function layerQuery(node) {
+    if (node.type === 'source') {
+        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(', ') });
 }
 
 function appendFiltersToNodes(requestMapConfig, dataviewsFiltersBySourceId) {
@@ -139,7 +142,12 @@ AnalysisMapConfigAdapter.prototype.getMapConfig = function(analysisConfiguration
                 var layerSourceId = getLayerSourceId(layer);
                 var layerNode = sourceId2Node[layerSourceId];
                 if (layerNode) {
-                    layer.options.sql = layerQuery(layerNode.getQuery(), layerNode.getColumns());
+                    var analysisSql = layerQuery(layerNode);
+                    var sqlQueryWrap = layer.options.sql_wrap;
+                    if (sqlQueryWrap) {
+                        analysisSql = sqlQueryWrap.replace(/<%=\s*sql\s*%>/g, analysisSql);
+                    }
+                    layer.options.sql = analysisSql;
                     var layerDataviews = getLayerDataviews(layer, dataviews);
                     layer.options.columns = layerDataviews.reduce(function(columns, dataview) {
                         return columns.concat(getDataviewColumns(dataview));

lib/cartodb/server.js

@@ -3,6 +3,7 @@ var bodyParser = require('body-parser');
 var RedisPool = require('redis-mpool');
 var cartodbRedis = require('cartodb-redis');
 var _ = require('underscore');
+var debug = require('debug')('windshaft:cartodb');
 
 var controller = require('./controllers');
 
@@ -231,7 +232,7 @@ function validateOptions(opts) {
 
     // Be nice and warn if configured mapnik version is != instaled mapnik version
     if (mapnik.versions.mapnik !== opts.grainstore.mapnik_version) {
-        console.warn('WARNING: detected mapnik version (' + mapnik.versions.mapnik + ')' +
+        debug('WARNING: detected mapnik version (' + mapnik.versions.mapnik + ')' +
             ' != configured mapnik version (' + opts.grainstore.mapnik_version + ')');
     }
 }

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.35.0",
+  "version": "2.41.0",
   "dependencies": {
     "body-parser": {
       "version": "1.14.2",
@@ -13,9 +13,9 @@
           "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.2.0.tgz"
         },
         "content-type": {
-          "version": "1.0.1",
+          "version": "1.0.2",
           "from": "content-type@>=1.0.1 <1.1.0",
-          "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz"
+          "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz"
         },
         "depd": {
           "version": "1.1.0",
@@ -73,14 +73,14 @@
             },
             "unpipe": {
               "version": "1.0.0",
-              "from": "unpipe@>=1.0.0 <1.1.0",
+              "from": "unpipe@1.0.0",
               "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
             }
           }
         },
         "type-is": {
           "version": "1.6.12",
-          "from": "type-is@>=1.6.6 <1.7.0",
+          "from": "type-is@>=1.6.10 <1.7.0",
           "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.12.tgz",
           "dependencies": {
             "media-typer": {
@@ -89,14 +89,14 @@
               "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
             },
             "mime-types": {
-              "version": "2.1.10",
+              "version": "2.1.11",
               "from": "mime-types@>=2.1.10 <2.2.0",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
               "dependencies": {
                 "mime-db": {
-                  "version": "1.22.0",
-                  "from": "mime-db@>=1.22.0 <1.23.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
+                  "version": "1.23.0",
+                  "from": "mime-db@>=1.23.0 <1.24.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"
                 }
               }
             }
@@ -105,9 +105,9 @@
       }
     },
     "camshaft": {
-      "version": "0.5.0",
-      "from": "camshaft@0.5.0",
-      "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.5.0.tgz",
+      "version": "0.7.0",
+      "from": "camshaft@0.7.0",
+      "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.7.0.tgz",
       "dependencies": {
         "async": {
           "version": "1.5.2",
@@ -125,28 +125,9 @@
               "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
             },
             "aws4": {
-              "version": "1.3.2",
+              "version": "1.4.1",
               "from": "aws4@>=1.2.1 <2.0.0",
-              "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.3.2.tgz",
-              "dependencies": {
-                "lru-cache": {
-                  "version": "4.0.1",
-                  "from": "lru-cache@>=4.0.0 <5.0.0",
-                  "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz",
-                  "dependencies": {
-                    "pseudomap": {
-                      "version": "1.0.2",
-                      "from": "pseudomap@>=1.0.1 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"
-                    },
-                    "yallist": {
-                      "version": "2.0.0",
-                      "from": "yallist@>=2.0.0 <3.0.0",
-                      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz"
-                    }
-                  }
-                }
-              }
+              "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz"
             },
             "bl": {
               "version": "1.1.2",
@@ -174,9 +155,9 @@
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
                     },
                     "process-nextick-args": {
-                      "version": "1.0.6",
+                      "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.6.tgz"
+                      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
@@ -395,9 +376,9 @@
                   }
                 },
                 "sshpk": {
-                  "version": "1.8.2",
+                  "version": "1.8.3",
                   "from": "sshpk@>=1.7.0 <2.0.0",
-                  "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.2.tgz",
+                  "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz",
                   "dependencies": {
                     "asn1": {
                       "version": "0.2.3",
@@ -415,9 +396,9 @@
                       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.13.1.tgz"
                     },
                     "getpass": {
-                      "version": "0.1.5",
+                      "version": "0.1.6",
                       "from": "getpass@>=0.1.1 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.5.tgz"
+                      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz"
                     },
                     "jsbn": {
                       "version": "0.1.0",
@@ -459,14 +440,14 @@
               "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
             },
             "mime-types": {
-              "version": "2.1.10",
+              "version": "2.1.11",
               "from": "mime-types@>=2.1.7 <2.2.0",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
               "dependencies": {
                 "mime-db": {
-                  "version": "1.22.0",
-                  "from": "mime-db@>=1.22.0 <1.23.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
+                  "version": "1.23.0",
+                  "from": "mime-db@>=1.23.0 <1.24.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"
                 }
               }
             },
@@ -476,9 +457,9 @@
               "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
             },
             "oauth-sign": {
-              "version": "0.8.1",
+              "version": "0.8.2",
               "from": "oauth-sign@>=0.8.1 <0.9.0",
-              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz"
+              "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"
             },
             "qs": {
               "version": "6.1.0",
@@ -496,9 +477,9 @@
               "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"
             },
             "tunnel-agent": {
-              "version": "0.4.2",
+              "version": "0.4.3",
               "from": "tunnel-agent@>=0.4.1 <0.5.0",
-              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz"
+              "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
             }
           }
         }
@@ -602,14 +583,14 @@
           "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz",
           "dependencies": {
             "mime-types": {
-              "version": "2.1.10",
+              "version": "2.1.11",
               "from": "mime-types@>=2.1.6 <2.2.0",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
               "dependencies": {
                 "mime-db": {
-                  "version": "1.22.0",
-                  "from": "mime-db@>=1.22.0 <1.23.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
+                  "version": "1.23.0",
+                  "from": "mime-db@>=1.23.0 <1.24.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"
                 }
               }
             },
@@ -631,9 +612,9 @@
           "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz"
         },
         "content-type": {
-          "version": "1.0.1",
+          "version": "1.0.2",
           "from": "content-type@>=1.0.1 <1.1.0",
-          "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz"
+          "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz"
         },
         "cookie": {
           "version": "0.1.5",
@@ -782,7 +763,7 @@
         },
         "type-is": {
           "version": "1.6.12",
-          "from": "type-is@>=1.6.6 <1.7.0",
+          "from": "type-is@>=1.6.10 <1.7.0",
           "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.12.tgz",
           "dependencies": {
             "media-typer": {
@@ -791,14 +772,14 @@
               "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
             },
             "mime-types": {
-              "version": "2.1.10",
+              "version": "2.1.11",
               "from": "mime-types@>=2.1.6 <2.2.0",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
               "dependencies": {
                 "mime-db": {
-                  "version": "1.22.0",
-                  "from": "mime-db@>=1.22.0 <1.23.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
+                  "version": "1.23.0",
+                  "from": "mime-db@>=1.23.0 <1.24.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"
                 }
               }
             }
@@ -955,9 +936,9 @@
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
                 },
                 "process-nextick-args": {
-                  "version": "1.0.6",
+                  "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.6.tgz"
+                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
@@ -995,7 +976,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"
             }
           }
@@ -1006,14 +987,14 @@
           "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
         },
         "mime-types": {
-          "version": "2.1.10",
+          "version": "2.1.11",
           "from": "mime-types@>=2.1.2 <2.2.0",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
           "dependencies": {
             "mime-db": {
-              "version": "1.22.0",
-              "from": "mime-db@>=1.22.0 <1.23.0",
-              "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
+              "version": "1.23.0",
+              "from": "mime-db@>=1.23.0 <1.24.0",
+              "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"
             }
           }
         },
@@ -1028,9 +1009,9 @@
           "resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz"
         },
         "tunnel-agent": {
-          "version": "0.4.2",
+          "version": "0.4.3",
           "from": "tunnel-agent@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz"
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
         },
         "tough-cookie": {
           "version": "2.2.2",
@@ -1060,9 +1041,9 @@
           }
         },
         "oauth-sign": {
-          "version": "0.8.1",
+          "version": "0.8.2",
           "from": "oauth-sign@>=0.8.0 <0.9.0",
-          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz"
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"
         },
         "hawk": {
           "version": "3.1.3",
@@ -1230,20 +1211,24 @@
       "resolved": "https://registry.npmjs.org/step/-/step-0.0.6.tgz"
     },
     "step-profiler": {
-      "version": "0.2.1",
-      "from": "step-profiler@>=0.2.1 <0.3.0",
-      "resolved": "https://registry.npmjs.org/step-profiler/-/step-profiler-0.2.1.tgz"
+      "version": "0.3.0",
+      "from": "step-profiler@>=0.3.0 <0.4.0"
     },
     "turbo-carto": {
-      "version": "0.6.0",
-      "from": "turbo-carto@0.6.0",
-      "resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.6.0.tgz",
+      "version": "0.7.1",
+      "from": "turbo-carto@0.7.1",
+      "resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.7.1.tgz",
       "dependencies": {
         "colorbrewer": {
           "version": "1.0.0",
           "from": "colorbrewer@1.0.0",
           "resolved": "https://registry.npmjs.org/colorbrewer/-/colorbrewer-1.0.0.tgz"
         },
+        "cartocolor": {
+          "version": "1.0.2",
+          "from": "cartocolor@1.0.2",
+          "resolved": "https://registry.npmjs.org/cartocolor/-/cartocolor-1.0.2.tgz"
+        },
         "es6-promise": {
           "version": "3.1.2",
           "from": "es6-promise@3.1.2",
@@ -1267,9 +1252,9 @@
               }
             },
             "source-map": {
-              "version": "0.5.5",
+              "version": "0.5.6",
               "from": "source-map@>=0.5.1 <0.6.0",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.5.tgz"
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
             },
             "js-base64": {
               "version": "2.1.9",
@@ -1291,9 +1276,9 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "1.18.0",
-      "from": "windshaft@1.18.0",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.18.0.tgz",
+      "version": "1.19.0",
+      "from": "windshaft@1.19.0",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.19.0.tgz",
       "dependencies": {
         "abaculus": {
           "version": "1.1.0-cdb4",
@@ -1314,8 +1299,8 @@
         },
         "carto": {
           "version": "0.15.1-cdb1",
-          "from": "https://github.com/CartoDB/carto/tarball/0.15.1-cdb1",
-          "resolved": "https://github.com/CartoDB/carto/tarball/0.15.1-cdb1",
+          "from": "https://github.com/CartoDB/carto/tarball/0.15.1-cdb2",
+          "resolved": "https://github.com/CartoDB/carto/tarball/0.15.1-cdb2",
           "dependencies": {
             "mapnik-reference": {
               "version": "6.0.5",

package.json

@@ -1,61 +1,61 @@
 {
-    "private": true,
-    "name": "windshaft-cartodb",
-    "version": "2.35.0",
-    "description": "A map tile server for CartoDB",
-    "keywords": [
-      "cartodb"
-    ],
-    "url": "https://github.com/CartoDB/Windshaft-cartodb",
-    "license": "BSD-3-Clause",
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/CartoDB/Windshaft-cartodb.git"
-    },
-    "author": "Vizzuality <contact@vizzuality.com> (http://vizzuality.com)",
-    "contributors": [
-      "Simon Tokumine <simon@vizzuality.com>",
-      "Javi Santana <jsantana@vizzuality.com>",
-      "Sandro Santilli <strk@vizzuality.com>"
-    ],
-    "dependencies": {
-        "express": "~4.13.3",
-        "body-parser": "~1.14.0",
-        "debug": "~2.2.0",
-        "step-profiler": "~0.2.1",
-        "node-statsd": "~0.0.7",
-        "underscore"  : "~1.6.0",
-        "dot": "~1.0.2",
-        "windshaft": "1.18.0",
-        "step": "~0.0.6",
-        "queue-async": "~1.0.7",
-        "request": "~2.62.0",
-        "cartodb-redis": "~0.13.0",
-        "cartodb-psql": "~0.6.1",
-        "camshaft": "0.5.0",
-        "fastly-purge": "~1.0.1",
-        "redis-mpool": "~0.4.0",
-        "lru-cache": "2.6.5",
-        "lzma": "~1.3.7",
-        "log4js": "https://github.com/CartoDB/log4js-node/tarball/cdb",
-        "cartodb-query-tables": "~0.1.0",
-        "turbo-carto": "0.6.0"
-    },
-    "devDependencies": {
-        "istanbul": "~0.3.6",
-        "mocha": "~1.21.4",
-        "nock": "~2.11.0",
-        "jshint": "~2.6.0",
-        "redis": "~0.8.6",
-        "strftime": "~0.8.2",
-        "semver": "~1.1.4"
-    },
-    "scripts": {
-        "preinstall": "make pre-install",
-        "test": "make test-all"
-    },
-    "engines": {
-        "node": ">=0.8 <0.11",
-        "npm": ">=2.14.16"
-    }
+  "private": true,
+  "name": "windshaft-cartodb",
+  "version": "2.41.0",
+  "description": "A map tile server for CartoDB",
+  "keywords": [
+    "cartodb"
+  ],
+  "url": "https://github.com/CartoDB/Windshaft-cartodb",
+  "license": "BSD-3-Clause",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/CartoDB/Windshaft-cartodb.git"
+  },
+  "author": "Vizzuality <contact@vizzuality.com> (http://vizzuality.com)",
+  "contributors": [
+    "Simon Tokumine <simon@vizzuality.com>",
+    "Javi Santana <jsantana@vizzuality.com>",
+    "Sandro Santilli <strk@vizzuality.com>"
+  ],
+  "dependencies": {
+    "body-parser": "~1.14.0",
+    "camshaft": "0.7.0",
+    "cartodb-psql": "~0.6.1",
+    "cartodb-query-tables": "~0.1.0",
+    "cartodb-redis": "~0.13.0",
+    "debug": "~2.2.0",
+    "dot": "~1.0.2",
+    "express": "~4.13.3",
+    "fastly-purge": "~1.0.1",
+    "log4js": "https://github.com/CartoDB/log4js-node/tarball/cdb",
+    "lru-cache": "2.6.5",
+    "lzma": "~1.3.7",
+    "node-statsd": "~0.0.7",
+    "queue-async": "~1.0.7",
+    "redis-mpool": "~0.4.0",
+    "request": "~2.62.0",
+    "step": "~0.0.6",
+    "step-profiler": "~0.3.0",
+    "turbo-carto": "0.7.1",
+    "underscore": "~1.6.0",
+    "windshaft": "1.19.0"
+  },
+  "devDependencies": {
+    "istanbul": "~0.4.3",
+    "jshint": "~2.6.0",
+    "mocha": "~1.21.4",
+    "nock": "~2.11.0",
+    "redis": "~0.8.6",
+    "semver": "~1.1.4",
+    "strftime": "~0.8.2"
+  },
+  "scripts": {
+    "preinstall": "make pre-install",
+    "test": "make test-all"
+  },
+  "engines": {
+    "node": ">=0.8 <0.11",
+    "npm": ">=2.14.16"
+  }
 }

test/acceptance/analysis/analysis-layers-use-cases.js

@@ -3,6 +3,7 @@ require('../../support/test_helper');
 var assert = require('../../support/assert');
 var TestClient = require('../../support/test-client');
 var dot = require('dot');
+var debug = require('debug')('windshaft:cartodb:test');
 
 describe('analysis-layers use cases', function() {
 
@@ -649,7 +650,7 @@ describe('analysis-layers use cases', function() {
 
     useCases.forEach(function(useCase, imageIdx) {
         if (!!useCase.skip) {
-            console.log(JSON.stringify(useCase.mapConfig, null, 4));
+            debug(JSON.stringify(useCase.mapConfig, null, 4));
         }
         it.skip('should implement use case: "' + useCase.desc + '"', function(done) {
 

test/acceptance/analysis/analysis-layers.js

@@ -213,4 +213,158 @@ describe('analysis-layers', function() {
             testClient.drain(done);
         });
     });
+
+    it('should have analysis metadata when dataviews point to source node', function(done) {
+        var useCase = {
+            desc: 'basic source-id mapnik layer',
+            fixture: 'basic-source-id-mapnik-layer.png',
+            mapConfig: mapConfig(
+                [
+                    {
+                        "type": "cartodb",
+                        "options": {
+                            "sql": "select * from populated_places_simple_reduced",
+                            "cartocss": DEFAULT_MULTITYPE_STYLE,
+                            "cartocss_version": "2.3.0"
+                        }
+                    },
+                    {
+                        "type": "cartodb",
+                        "options": {
+                            "source": {
+                                "id": "2570e105-7b37-40d2-bdf4-1af889598745"
+                            },
+                            "cartocss": DEFAULT_MULTITYPE_STYLE,
+                            "cartocss_version": "2.3.0"
+                        }
+                    },
+                    {
+                        "type": "cartodb",
+                        "options": {
+                            "sql": "select * from populated_places_simple_reduced",
+                            "cartocss": DEFAULT_MULTITYPE_STYLE,
+                            "cartocss_version": "2.3.0"
+                        }
+                    }
+                ],
+                {
+                    pop_max_histogram: {
+                        source: {
+                            id: '2570e105-7b37-40d2-bdf4-1af889598745'
+                        },
+                        type: 'histogram',
+                        options: {
+                            column: 'pop_max'
+                        }
+                    },
+                    scalerank_histogram: {
+                        source: {
+                            id: '2570e105-7b37-40d2-bdf4-1af889598745'
+                        },
+                        type: 'histogram',
+                        options: {
+                            column: 'scalerank'
+                        }
+                    }
+                },
+                [
+                    {
+                        "id": "2570e105-7b37-40d2-bdf4-1af889598745",
+                        "type": "source",
+                        "params": {
+                            "query": "select * from populated_places_simple_reduced"
+                        }
+                    }
+                ]
+            )
+        };
+
+        var testClient = new TestClient(useCase.mapConfig, 1234);
+
+        testClient.getLayergroup(function(err, layergroupResult) {
+            assert.ok(!err, err);
+
+            assert.ok(
+                Array.isArray(layergroupResult.metadata.analyses),
+                    'Missing "analyses" array metadata from: ' + JSON.stringify(layergroupResult)
+            );
+            var analyses = layergroupResult.metadata.analyses;
+            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']);
+            nodesIds.forEach(function(nodeId) {
+                var node = nodes[nodeId];
+                assert.ok(node.hasOwnProperty('url'), 'Missing "url" attribute in node');
+                assert.ok(node.hasOwnProperty('status'), 'Missing "status" attribute in node');
+                assert.ok(node.hasOwnProperty('query'), 'Missing "status" attribute in node');
+            });
+
+            testClient.drain(done);
+        });
+    });
+
+    it('should response with custom cache headers for node status endpoints', function(done) {
+        var useCase = useCases[1];
+
+        // No API key here
+        var testClient = new TestClient(useCase.mapConfig, 1234);
+
+        testClient.getNodeStatus('HEAD', function(err, response, nodeStatus) {
+            assert.ok(!err, err);
+
+            assert.equal(nodeStatus.status, 'ready');
+
+            var headers = response.headers;
+
+            assert.equal(headers['cache-control'], 'public,max-age=5');
+
+            var lastModified = new Date(headers['last-modified']);
+            var tenSecondsInMs = 1e5;
+            assert.ok(Date.now() - lastModified.getTime() < tenSecondsInMs);
+
+            testClient.drain(done);
+        });
+    });
+
+    it('should wrap queries from analyses', function(done) {
+        var testClient = new TestClient(mapConfig(
+            [
+                {
+                    "type": "cartodb",
+                    "options": {
+                        "source": {
+                            "id": "2570e105-7b37-40d2-bdf4-1af889598745"
+                        },
+                        "sql_wrap": "SELECT * FROM (<%= sql %>) __wrapped WHERE adm0cap = 1",
+                        "cartocss": DEFAULT_MULTITYPE_STYLE,
+                        "cartocss_version": "2.3.0"
+                    }
+                }
+            ],
+            {},
+            [
+                {
+                    "id": "2570e105-7b37-40d2-bdf4-1af889598745",
+                    "type": "source",
+                    "params": {
+                        "query": "select * from populated_places_simple_reduced"
+                    }
+                }
+            ]
+        ), 1234);
+
+        var tile = TILE_ANALYSIS_TABLES;
+        testClient.getTile(tile.z, tile.x, tile.y, function(err, res, image) {
+            assert.ok(!err, err);
+
+            var fixturePath = './test/fixtures/analysis/adm0cap-source-id-mapnik-layer.png';
+            assert.imageIsSimilarToFile(image, fixturePath, IMAGE_TOLERANCE_PER_MIL, function(err) {
+                assert.ok(!err, err);
+
+                testClient.drain(done);
+            });
+        });
+    });
 });

test/acceptance/named_maps_static_view.js

@@ -1,3 +1,4 @@
+var qs = require('querystring');
 var testHelper = require('../support/test_helper');
 var RedisPool = require('redis-mpool');
 
@@ -53,10 +54,18 @@ describe('named maps static view', function() {
         templateMaps.delTemplate(username, templateName, done);
     });
 
-    function getStaticMap(callback) {
+    function getStaticMap(params, callback) {
+        if (!callback) {
+            callback = params;
+            params = null;
+        }
 
         var url = '/api/v1/map/static/named/' + templateName + '/640/480.png';
 
+        if (params !== null) {
+            url += '?' + qs.stringify(params);
+        }
+
         var requestOptions = {
             url: url,
             method: 'GET',
@@ -163,4 +172,30 @@ describe('named maps static view', function() {
         });
     });
 
+    it('should return override zoom', function (done) {
+        var view = {
+            bounds: {
+                west: 0,
+                south: 0,
+                east: 45,
+                north: 45
+            },
+            zoom: 4,
+            center: {
+                lng: 40,
+                lat: 20
+            }
+        };
+        templateMaps.addTemplate(username, createTemplate(view), function (err) {
+            if (err) {
+                return done(err);
+            }
+            getStaticMap({ zoom: 3 }, function(err, img) {
+                assert.ok(!err);
+                img.save('/tmp/static.png');
+                assert.imageIsSimilarToFile(img, previewFixture('override-zoom'), IMAGE_TOLERANCE, done);
+            });
+        });
+    });
+
 });

test/support/test-client.js

@@ -2,6 +2,7 @@
 
 var qs = require('querystring');
 var step = require('step');
+var urlParser = require('url');
 
 var mapnik = require('windshaft').mapnik;
 
@@ -379,6 +380,94 @@ TestClient.prototype.getLayergroup = function(expectedResponse, callback) {
     );
 };
 
+TestClient.prototype.getNodeStatus = function(nodeName, callback) {
+    var self = this;
+
+    var url = '/api/v1/map';
+
+    if (this.apiKey) {
+        url += '?' + qs.stringify({api_key: this.apiKey});
+    }
+
+    var layergroupId;
+    var nodes = {};
+    step(
+        function createLayergroup() {
+            var next = this;
+            assert.response(server,
+                {
+                    url: url,
+                    method: 'POST',
+                    headers: {
+                        host: 'localhost',
+                        'Content-Type': 'application/json'
+                    },
+                    data: JSON.stringify(self.mapConfig)
+                },
+                {
+                    status: 200,
+                    headers: {
+                        'Content-Type': 'application/json; charset=utf-8'
+                    }
+                },
+                function(res, err) {
+                    if (err) {
+                        return next(err);
+                    }
+                    var parsedBody = JSON.parse(res.body);
+
+                    nodes = parsedBody.metadata.analyses.reduce(function(nodes, analysis) {
+                        return Object.keys(analysis.nodes).reduce(function(nodes, nodeName) {
+                            var node = analysis.nodes[nodeName];
+                            nodes[nodeName] = node.url.http;
+                            return nodes;
+                        }, nodes);
+                    }, nodes);
+
+                    return next(null, parsedBody.layergroupid);
+                }
+            );
+        },
+        function getNodeStatusResult(err, _layergroupId) {
+            assert.ifError(err);
+
+            var next = this;
+            layergroupId = _layergroupId;
+
+            url = urlParser.parse(nodes[nodeName]).path;
+
+            if (self.apiKey) {
+                url += '?' + qs.stringify({api_key: self.apiKey});
+            }
+
+            var request = {
+                url: url,
+                method: 'GET',
+                headers: {
+                    host: 'localhost'
+                }
+            };
+
+            var expectedResponse = {
+                status: 200,
+                headers: {
+                    'Content-Type': 'application/json; charset=utf-8'
+                }
+            };
+
+            assert.response(server, request, expectedResponse, function(res, err) {
+                assert.ifError(err);
+                next(null, res, JSON.parse(res.body));
+            });
+        },
+        function finish(err, res, image) {
+            self.keysToDelete['map_cfg|' + LayergroupToken.parse(layergroupId).token] = 0;
+            self.keysToDelete['user:localhost:mapviews:global'] = 5;
+            return callback(err, res, image);
+        }
+    );
+};
+
 TestClient.prototype.drain = function(callback) {
     helper.deleteRedisKeys(this.keysToDelete, callback);
 };