From 44bbfe3ba655f8988caf1666c52756bf9b2dd6f0 Mon Sep 17 00:00:00 2001 From: Raul Marin Date: Wed, 5 Sep 2018 11:56:44 +0200 Subject: [PATCH] Update Windshaft to 4.9.0 --- NEWS.md | 9 +++++ package.json | 2 +- yarn.lock | 95 +++++++++++++++++++++++++--------------------------- 3 files changed, 56 insertions(+), 50 deletions(-) diff --git a/NEWS.md b/NEWS.md index 2e07b620..cbffc943 100644 --- a/NEWS.md +++ b/NEWS.md @@ -10,6 +10,15 @@ Released 2018-mm-dd - Bug Fixes: (#1020) - Fix bug in date-wrapper regarding columns with spaces - Fix bug in aggregation-query regarding columns with spaces +- Upgrades Windshaft to [4.9.0](https://github.com/CartoDB/Windshaft/blob/4.9.0/NEWS.md#version-490) + - `pg-mvt`: + - Now matches the behaviour of the `mapnik` renderer for MVTs. + - Removed undocummented filtering by `layer.options.columns`. + - Several bugfixes. + - Dependency updates: Fixed a bug in Mapnik MVT renderer and cleanup in `tilelive-mapnik`. + - [MapConfig 1.8.0 released](https://github.com/CartoDB/Windshaft/blob/master/doc/MapConfig-1.8.0.md) with new options for MVTs: + - Add **`vector_extent`** option in MapConfig to setup the layer extent. + - Add **`vector_simplify_extent`** option in MapConfig to configure the simplification process. ## 6.3.0 Released 2018-07-26 diff --git a/package.json b/package.json index 3d2cc203..1d387869 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "step-profiler": "0.3.0", "turbo-carto": "0.20.4", "underscore": "1.6.0", - "windshaft": "4.8.3", + "windshaft": "4.9.0", "yargs": "11.1.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 945505af..0816761f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6,20 +6,19 @@ version "0.2.2" resolved "https://registry.yarnpkg.com/@carto/fqdn-sync/-/fqdn-sync-0.2.2.tgz#cd7c645ed66690a09249b554d254a0f53963b2dc" -"@carto/mapnik@3.6.2-carto.10": - version "3.6.2-carto.10" - resolved "https://registry.yarnpkg.com/@carto/mapnik/-/mapnik-3.6.2-carto.10.tgz#a97c951dcdac09d0eb35b3ea71e5eeaa206c1af6" +"@carto/mapnik@3.6.2-carto.11": + version "3.6.2-carto.11" + resolved "https://registry.yarnpkg.com/@carto/mapnik/-/mapnik-3.6.2-carto.11.tgz#f2f0bc4d0051080169267c5c729b90c6bc934661" dependencies: - mapnik-vector-tile cartodb/mapnik-vector-tile#v1.6.1-carto.1 + mapnik-vector-tile cartodb/mapnik-vector-tile#v1.6.1-carto.2 nan "2.10.0" node-pre-gyp "0.10.0" - protozero "1.5.1" -"@carto/tilelive-bridge@cartodb/tilelive-bridge#2.5.1-cdb9": - version "2.5.1-cdb9" - resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/5129e43223cb55daed31373c7a36c98eb6178fc1" +"@carto/tilelive-bridge@github:cartodb/tilelive-bridge#2.5.1-cdb10": + version "2.5.1-cdb10" + resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/118ac7e7f6582ac7be0fc0246ea2afd1a7795a43" dependencies: - "@carto/mapnik" "3.6.2-carto.10" + "@carto/mapnik" "3.6.2-carto.11" "@mapbox/sphericalmercator" "~1.0.1" mapnik-pool "~0.1.3" @@ -27,13 +26,13 @@ version "1.0.5" resolved "https://registry.yarnpkg.com/@mapbox/sphericalmercator/-/sphericalmercator-1.0.5.tgz#70237b9774095ed1cfdbcea7a8fd1fc82b2691f2" -abaculus@cartodb/abaculus#2.0.3-cdb10: - version "2.0.3-cdb10" - resolved "https://codeload.github.com/cartodb/abaculus/tar.gz/90d537028bb8af8a35e7a40c46493066dd8a76b3" +"abaculus@github:cartodb/abaculus#2.0.3-cdb11": + version "2.0.3-cdb11" + resolved "https://codeload.github.com/cartodb/abaculus/tar.gz/b2d4dce48c50fefc5b06f21c6365d82ccf75358d" dependencies: - "@carto/mapnik" "3.6.2-carto.10" + "@carto/mapnik" "3.6.2-carto.11" d3-queue "^2.0.2" - sphericalmercator "1.0.x" + sphericalmercator "1.0.5" abbrev@1, abbrev@1.0.x: version "1.0.9" @@ -276,7 +275,7 @@ camshaft@0.62.3: dot "^1.0.3" request "2.85.0" -canvas@cartodb/node-canvas#1.6.2-cdb2: +"canvas@github:cartodb/node-canvas#1.6.2-cdb2": version "1.6.2-cdb2" resolved "https://codeload.github.com/cartodb/node-canvas/tar.gz/8acf04557005c633f9e68524488a2657c04f3766" dependencies: @@ -294,17 +293,17 @@ carto@0.16.3: semver "^5.1.0" yargs "^4.2.0" -carto@cartodb/carto#0.15.1-cdb3: - version "0.15.1-cdb3" - resolved "https://codeload.github.com/cartodb/carto/tar.gz/945f5efb74fd1af1f5e1f69f409f9567f94fb5a7" +carto@cartodb/carto#master: + version "0.15.1" + resolved "https://codeload.github.com/cartodb/carto/tar.gz/31abb8bee02df605521247b0223d508320f7d4c8" dependencies: mapnik-reference "~6.0.2" optimist "~0.6.0" underscore "1.8.3" -carto@cartodb/carto#master: - version "0.15.1" - resolved "https://codeload.github.com/cartodb/carto/tar.gz/31abb8bee02df605521247b0223d508320f7d4c8" +"carto@github:cartodb/carto#0.15.1-cdb3": + version "0.15.1-cdb3" + resolved "https://codeload.github.com/cartodb/carto/tar.gz/945f5efb74fd1af1f5e1f69f409f9567f94fb5a7" dependencies: mapnik-reference "~6.0.2" optimist "~0.6.0" @@ -879,6 +878,10 @@ generic-pool@2.4.3: version "2.4.3" resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.3.tgz#780c36f69dfad05a5a045dd37be7adca11a4f6ff" +generic-pool@2.5.4: + version "2.5.4" + resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.5.4.tgz#38c6188513e14030948ec6e5cf65523d9779299b" + generic-pool@~2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.1.1.tgz#af04dc2c325cfcb975023fa52bfce9617a7435fd" @@ -887,7 +890,7 @@ generic-pool@~2.2.0, generic-pool@~2.2.1: version "2.2.2" resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.2.2.tgz#7a89f491d575b42f9f069a0e8e2c6dbaa3c241be" -generic-pool@~2.4.0, generic-pool@~2.4.1: +generic-pool@~2.4.1: version "2.4.6" resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.6.tgz#f1b55e572167dba2fe75d5aa91ebb1e9f72642d7" @@ -1429,9 +1432,9 @@ mapnik-reference@~8.5.3: dependencies: semver "^5.1.0" -mapnik-vector-tile@cartodb/mapnik-vector-tile#v1.6.1-carto.1: - version "1.6.1-carto.1" - resolved "https://codeload.github.com/cartodb/mapnik-vector-tile/tar.gz/0111f7117946179d62ec7a6eba2f4e9fb355d05e" +"mapnik-vector-tile@github:cartodb/mapnik-vector-tile#v1.6.1-carto.2": + version "1.6.1-carto.2" + resolved "https://codeload.github.com/cartodb/mapnik-vector-tile/tar.gz/e7ca5471f9e5de81243e6035e70444321fc0a82f" media-typer@0.3.0: version "0.3.0" @@ -1480,14 +1483,14 @@ mime@1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" +mime@2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369" + mime@~1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10" -mime@~1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" - mimic-fn@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" @@ -1990,10 +1993,6 @@ propagate@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/propagate/-/propagate-1.0.0.tgz#00c2daeedda20e87e3782b344adba1cddd6ad709" -protozero@1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/protozero/-/protozero-1.5.1.tgz#5a27df6fb6e1ed743f510812ae76c082f5b16638" - proxy-addr@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.3.tgz#355f262505a621646b3130a728eb647e22055341" @@ -2398,7 +2397,7 @@ speedometer@~0.1.2: version "0.1.4" resolved "https://registry.yarnpkg.com/speedometer/-/speedometer-0.1.4.tgz#9876dbd2a169d3115402d48e6ea6329c8816a50d" -sphericalmercator@1.0.5, sphericalmercator@1.0.x, sphericalmercator@~1.0.1, sphericalmercator@~1.0.4: +sphericalmercator@1.0.5, sphericalmercator@~1.0.1: version "1.0.5" resolved "https://registry.yarnpkg.com/sphericalmercator/-/sphericalmercator-1.0.5.tgz#ddc5a049e360e000d0fad9fc22c4071882584980" @@ -2581,15 +2580,13 @@ through@2: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" -tilelive-mapnik@cartodb/tilelive-mapnik#0.6.18-cdb14: - version "0.6.18-cdb14" - resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/6d06f728833d3e34d1adcd05567b3f4379f547bb" +"tilelive-mapnik@github:cartodb/tilelive-mapnik#0.6.18-cdb15": + version "0.6.18-cdb15" + resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/b6c1404a9e37fc60e545d977081867a86eb42b2b" dependencies: - "@carto/mapnik" "3.6.2-carto.10" - generic-pool "~2.4.0" - mime "~1.6.0" - sphericalmercator "~1.0.4" - step "~0.0.5" + "@carto/mapnik" "3.6.2-carto.11" + generic-pool "2.5.4" + mime "2.3.1" tilelive@5.12.3: version "5.12.3" @@ -2762,13 +2759,13 @@ 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.8.3: - version "4.8.3" - resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.8.3.tgz#9cc0ae9cea6b4e716858f4c15c138c1e9c158b9e" +windshaft@4.9.0: + version "4.9.0" + resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.9.0.tgz#adaeb7adcbe45aa9f196292b7130f255d39513b1" dependencies: - "@carto/mapnik" "3.6.2-carto.10" - "@carto/tilelive-bridge" cartodb/tilelive-bridge#2.5.1-cdb9 - abaculus cartodb/abaculus#2.0.3-cdb10 + "@carto/mapnik" "3.6.2-carto.11" + "@carto/tilelive-bridge" cartodb/tilelive-bridge#2.5.1-cdb10 + abaculus cartodb/abaculus#2.0.3-cdb11 canvas cartodb/node-canvas#1.6.2-cdb2 carto cartodb/carto#0.15.1-cdb3 cartodb-psql "0.11.0" @@ -2782,7 +2779,7 @@ windshaft@4.8.3: sphericalmercator "1.0.5" step "1.0.0" tilelive "5.12.3" - tilelive-mapnik cartodb/tilelive-mapnik#0.6.18-cdb14 + tilelive-mapnik cartodb/tilelive-mapnik#0.6.18-cdb15 torque.js "2.16.2" underscore "1.6.0"