From 697f3473f6a625211a0344962a7f1c010e7bc314 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Tue, 21 Oct 2014 14:46:53 +0200 Subject: [PATCH 1/2] Use pgraster branch from windshaft --- npm-shrinkwrap.json | 94 ++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 3815766f..01e75b8d 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -92,7 +92,7 @@ }, "inherits": { "version": "2.0.1", - "from": "inherits@2" + "from": "inherits@~2.0.1" } } } @@ -169,9 +169,9 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { - "version": "0.31.0", - "from": "https://github.com/CartoDB/Windshaft/tarball/0.31.0", - "resolved": "https://github.com/CartoDB/Windshaft/tarball/0.31.0", + "version": "0.31.1", + "from": "https://github.com/CartoDB/Windshaft/tarball/pgraster", + "resolved": "https://github.com/CartoDB/Windshaft/tarball/pgraster", "dependencies": { "chronograph": { "version": "0.1.0", @@ -1499,6 +1499,49 @@ } } }, + "tilelive": { + "version": "4.5.3", + "from": "tilelive@~4.5.3", + "dependencies": { + "optimist": { + "version": "0.6.1", + "from": "optimist@~0.6.0", + "dependencies": { + "wordwrap": { + "version": "0.0.2", + "from": "wordwrap@~0.0.2" + }, + "minimist": { + "version": "0.0.10", + "from": "minimist@~0.0.1" + } + } + }, + "sphericalmercator": { + "version": "1.0.2", + "from": "sphericalmercator@~1.0.1" + } + } + }, + "tilelive-mapnik": { + "version": "0.6.12", + "from": "https://github.com/CartoDB/tilelive-mapnik/tarball/cdb", + "resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/cdb", + "dependencies": { + "generic-pool": { + "version": "2.1.1", + "from": "generic-pool@~2.1.1" + }, + "mime": { + "version": "1.2.11", + "from": "mime@~1.2.11" + }, + "sphericalmercator": { + "version": "1.0.2", + "from": "sphericalmercator@~1.0.2" + } + } + }, "mapnik": { "version": "1.4.15", "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb", @@ -1882,49 +1925,6 @@ } } }, - "tilelive": { - "version": "4.5.3", - "from": "tilelive@~4.5.3", - "dependencies": { - "optimist": { - "version": "0.6.1", - "from": "optimist@~0.6.0", - "dependencies": { - "wordwrap": { - "version": "0.0.2", - "from": "wordwrap@~0.0.2" - }, - "minimist": { - "version": "0.0.10", - "from": "minimist@~0.0.1" - } - } - }, - "sphericalmercator": { - "version": "1.0.2", - "from": "sphericalmercator@~1.0.2" - } - } - }, - "tilelive-mapnik": { - "version": "0.6.12", - "from": "https://github.com/CartoDB/tilelive-mapnik/tarball/cdb", - "resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/cdb", - "dependencies": { - "generic-pool": { - "version": "2.1.1", - "from": "generic-pool@~2.1.1" - }, - "mime": { - "version": "1.2.11", - "from": "mime@~1.2.11" - }, - "sphericalmercator": { - "version": "1.0.2", - "from": "sphericalmercator@~1.0.2" - } - } - }, "redis-mpool": { "version": "0.1.0", "from": "redis-mpool@git://github.com/CartoDB/node-redis-mpool.git#0.1.0", diff --git a/package.json b/package.json index 6916a884..1edafb94 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "node-varnish": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0", "underscore" : "~1.6.0", "dot": "~1.0.2", - "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.31.0", + "windshaft": "https://github.com/CartoDB/Windshaft/tarball/pgraster", "step": "~0.0.5", "request": "~2.9.203", "cartodb-redis": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0", From 6325a23bb47ba91b465f798a55edd0266599f8b4 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Wed, 5 Nov 2014 12:48:26 +0100 Subject: [PATCH 2/2] Adds default value for raster overviews configuration --- config/environments/development.js.example | 1 + config/environments/production.js.example | 1 + config/environments/staging.js.example | 1 + config/environments/test.js.example | 1 + 4 files changed, 4 insertions(+) diff --git a/config/environments/development.js.example b/config/environments/development.js.example index 22a66806..376f2a5a 100644 --- a/config/environments/development.js.example +++ b/config/environments/development.js.example @@ -63,6 +63,7 @@ var config = { */ row_limit: 65535, simplify_geometries: true, + use_overviews: true, // use overviews to retrieve raster /* * Set persist_connection to false if you want * database connections to be closed on renderer diff --git a/config/environments/production.js.example b/config/environments/production.js.example index 2a47ea5b..08b96202 100644 --- a/config/environments/production.js.example +++ b/config/environments/production.js.example @@ -65,6 +65,7 @@ var config = { */ persist_connection: false, simplify_geometries: true, + use_overviews: true, // use overviews to retrieve raster max_size: 500 } ,mapnik_version: undefined diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example index 446d5c2f..c8bcb5b4 100644 --- a/config/environments/staging.js.example +++ b/config/environments/staging.js.example @@ -57,6 +57,7 @@ var config = { extent: "-20037508.3,-20037508.3,20037508.3,20037508.3", row_limit: 65535, simplify_geometries: true, + use_overviews: true, // use overviews to retrieve raster /* * Set persist_connection to false if you want * database connections to be closed on renderer diff --git a/config/environments/test.js.example b/config/environments/test.js.example index 9fa7aca8..9d6fb502 100644 --- a/config/environments/test.js.example +++ b/config/environments/test.js.example @@ -57,6 +57,7 @@ var config = { extent: "-20037508.3,-20037508.3,20037508.3,20037508.3", row_limit: 65535, simplify_geometries: true, + use_overviews: true, // use overviews to retrieve raster /* * Set persist_connection to false if you want * database connections to be closed on renderer