diff --git a/NEWS.md b/NEWS.md index 565efd99..d48a89cb 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,7 @@ -1.13.2 -- 2014-mm-dd +1.14.1 -- 2014-mm-dd +-------------------- + +1.14.0 -- 2014-08-07 -------------------- Enhancements: @@ -6,6 +9,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/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 751a8218..e860b5ac 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 42e552a6..23b18559 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "1.13.2", + "version": "1.14.1", "dependencies": { "node-varnish": { "version": "0.3.0", @@ -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 58f98aa8..b8a0f7c1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "1.13.2", + "version": "1.14.1", "description": "A map tile server for CartoDB", "keywords": [ "cartodb" @@ -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",