From cf8ce420493346ac24b9e643a278079ff6adc0da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Mart=C3=ADnez?= Date: Wed, 9 Mar 2016 17:56:52 +0100 Subject: [PATCH 1/3] Release 2.27.0 --- NEWS.md | 10 ++++++++-- npm-shrinkwrap.json | 2 +- package.json | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/NEWS.md b/NEWS.md index 5725bb77..701cea00 100644 --- a/NEWS.md +++ b/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 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 8f717453..222f1866 100644 --- a/npm-shrinkwrap.json +++ b/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", diff --git a/package.json b/package.json index ff706b08..4080f562 100644 --- a/package.json +++ b/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" From 15b54a2918461cd85ded2adba5bfab908b2d9661 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 9 Mar 2016 18:05:17 +0100 Subject: [PATCH 2/3] Re-indent --- lib/cartodb/controllers/map.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/cartodb/controllers/map.js b/lib/cartodb/controllers/map.js index ff164e9c..4bd15571 100644 --- a/lib/cartodb/controllers/map.js +++ b/lib/cartodb/controllers/map.js @@ -152,20 +152,20 @@ MapController.prototype.create = function(req, res, prepareConfigFn) { ); }, function addOverviewsInformation(err, requestMapConfig, datasource) { - assert.ifError(err); - var next = this; - self.overviewsAdapter.getLayers(req.context.user, requestMapConfig.layers, - function(err, layers) { - if (err) { - return next(err); - } + assert.ifError(err); + var next = this; + self.overviewsAdapter.getLayers(req.context.user, requestMapConfig.layers, + function(err, layers) { + if (err) { + return next(err); + } - if (layers) { - requestMapConfig.layers = layers; - } - return next(null, requestMapConfig, datasource); - } - ); + if (layers) { + requestMapConfig.layers = layers; + } + return next(null, requestMapConfig, datasource); + } + ); }, function createLayergroup(err, requestMapConfig, datasource) { assert.ifError(err); From bbfcc640d14cabc7b39dee4526ce477d2043c14d Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 9 Mar 2016 18:08:06 +0100 Subject: [PATCH 3/3] Style --- lib/cartodb/controllers/map.js | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/lib/cartodb/controllers/map.js b/lib/cartodb/controllers/map.js index 4bd15571..2649271c 100644 --- a/lib/cartodb/controllers/map.js +++ b/lib/cartodb/controllers/map.js @@ -154,18 +154,16 @@ MapController.prototype.create = function(req, res, prepareConfigFn) { function addOverviewsInformation(err, requestMapConfig, datasource) { assert.ifError(err); var next = this; - self.overviewsAdapter.getLayers(req.context.user, requestMapConfig.layers, - function(err, layers) { - if (err) { - return next(err); - } - - if (layers) { - requestMapConfig.layers = layers; - } - return next(null, requestMapConfig, datasource); + self.overviewsAdapter.getLayers(req.context.user, requestMapConfig.layers, function(err, layers) { + if (err) { + return next(err); } - ); + + if (layers) { + requestMapConfig.layers = layers; + } + return next(null, requestMapConfig, datasource); + }); }, function createLayergroup(err, requestMapConfig, datasource) { assert.ifError(err);