diff --git a/NEWS.md b/NEWS.md index 928ba922..fae3862a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,9 +3,9 @@ ## 5.3.0 Released 2018-mm-dd - Upgrades redis-mpool to 0.5.0 - - Upgrades windshaft to 4.4.0 + - Upgrades windshaft to 4.5.0 - Upgrades cartodb-redis to 0.15.0 - + - Adds metrics option to the Mapnik renderer ## 5.2.1 Released 2018-02-01 diff --git a/config/environments/development.js.example b/config/environments/development.js.example index 644fea48..df2273c7 100644 --- a/config/environments/development.js.example +++ b/config/environments/development.js.example @@ -205,11 +205,12 @@ var config = { // much closer to the original geometry removeRepeatedPoints: false // this requires postgis >=2.2 }, - // If enabled Mapnik will reuse the features retrieved from the database // instead of requesting them once per style inside a layer - 'cache-features': true + 'cache-features': true, + // Require metrics to the renderer + metrics: false }, http: { timeout: 2000, // the timeout in ms for a http tile request diff --git a/config/environments/production.js.example b/config/environments/production.js.example index db18d93c..9f7436df 100644 --- a/config/environments/production.js.example +++ b/config/environments/production.js.example @@ -202,7 +202,10 @@ var config = { // If enabled Mapnik will reuse the features retrieved from the database // instead of requesting them once per style inside a layer - 'cache-features': true + 'cache-features': true, + + // Require metrics to the renderer + metrics: false }, http: { diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example index b478ca80..66c5a88c 100644 --- a/config/environments/staging.js.example +++ b/config/environments/staging.js.example @@ -202,7 +202,10 @@ var config = { // If enabled Mapnik will reuse the features retrieved from the database // instead of requesting them once per style inside a layer - 'cache-features': true + 'cache-features': true, + + // Require metrics to the renderer + metrics: false }, http: { diff --git a/config/environments/test.js.example b/config/environments/test.js.example index 776166e5..0c98c4b6 100644 --- a/config/environments/test.js.example +++ b/config/environments/test.js.example @@ -201,8 +201,10 @@ var config = { // If enabled Mapnik will reuse the features retrieved from the database // instead of requesting them once per style inside a layer - 'cache-features': true + 'cache-features': true, + // Require metrics to the renderer + metrics: false }, http: { timeout: 2000, // the timeout in ms for a http tile request diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js index 25e60c2f..1891e208 100644 --- a/lib/cartodb/server_options.js +++ b/lib/cartodb/server_options.js @@ -15,6 +15,7 @@ var rendererConfig = _.defaults(global.environment.renderer || {}, { bufferSize: 64, snapToGrid: false, clipByBox2d: false, + metrics: false, limits: {} }, http: {} diff --git a/package.json b/package.json index 746240d5..e71f7d8d 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "step-profiler": "~0.3.0", "turbo-carto": "0.20.2", "underscore": "~1.6.0", - "windshaft": "4.4.0", + "windshaft": "4.5.0", "yargs": "~5.0.0" }, "devDependencies": { diff --git a/test/acceptance/ported/support/ported_server_options.js b/test/acceptance/ported/support/ported_server_options.js index 8604e68c..8b75ec02 100644 --- a/test/acceptance/ported/support/ported_server_options.js +++ b/test/acceptance/ported/support/ported_server_options.js @@ -27,6 +27,7 @@ module.exports = _.extend({}, serverOptions, { snapToGrid: false, clipByBox2d: false, // this requires postgis >=2.2 and geos >=3.5 scale_factors: [1, 2], + metrics: false, limits: { render: 0, cacheOnTimeout: true diff --git a/yarn.lock b/yarn.lock index c75f3933..8499231c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1335,9 +1335,9 @@ mime@~1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10" -mime@~1.3.4: - version "1.3.6" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0" +mime@~1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" "minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2: version "3.0.4" @@ -2206,13 +2206,13 @@ through@2: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" -"tilelive-mapnik@github:cartodb/tilelive-mapnik#0.6.18-cdb4": - version "0.6.18-cdb4" - resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/510cfb6f033f7551f973886751643202d4cb5f4a" +"tilelive-mapnik@github:cartodb/tilelive-mapnik#0.6.18-cdb5": + version "0.6.18-cdb5" + resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/cec846025e60837c60af193d600d972917ea8d35" dependencies: "@carto/mapnik" "~3.6.2-carto.0" generic-pool "~2.4.0" - mime "~1.3.4" + mime "~1.6.0" sphericalmercator "~1.0.4" step "~0.0.5" @@ -2367,9 +2367,9 @@ window-size@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" -windshaft@4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.4.0.tgz#16ecfa0fbda97347a061d3928c54d327be682e49" +windshaft@4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.5.0.tgz#44f17073267d459c9a2b9f213250210b89d4d35d" dependencies: "@carto/mapnik" "3.6.2-carto.2" "@carto/tilelive-bridge" cartodb/tilelive-bridge#2.5.1-cdb1 @@ -2387,7 +2387,7 @@ windshaft@4.4.0: sphericalmercator "1.0.4" step "~0.0.6" tilelive "5.12.2" - tilelive-mapnik cartodb/tilelive-mapnik#0.6.18-cdb4 + tilelive-mapnik cartodb/tilelive-mapnik#0.6.18-cdb5 torque.js "~2.11.0" underscore "~1.6.0"