From 75ddcbbd01becf2dd9b36a721a895b126f60f4a2 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 2 Jul 2015 13:28:37 +0200 Subject: [PATCH] Updates windshaft to 0.46.0 and documents new config formatMetatile --- NEWS.md | 6 +- config/environments/development.js.example | 6 ++ config/environments/production.js.example | 6 ++ config/environments/staging.js.example | 6 ++ config/environments/test.js.example | 6 ++ npm-shrinkwrap.json | 77 ++++++++++------------ package.json | 4 +- 7 files changed, 67 insertions(+), 44 deletions(-) diff --git a/NEWS.md b/NEWS.md index 18b454fe..bcc7befe 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,9 +1,13 @@ # Changelog -## 2.5.1 +## 2.6.0 Released 2015-mm-dd +Announcements: + - Upgrades windshaft to [0.46.0](https://github.com/CartoDB/Windshaft/releases/tag/0.46.0) + - New config to set metatile by format + ## 2.5.0 diff --git a/config/environments/development.js.example b/config/environments/development.js.example index 405c0017..497e3421 100644 --- a/config/environments/development.js.example +++ b/config/environments/development.js.example @@ -96,6 +96,12 @@ var config = { // wasted time. metatile: 2, + // Override metatile behaviour depending on the format + formatMetatile: { + png: 2, + 'grid.json': 1 + }, + // Buffer size is the tickness in pixel of a buffer // around the rendered (meta?)tile. // diff --git a/config/environments/production.js.example b/config/environments/production.js.example index 516e18a3..df0b75eb 100644 --- a/config/environments/production.js.example +++ b/config/environments/production.js.example @@ -90,6 +90,12 @@ var config = { // wasted time. metatile: 2, + // Override metatile behaviour depending on the format + formatMetatile: { + png: 2, + 'grid.json': 1 + }, + // Buffer size is the tickness in pixel of a buffer // around the rendered (meta?)tile. // diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example index 6495a1da..fd082a9c 100644 --- a/config/environments/staging.js.example +++ b/config/environments/staging.js.example @@ -90,6 +90,12 @@ var config = { // wasted time. metatile: 2, + // Override metatile behaviour depending on the format + formatMetatile: { + png: 2, + 'grid.json': 1 + }, + // Buffer size is the tickness in pixel of a buffer // around the rendered (meta?)tile. // diff --git a/config/environments/test.js.example b/config/environments/test.js.example index 39fb2dbb..94b92807 100644 --- a/config/environments/test.js.example +++ b/config/environments/test.js.example @@ -90,6 +90,12 @@ var config = { // wasted time. metatile: 2, + // Override metatile behaviour depending on the format + formatMetatile: { + png: 2, + 'grid.json': 1 + }, + // Buffer size is the tickness in pixel of a buffer // around the rendered (meta?)tile. // diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index e8f837c5..58cc04ff 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "2.5.1", + "version": "2.6.0", "dependencies": { "cartodb-psql": { "version": "0.4.0", @@ -134,19 +134,19 @@ "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc1.tgz", "dependencies": { "async": { - "version": "1.2.1", + "version": "1.3.0", "from": "async@^1.2.1", - "resolved": "https://registry.npmjs.org/async/-/async-1.2.1.tgz" + "resolved": "https://registry.npmjs.org/async/-/async-1.3.0.tgz" }, "mime-types": { - "version": "2.1.1", + "version": "2.1.2", "from": "mime-types@^2.1.1", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.1.tgz", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.2.tgz", "dependencies": { "mime-db": { - "version": "1.13.0", - "from": "mime-db@~1.13.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.13.0.tgz" + "version": "1.14.0", + "from": "mime-db@~1.14.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.14.0.tgz" } } } @@ -271,24 +271,24 @@ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz" }, "har-validator": { - "version": "1.7.1", + "version": "1.8.0", "from": "har-validator@^1.6.1", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.7.1.tgz", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz", "dependencies": { "bluebird": { "version": "2.9.30", - "from": "bluebird@^2.9.26", + "from": "bluebird@^2.9.30", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.30.tgz" }, "chalk": { - "version": "1.0.0", + "version": "1.1.0", "from": "chalk@^1.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.0.tgz", "dependencies": { "ansi-styles": { - "version": "2.0.1", - "from": "ansi-styles@^2.0.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz" + "version": "2.1.0", + "from": "ansi-styles@^2.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz" }, "escape-string-regexp": { "version": "1.0.3", @@ -296,38 +296,33 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz" }, "has-ansi": { - "version": "1.0.3", - "from": "has-ansi@^1.0.3", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz", + "version": "2.0.0", + "from": "has-ansi@^2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "dependencies": { "ansi-regex": { - "version": "1.1.1", - "from": "ansi-regex@^1.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz" - }, - "get-stdin": { - "version": "4.0.1", - "from": "get-stdin@^4.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz" + "version": "2.0.0", + "from": "ansi-regex@^2.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" } } }, "strip-ansi": { - "version": "2.0.1", - "from": "strip-ansi@^2.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz", + "version": "3.0.0", + "from": "strip-ansi@^3.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz", "dependencies": { "ansi-regex": { - "version": "1.1.1", - "from": "ansi-regex@^1.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz" + "version": "2.0.0", + "from": "ansi-regex@^2.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" } } }, "supports-color": { - "version": "1.3.1", - "from": "supports-color@^1.3.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz" + "version": "2.0.0", + "from": "supports-color@^2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" } } }, @@ -481,9 +476,9 @@ "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz" }, "step": { - "version": "0.0.5", + "version": "0.0.6", "from": "step@~0.0.5", - "resolved": "https://registry.npmjs.org/step/-/step-0.0.5.tgz" + "resolved": "https://registry.npmjs.org/step/-/step-0.0.6.tgz" }, "underscore": { "version": "1.6.0", @@ -491,9 +486,9 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { - "version": "0.45.0", - "from": "windshaft@0.45.0", - "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.45.0.tgz", + "version": "0.46.0", + "from": "windshaft@0.46.0", + "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.46.0.tgz", "dependencies": { "chronograph": { "version": "0.1.0", diff --git a/package.json b/package.json index c05762c3..519aba07 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "2.5.1", + "version": "2.6.0", "description": "A map tile server for CartoDB", "keywords": [ "cartodb" @@ -24,7 +24,7 @@ "dependencies": { "underscore" : "~1.6.0", "dot": "~1.0.2", - "windshaft": "0.45.0", + "windshaft": "0.46.0", "step": "~0.0.5", "queue-async": "~1.0.7", "request": "~2.9.203",