From a6d99844532e5253adb52e2a0b5e84374c2b5bab Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Thu, 15 Mar 2018 09:29:08 +0100 Subject: [PATCH] Upgrade @carto/mapnik to 3.6.2-carto.4 --- NEWS.md | 9 +++++++++ package.json | 4 ++-- yarn.lock | 48 ++++++++++++++++++++++++------------------------ 3 files changed, 35 insertions(+), 26 deletions(-) diff --git a/NEWS.md b/NEWS.md index aac60129..056971da 100644 --- a/NEWS.md +++ b/NEWS.md @@ -8,6 +8,15 @@ Released yyyy-mm-dd - Aggregation widget: Remove NULL categories in 'count' aggregations too - Update request to 2.85.0 - Update camshaft to 0.61.4 (Fixes for AOI and Merge analyses) + - Update @carto/mapnik to 3.6.2-carto.4. Also update tilelive-mapnik, tilelive-bridge and abaculus accordingly. That version includes a cache for rasterized symbols. See https://github.com/CartoDB/node-mapnik/blob/v3.6.2-carto/CHANGELOG.carto.md#362-carto4 + - PostGIS: Variables in postgis SQL queries must now additionally be wrapped in `!` (refs [#29](https://github.com/CartoDB/mapnik/issues/29), [mapnik/#3618](https://github.com/mapnik/mapnik/pull/3618)): +```sql +-- Before +SELECT ... WHERE trait = @variable + +-- Now +SELECT ... WHERE trait = !@variable! +``` ## 5.3.1 Released 2018-02-13 diff --git a/package.json b/package.json index ecbfd138..6ad84139 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "5.3.2", + "version": "5.4.0", "description": "A map tile server for CartoDB", "keywords": [ "cartodb" @@ -48,7 +48,7 @@ "step-profiler": "~0.3.0", "turbo-carto": "0.20.2", "underscore": "~1.6.0", - "windshaft": "4.5.7", + "windshaft": "4.6.0", "yargs": "~5.0.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index ea64f336..22f5d1fe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,20 +2,20 @@ # yarn lockfile v1 -"@carto/mapnik@3.6.2-carto.2", "@carto/mapnik@~3.6.2-carto.0": - version "3.6.2-carto.2" - resolved "https://registry.yarnpkg.com/@carto/mapnik/-/mapnik-3.6.2-carto.2.tgz#45a055fd2d39530a873ef9ce5a325baacc81c196" +"@carto/mapnik@3.6.2-carto.4": + version "3.6.2-carto.4" + resolved "https://registry.yarnpkg.com/@carto/mapnik/-/mapnik-3.6.2-carto.4.tgz#54042a5dbea293c54e1bd286b32277694c5dc2d2" dependencies: mapnik-vector-tile "1.5.0" nan "~2.7.0" node-pre-gyp "~0.6.30" protozero "1.5.1" -"@carto/tilelive-bridge@cartodb/tilelive-bridge#2.5.1-cdb3": - version "2.5.1-cdb3" - resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/e61c7752c033595a273dcd1d4b267252b174bd28" +"@carto/tilelive-bridge@github:cartodb/tilelive-bridge#2.5.1-cdb4": + version "2.5.1-cdb4" + resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/3eb554e5109199f50f457cec72ee288cffa5d6b3" dependencies: - "@carto/mapnik" "3.6.2-carto.2" + "@carto/mapnik" "3.6.2-carto.4" "@mapbox/sphericalmercator" "~1.0.1" mapnik-pool "~0.1.3" @@ -23,11 +23,11 @@ version "1.0.5" resolved "https://registry.yarnpkg.com/@mapbox/sphericalmercator/-/sphericalmercator-1.0.5.tgz#70237b9774095ed1cfdbcea7a8fd1fc82b2691f2" -abaculus@cartodb/abaculus#2.0.3-cdb2: - version "2.0.3-cdb2" - resolved "https://codeload.github.com/cartodb/abaculus/tar.gz/6468e0e3fddb2b23f60b9a3156117cff0307f6dc" +"abaculus@github:cartodb/abaculus#2.0.3-cdb5": + version "2.0.3-cdb5" + resolved "https://codeload.github.com/cartodb/abaculus/tar.gz/b899cbea04b3e6093aa3ef32331920acd5f839a1" dependencies: - "@carto/mapnik" "~3.6.2-carto.0" + "@carto/mapnik" "3.6.2-carto.4" d3-queue "^2.0.2" sphericalmercator "1.0.x" @@ -249,7 +249,7 @@ camshaft@0.61.4: 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: @@ -275,7 +275,7 @@ carto@CartoDB/carto#0.15.1-cdb1: optimist "~0.6.0" underscore "~1.6.0" -carto@cartodb/carto#0.15.1-cdb3: +"carto@github:cartodb/carto#0.15.1-cdb3": version "0.15.1-cdb3" resolved "https://codeload.github.com/cartodb/carto/tar.gz/945f5efb74fd1af1f5e1f69f409f9567f94fb5a7" dependencies: @@ -2239,11 +2239,11 @@ 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-cdb7: - version "0.6.18-cdb7" - resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/488d2acd65c89cc5382d996eabe8dc1f5051ce0f" +"tilelive-mapnik@github:cartodb/tilelive-mapnik#0.6.18-cdb8": + version "0.6.18-cdb8" + resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/9cb4546c8fdd34ced0a41dbf70e143475b4e2067" dependencies: - "@carto/mapnik" "3.6.2-carto.2" + "@carto/mapnik" "3.6.2-carto.4" generic-pool "~2.4.0" mime "~1.6.0" sphericalmercator "~1.0.4" @@ -2400,13 +2400,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.5.7: - version "4.5.7" - resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.5.7.tgz#1cb2950e529d0a7f8bb55d56f4f568152f05c27e" +windshaft@4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.6.0.tgz#d9394aff73c0aa761207ad2b0f12d1c23ac41244" dependencies: - "@carto/mapnik" "3.6.2-carto.2" - "@carto/tilelive-bridge" cartodb/tilelive-bridge#2.5.1-cdb3 - abaculus cartodb/abaculus#2.0.3-cdb2 + "@carto/mapnik" "3.6.2-carto.4" + "@carto/tilelive-bridge" cartodb/tilelive-bridge#2.5.1-cdb4 + abaculus cartodb/abaculus#2.0.3-cdb5 canvas cartodb/node-canvas#1.6.2-cdb2 carto cartodb/carto#0.15.1-cdb3 cartodb-psql "^0.10.1" @@ -2420,7 +2420,7 @@ windshaft@4.5.7: sphericalmercator "1.0.4" step "~0.0.6" tilelive "5.12.2" - tilelive-mapnik cartodb/tilelive-mapnik#0.6.18-cdb7 + tilelive-mapnik cartodb/tilelive-mapnik#0.6.18-cdb8 torque.js "~2.11.0" underscore "~1.6.0"