From 2ed656ca0d2f97bd5fd51edda10db7d591119698 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 7 Aug 2014 01:57:21 +0200 Subject: [PATCH 1/4] Upgrades windshaft (and grainstore) to be able to specify the tile format, see: https://github.com/mapnik/mapnik/wiki/OutputFormats --- config/environments/development.js.example | 1 + config/environments/production.js.example | 1 + config/environments/staging.js.example | 1 + config/environments/test.js.example | 1 + lib/cartodb/server_options.js | 1 + npm-shrinkwrap.json | 8 ++++---- package.json | 2 +- 7 files changed, 10 insertions(+), 5 deletions(-) diff --git a/config/environments/development.js.example b/config/environments/development.js.example index dbe855fc..5a432914 100644 --- a/config/environments/development.js.example +++ b/config/environments/development.js.example @@ -73,6 +73,7 @@ var config = { max_size: 500 } ,mapnik_version: undefined + ,mapnik_tile_format: 'png8:m=h' ,statsd: { host: 'localhost', port: 8125, diff --git a/config/environments/production.js.example b/config/environments/production.js.example index b3197f5f..08532ac1 100644 --- a/config/environments/production.js.example +++ b/config/environments/production.js.example @@ -67,6 +67,7 @@ var config = { max_size: 500 } ,mapnik_version: undefined + ,mapnik_tile_format: 'png8:m=h' ,statsd: { host: 'localhost', port: 8125, diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example index 3513f475..b30bca97 100644 --- a/config/environments/staging.js.example +++ b/config/environments/staging.js.example @@ -67,6 +67,7 @@ var config = { max_size: 500 } ,mapnik_version: undefined + ,mapnik_tile_format: 'png8:m=h' ,statsd: { host: 'localhost', port: 8125, diff --git a/config/environments/test.js.example b/config/environments/test.js.example index e54a7df1..e313cf19 100644 --- a/config/environments/test.js.example +++ b/config/environments/test.js.example @@ -67,6 +67,7 @@ var config = { max_size: 500 } ,mapnik_version: '' + ,mapnik_tile_format: 'png8:m=h' ,statsd: { host: 'localhost', port: 8125, diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js index cd8098ad..d28588ae 100644 --- a/lib/cartodb/server_options.js +++ b/lib/cartodb/server_options.js @@ -49,6 +49,7 @@ module.exports = function(){ datasource: global.environment.postgres, cachedir: global.environment.millstone.cache_basedir, mapnik_version: global.environment.mapnik_version || mapnik.versions.mapnik, + mapnik_tile_format: global.environment.mapnik_tile_format || 'png', default_layergroup_ttl: global.environment.mapConfigTTL || 7200, gc_prob: 0.01 // @deprecated since Windshaft-1.8.0 }, diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index a331beb6..7e43e1ed 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -10,12 +10,12 @@ "version": "1.3.3" }, "windshaft": { - "version": "0.22.0", - "from": "https://github.com/CartoDB/Windshaft/tarball/0.22.0", + "version": "0.23.0", + "from": "https://github.com/CartoDB/Windshaft/tarball/0.23.0", "dependencies": { "grainstore": { - "version": "0.18.2", - "from": "git://github.com/CartoDB/grainstore.git#0.18.2", + "version": "0.19.0", + "from": "git://github.com/CartoDB/grainstore.git#0.19.0", "dependencies": { "carto": { "version": "0.9.5-cdb2", diff --git a/package.json b/package.json index 74daefb7..27cf05cf 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "dependencies": { "node-varnish": "http://github.com/Vizzuality/node-varnish/tarball/0.3.0", "underscore" : "~1.3.3", - "windshaft" : "https://github.com/CartoDB/Windshaft/tarball/0.22.0", + "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.23.0", "step": "0.0.x", "request": "2.9.202", "cartodb-redis": "git://github.com/CartoDB/node-cartodb-redis.git#0.5.0", From 6e4144d0152564edd32bac37c87987667978dcb0 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 7 Aug 2014 12:21:42 +0200 Subject: [PATCH 2/4] Prepares next release --- NEWS.md | 3 ++- npm-shrinkwrap.json | 2 +- package.json | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NEWS.md b/NEWS.md index 565efd99..0b888d0d 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -1.13.2 -- 2014-mm-dd +1.14.0 -- 2014-mm-dd -------------------- Enhancements: @@ -6,6 +6,7 @@ Enhancements: New features: - Affected tables and last updated time for a query are performed in a single request to the SQL API + - Allow specifying the tile format, upgrades windshaft and grainstore dependencies for this matter 1.13.1 -- 2014-08-04 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 7e43e1ed..2073df3d 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "1.13.2", + "version": "1.14.0", "dependencies": { "node-varnish": { "version": "0.3.0", diff --git a/package.json b/package.json index 27cf05cf..e2cca37a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "1.13.2", + "version": "1.14.0", "description": "A map tile server for CartoDB", "keywords": [ "cartodb" From 58047fac1713b50ed797542412cd0f85c16e8d7e Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 7 Aug 2014 12:34:49 +0200 Subject: [PATCH 3/4] Release 1.14.0 --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 0b888d0d..2f65331e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -1.14.0 -- 2014-mm-dd +1.14.0 -- 2014-08-07 -------------------- Enhancements: From 3eab0d6349428bf90e9e311c4ce7d3aac3a62788 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 7 Aug 2014 12:35:38 +0200 Subject: [PATCH 4/4] Stubs next version --- NEWS.md | 3 +++ npm-shrinkwrap.json | 2 +- package.json | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 2f65331e..d48a89cb 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,6 @@ +1.14.1 -- 2014-mm-dd +-------------------- + 1.14.0 -- 2014-08-07 -------------------- diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 2073df3d..7d543b85 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "1.14.0", + "version": "1.14.1", "dependencies": { "node-varnish": { "version": "0.3.0", diff --git a/package.json b/package.json index e2cca37a..d0818316 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "1.14.0", + "version": "1.14.1", "description": "A map tile server for CartoDB", "keywords": [ "cartodb"