Release 2.1.1

- Puts back the still supported /tiles/template and /tiles/layergroup
 - Changes from /u/:user to /user/:user for subdomainless users

NEWS.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 2.1.1
+
+Released 2015-04-10
+
+Bug fixes:
+ - Do not add x-cache-channel header for GET template routes
+
+
+## 2.1.0
+
+Released 2015-04-09
+
+Announcements:
+ - Upgrades windshaft to [0.42.0](https://github.com/CartoDB/Windshaft/releases/tag/0.42.0)
+
 
 ## 2.0.0
 

config/environments/development.js.example

@@ -14,11 +14,11 @@ var config = {
     // Base url for the Templated Maps API
     // "/api/v1/map/named" is the new API,
     // "/tiles/template" is for compatibility with versions up to 1.6.x
-    ,base_url_templated: '(?:/api/v1/map/named|/u/:user/api/v1/map/named)'
+    ,base_url_templated: '(?:/api/v1/map/named|/user/:user/api/v1/map/named|/tiles/template)'
     // Base url for the Detached Maps API
     // "maps" is the the new API,
     // "tiles/layergroup" is for compatibility with versions up to 1.6.x
-    ,base_url_detached: '(?:/api/v1/map|/u/:user/api/v1/map)'
+    ,base_url_detached: '(?:/api/v1/map|/user/:user/api/v1/map|/tiles/layergroup)'
 
     // Maximum number of connections for one process
     // 128 is a good value with a limit of 1024 open file descriptors

config/environments/production.js.example

@@ -14,11 +14,11 @@ var config = {
     // Base url for the Templated Maps API
     // "/api/v1/map/named" is the new API,
     // "/tiles/template" is for compatibility with versions up to 1.6.x
-    ,base_url_templated: '(?:/api/v1/map/named|/u/:user/api/v1/map/named)'
+    ,base_url_templated: '(?:/api/v1/map/named|/user/:user/api/v1/map/named|/tiles/template)'
     // Base url for the Detached Maps API
     // "maps" is the the new API,
     // "tiles/layergroup" is for compatibility with versions up to 1.6.x
-    ,base_url_detached: '(?:/api/v1/map|/u/:user/api/v1/map)'
+    ,base_url_detached: '(?:/api/v1/map|/user/:user/api/v1/map|/tiles/layergroup)'
 
     // Maximum number of connections for one process
     // 128 is a good value with a limit of 1024 open file descriptors

config/environments/staging.js.example

@@ -14,11 +14,11 @@ var config = {
     // Base url for the Templated Maps API
     // "/api/v1/maps/named" is the new API,
     // "/tiles/template" is for compatibility with versions up to 1.6.x
-    ,base_url_templated: '(?:/api/v1/map/named|/u/:user/api/v1/map/named)'
+    ,base_url_templated: '(?:/api/v1/map/named|/user/:user/api/v1/map/named|/tiles/template)'
     // Base url for the Detached Maps API
     // "/api/v1/maps" is the the new API,
     // "/tiles/layergroup" is for compatibility with versions up to 1.6.x
-    ,base_url_detached: '(?:/api/v1/map|/u/:user/api/v1/map)'
+    ,base_url_detached: '(?:/api/v1/map|/user/:user/api/v1/map|/tiles/layergroup)'
 
     // Maximum number of connections for one process
     // 128 is a good value with a limit of 1024 open file descriptors

config/environments/test.js.example

@@ -14,11 +14,11 @@ var config = {
     // Base url for the Templated Maps API
     // "/api/v1/map/named" is the new API,
     // "/tiles/template" is for compatibility with versions up to 1.6.x
-    ,base_url_templated: '(?:/api/v1/map/named|/u/:user/api/v1/map/named)'
+    ,base_url_templated: '(?:/api/v1/map/named|/user/:user/api/v1/map/named|/tiles/template)'
     // Base url for the Detached Maps API
     // "maps" is the the new API,
     // "tiles/layergroup" is for compatibility with versions up to 1.6.x
-    ,base_url_detached: '(?:/api/v1/map|/u/:user/api/v1/map)'
+    ,base_url_detached: '(?:/api/v1/map|/user/:user/api/v1/map|/tiles/layergroup)'
 
     // Maximum number of connections for one process
     // 128 is a good value with a limit of 1024 open file descriptors

lib/cartodb/cartodb_windshaft.js

@@ -71,6 +71,8 @@ var CartodbWindshaft = function(serverOptions) {
       '/',
       // See https://github.com/CartoDB/Windshaft-cartodb/issues/176
       serverOptions.base_url_mapconfig,
+      template_baseurl,
+      template_baseurl + '/:template_id',
       template_baseurl + '/:template_id/jsonp'
     ];
     ws.sendResponse = function(res, args) {

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "dependencies": {
     "cartodb-psql": {
       "version": "0.4.0",
@@ -103,7 +103,7 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@2",
+              "from": "inherits@~2.0.1",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             }
           }
@@ -170,9 +170,9 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "0.41.0",
-      "from": "windshaft@0.41.0",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.41.0.tgz",
+      "version": "0.42.0",
+      "from": "windshaft@0.42.0",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.42.0.tgz",
       "dependencies": {
         "chronograph": {
           "version": "0.1.0",

package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.0.0",
+    "version": "2.1.1",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"
@@ -24,7 +24,7 @@
     "dependencies": {
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "0.41.0",
+        "windshaft": "0.42.0",
         "step": "~0.0.5",
         "queue-async": "~1.0.7",
         "request": "~2.9.203",

test/acceptance/multilayer.js

@@ -17,7 +17,7 @@ var serverOptions = require(__dirname + '/../../lib/cartodb/server_options');
 var server = new CartodbWindshaft(serverOptions());
 server.setMaxListeners(0);
 
-['/api/v1/map', '/u/localhost/api/v1/map'].forEach(function(layergroup_url) {
+['/api/v1/map', '/user/localhost/api/v1/map'].forEach(function(layergroup_url) {
 
 var suiteName = 'multilayer:postgres=layergroup_url=' + layergroup_url;
 suite(suiteName, function() {