Merge branch 'master' of github.com:CartoDB/Windshaft-cartodb into analysis-layers

NEWS.md

@@ -1,8 +1,14 @@
 # Changelog
 
-## 2.26.4
+## 2.27.0
 
-Released 2016-mm-dd
+Released 2016-03-09
+
+New features:
+ - Add [Surrogate-Key](https://github.com/CartoDB/cartodb/wiki/CartoDB-Surrogate-Keys) headers to responses
+
+Enhancements:
+ - Use new `node-cartodb-query-tables` library to obtain affected tables in queries
 
 Announcements:
  - Remove deprecated tools directory

lib/cartodb/controllers/map.js

@@ -173,20 +173,18 @@ MapController.prototype.create = function(req, res, prepareConfigFn) {
             );
         },
         function addOverviewsInformation(err, requestMapConfig, datasource) {
-          assert.ifError(err);
+            assert.ifError(err);
-          var next = this;
+            var next = this;
-          self.overviewsAdapter.getLayers(req.context.user, requestMapConfig.layers,
+            self.overviewsAdapter.getLayers(req.context.user, requestMapConfig.layers, function(err, layers) {
-              function(err, layers) {
+                if (err) {
-                  if (err) {
+                    return next(err);
-                      return next(err);
+                }
-                  }
 
-                  if (layers) {
+                if (layers) {
-                      requestMapConfig.layers = layers;
+                    requestMapConfig.layers = layers;
-                  }
+                }
-                  return next(null, requestMapConfig, datasource);
+                return next(null, requestMapConfig, datasource);
-              }
+            });
-          );
         },
         function createLayergroup(err, requestMapConfig, datasource) {
             assert.ifError(err);

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.26.4",
+  "version": "2.27.0",
   "dependencies": {
     "body-parser": {
       "version": "1.14.2",

package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.26.4",
+    "version": "2.27.0",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"