From dc16f4cebf137b6d6ddf0ea610f36e0d37142d9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 10 Jun 2019 12:49:56 +0200 Subject: [PATCH 1/7] Update windshaft devel branch --- .../api/map/preview-layergroup-controller.js | 16 ++----- package-lock.json | 47 ++++++++----------- package.json | 2 +- 3 files changed, 25 insertions(+), 40 deletions(-) diff --git a/lib/cartodb/api/map/preview-layergroup-controller.js b/lib/cartodb/api/map/preview-layergroup-controller.js index bf516f5e..2aa4e2e6 100644 --- a/lib/cartodb/api/map/preview-layergroup-controller.js +++ b/lib/cartodb/api/map/preview-layergroup-controller.js @@ -98,7 +98,7 @@ function getPreviewImageByCenter (previewBackend) { const format = req.params.format === 'jpg' ? 'jpeg' : 'png'; const { mapConfigProvider: provider } = res.locals; - previewBackend.getImage(provider, format, width, height, zoom, center, (err, image, headers, stats = {}) => { + previewBackend.getImage(provider, format, width, height, zoom, center, (err, image, stats = {}) => { req.profiler.done(`render-${format}`); req.profiler.add(stats); @@ -107,11 +107,7 @@ function getPreviewImageByCenter (previewBackend) { return next(err); } - if (headers) { - res.set(headers); - } - - res.set('Content-Type', headers['Content-Type'] || `image/${format}`); + res.set('Content-Type', `image/${format}`); res.statusCode = 200; res.body = image; @@ -134,7 +130,7 @@ function getPreviewImageByBoundingBox (previewBackend) { const format = req.params.format === 'jpg' ? 'jpeg' : 'png'; const { mapConfigProvider: provider } = res.locals; - previewBackend.getImage(provider, format, width, height, bounds, (err, image, headers, stats = {}) => { + previewBackend.getImage(provider, format, width, height, bounds, (err, image, stats = {}) => { req.profiler.done(`render-${format}`); req.profiler.add(stats); @@ -143,11 +139,7 @@ function getPreviewImageByBoundingBox (previewBackend) { return next(err); } - if (headers) { - res.set(headers); - } - - res.set('Content-Type', headers['Content-Type'] || `image/${format}`); + res.set('Content-Type', `image/${format}`); res.statusCode = 200; res.body = image; diff --git a/package-lock.json b/package-lock.json index 39dba97c..3ba47ca9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,9 +15,9 @@ }, "dependencies": { "mime": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.3.tgz", - "integrity": "sha512-QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw==" + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", + "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==" } } }, @@ -44,11 +44,10 @@ } }, "abaculus": { - "version": "github:cartodb/abaculus#6b37aeb0d2ed21c3ad083ce0d61b2be69dc642ff", - "from": "github:cartodb/abaculus#2.0.3-cdb15", + "version": "github:cartodb/abaculus#c28cea67337ee1ed52e1f724aab6a4f286772247", + "from": "github:cartodb/abaculus#cartofy", "requires": { "@carto/mapnik": "3.6.2-carto.15", - "d3-queue": "^2.0.2", "sphericalmercator": "1.0.5" } }, @@ -627,11 +626,6 @@ "resolved": "https://registry.npmjs.org/d3/-/d3-3.5.17.tgz", "integrity": "sha1-vEZ0gAQ3iyGjYMn8fPUjF5B2L7g=" }, - "d3-queue": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/d3-queue/-/d3-queue-2.0.3.tgz", - "integrity": "sha1-B/vaOsrlNYqcUpmq+ICt8JU+0sI=" - }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", @@ -2855,9 +2849,9 @@ } }, "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" } } }, @@ -2949,9 +2943,9 @@ }, "dependencies": { "resolve": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz", - "integrity": "sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz", + "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==", "requires": { "path-parse": "^1.0.6" } @@ -3903,17 +3897,17 @@ } }, "tar": { - "version": "4.4.8", - "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz", - "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", + "version": "4.4.10", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz", + "integrity": "sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==", "requires": { "chownr": "^1.1.1", "fs-minipass": "^1.2.5", - "minipass": "^2.3.4", - "minizlib": "^1.1.1", + "minipass": "^2.3.5", + "minizlib": "^1.2.1", "mkdirp": "^0.5.0", "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" + "yallist": "^3.0.3" }, "dependencies": { "safe-buffer": { @@ -4135,13 +4129,12 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-5.2.1.tgz", - "integrity": "sha512-on0ENiH/Rb4cT5N9S0qTz/Ey2DFte+JZVFT4vDKhVtrflrCB5jlSJHwhirvOu+l30/y2yUqQffnxghfH0ebaww==", + "version": "github:cartodb/windshaft#b6f84801d52f90ba5797b7e40724d7430daf8456", + "from": "github:cartodb/windshaft#abaculus-cartofy", "requires": { "@carto/cartonik": "^0.5.1", "@carto/mapnik": "3.6.2-carto.15", - "abaculus": "github:cartodb/abaculus#2.0.3-cdb15", + "abaculus": "github:cartodb/abaculus#cartofy", "canvas": "^2.4.1", "carto": "github:cartodb/carto#0.15.1-cdb5", "cartodb-psql": "0.13.1", diff --git a/package.json b/package.json index aab6a238..c43f95b8 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "step-profiler": "0.3.0", "turbo-carto": "0.21.0", "underscore": "1.6.0", - "windshaft": "5.2.1", + "windshaft": "github:cartodb/windshaft#abaculus-cartofy", "yargs": "11.1.0" }, "devDependencies": { From 20fe04de38240b5af74ea9914995245293a513b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 10 Jun 2019 13:16:05 +0200 Subject: [PATCH 2/7] Do not get headers from abaculus --- .../api/map/preview-template-controller.js | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/lib/cartodb/api/map/preview-template-controller.js b/lib/cartodb/api/map/preview-template-controller.js index eea382de..fb8c0c47 100644 --- a/lib/cartodb/api/map/preview-template-controller.js +++ b/lib/cartodb/api/map/preview-template-controller.js @@ -263,7 +263,7 @@ function getImage({ previewBackend, label }) { if (zoom !== undefined && center) { return previewBackend.getImage(mapConfigProvider, format, width, height, zoom, center, - (err, image, headers, stats) => { + (err, image, stats) => { req.profiler.add(stats); if (err) { @@ -271,10 +271,6 @@ function getImage({ previewBackend, label }) { return next(err); } - if (headers) { - res.set(headers); - } - res.statusCode = 200; res.body = image; @@ -282,7 +278,7 @@ function getImage({ previewBackend, label }) { }); } - previewBackend.getImage(mapConfigProvider, format, width, height, bounds, (err, image, headers, stats) => { + previewBackend.getImage(mapConfigProvider, format, width, height, bounds, (err, image, stats) => { req.profiler.add(stats); req.profiler.done('render-' + format); @@ -291,10 +287,6 @@ function getImage({ previewBackend, label }) { return next(err); } - if (headers) { - res.set(headers); - } - res.statusCode = 200; res.body = image; @@ -305,7 +297,9 @@ function getImage({ previewBackend, label }) { function setContentTypeHeader () { return function setContentTypeHeaderMiddleware(req, res, next) { - res.set('Content-Type', res.get('content-type') || res.get('Content-Type') || 'image/png'); + const format = req.params.format === 'jpg' ? 'jpeg' : 'png'; + + res.set('Content-Type', `image/${format}`); next(); }; From f43ccd4c4eebd5fe5b063e203eeea9ac6789a94e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 10 Jun 2019 19:04:22 +0200 Subject: [PATCH 3/7] Update devel branch --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3ba47ca9..16a8a941 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ } }, "abaculus": { - "version": "github:cartodb/abaculus#c28cea67337ee1ed52e1f724aab6a4f286772247", + "version": "github:cartodb/abaculus#e9b8bc126303b69aaa72dd52ec0d9a5c6efa8e21", "from": "github:cartodb/abaculus#cartofy", "requires": { "@carto/mapnik": "3.6.2-carto.15", @@ -4129,7 +4129,7 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "github:cartodb/windshaft#b6f84801d52f90ba5797b7e40724d7430daf8456", + "version": "github:cartodb/windshaft#fdaa1b4ad9440e402ac660193f45b77f3ed14856", "from": "github:cartodb/windshaft#abaculus-cartofy", "requires": { "@carto/cartonik": "^0.5.1", From ef4370c213a30b705858928cc6427d3343851c1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 12 Jun 2019 18:33:00 +0200 Subject: [PATCH 4/7] Update devel branch --- package-lock.json | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 16a8a941..9d2cdc69 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,15 +5,20 @@ "requires": true, "dependencies": { "@carto/cartonik": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/@carto/cartonik/-/cartonik-0.5.1.tgz", - "integrity": "sha512-LEnXBdsTjNNkzpY20xk6Dpj6hJ+cTRfHROquf8ZeBPF+MAcmtL2XrmRt+zn59y14ZsvLKcdoTJPuJriFWc+J9Q==", + "version": "github:cartodb/cartonik#405095bf5b1a002754917b177d376d25e8f00ff9", + "from": "github:cartodb/cartonik#abaculus-integration", "requires": { "@carto/mapnik": "^3.6.2-carto.15", + "@mapbox/sphericalmercator": "^1.1.0", "generic-pool": "^3.6.1", "mime": "^2.4.0" }, "dependencies": { + "@mapbox/sphericalmercator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@mapbox/sphericalmercator/-/sphericalmercator-1.1.0.tgz", + "integrity": "sha512-pEsfZyG4OMThlfFQbCte4gegvHUjxXCjz0KZ4Xk8NdOYTQBLflj6U8PL05RPAiuRAMAQNUUKJuL6qYZ5Y4kAWA==" + }, "mime": { "version": "2.4.4", "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", @@ -43,14 +48,6 @@ } } }, - "abaculus": { - "version": "github:cartodb/abaculus#e9b8bc126303b69aaa72dd52ec0d9a5c6efa8e21", - "from": "github:cartodb/abaculus#cartofy", - "requires": { - "@carto/mapnik": "3.6.2-carto.15", - "sphericalmercator": "1.0.5" - } - }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -2943,9 +2940,9 @@ }, "dependencies": { "resolve": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz", - "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz", + "integrity": "sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==", "requires": { "path-parse": "^1.0.6" } @@ -3948,9 +3945,9 @@ } }, "turbo-carto": { - "version": "0.21.1", - "resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.21.1.tgz", - "integrity": "sha512-MijaCzgz4cRjKMLaNxhMBq/lw+bb8cs+ZwGsHMAeJ8nTVWN7LY4b5LDBMIyxALmGiRkY8ziglmAoMU+xYnSTMA==", + "version": "0.21.2", + "resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.21.2.tgz", + "integrity": "sha512-yUqc5V9U5UEVksMfNSlDOr03mHEQBa187iTM4nbTiOwViBVAo/ndW07INt2np9gin+YO8MFJjo7Ioo8lr+3xUQ==", "requires": { "cartocolor": "4.0.0", "colorbrewer": "1.0.0", @@ -4129,12 +4126,11 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "github:cartodb/windshaft#fdaa1b4ad9440e402ac660193f45b77f3ed14856", + "version": "github:cartodb/windshaft#82688a6a6d9f13b7dbe67a0da76a5ec823af962d", "from": "github:cartodb/windshaft#abaculus-cartofy", "requires": { - "@carto/cartonik": "^0.5.1", + "@carto/cartonik": "github:cartodb/cartonik#abaculus-integration", "@carto/mapnik": "3.6.2-carto.15", - "abaculus": "github:cartodb/abaculus#cartofy", "canvas": "^2.4.1", "carto": "github:cartodb/carto#0.15.1-cdb5", "cartodb-psql": "0.13.1", From f21eda2b40795e1df5d31882cb177158adde26f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 17 Jun 2019 10:43:30 +0200 Subject: [PATCH 5/7] Adapt endpoints to the new preview interface --- .../api/map/preview-layergroup-controller.js | 12 ++++---- .../api/map/preview-template-controller.js | 16 +++++----- lib/cartodb/backends/tables-extent.js | 2 +- package-lock.json | 30 ++++++++----------- 4 files changed, 29 insertions(+), 31 deletions(-) diff --git a/lib/cartodb/api/map/preview-layergroup-controller.js b/lib/cartodb/api/map/preview-layergroup-controller.js index 2aa4e2e6..f8980866 100644 --- a/lib/cartodb/api/map/preview-layergroup-controller.js +++ b/lib/cartodb/api/map/preview-layergroup-controller.js @@ -96,9 +96,10 @@ function getPreviewImageByCenter (previewBackend) { }; const format = req.params.format === 'jpg' ? 'jpeg' : 'png'; - const { mapConfigProvider: provider } = res.locals; + const { mapConfigProvider } = res.locals; + const options = { mapConfigProvider, format, width, height, zoom, center }; - previewBackend.getImage(provider, format, width, height, zoom, center, (err, image, stats = {}) => { + previewBackend.getImage(options, (err, image, stats = {}) => { req.profiler.done(`render-${format}`); req.profiler.add(stats); @@ -121,16 +122,17 @@ function getPreviewImageByBoundingBox (previewBackend) { return function getPreviewImageByBoundingBoxMiddleware (req, res, next) { const width = +req.params.width; const height = +req.params.height; - const bounds = { + const bbox = { west: +req.params.west, north: +req.params.north, east: +req.params.east, south: +req.params.south }; const format = req.params.format === 'jpg' ? 'jpeg' : 'png'; - const { mapConfigProvider: provider } = res.locals; + const { mapConfigProvider } = res.locals; + const options = { mapConfigProvider, format, width, height, bbox }; - previewBackend.getImage(provider, format, width, height, bounds, (err, image, stats = {}) => { + previewBackend.getImage(options, (err, image, stats = {}) => { req.profiler.done(`render-${format}`); req.profiler.add(stats); diff --git a/lib/cartodb/api/map/preview-template-controller.js b/lib/cartodb/api/map/preview-template-controller.js index fb8c0c47..e4f42cae 100644 --- a/lib/cartodb/api/map/preview-template-controller.js +++ b/lib/cartodb/api/map/preview-template-controller.js @@ -215,7 +215,6 @@ function getImageOptionsFromCoordinates (zoom, lon, lat) { } } - function getImageOptionsFromTemplate (template, zoom) { if (template.view) { var zoomCenter = templateZoomCenter(template.view); @@ -239,7 +238,7 @@ function getImageOptionsFromBoundingBox (bbox = '') { if (_bbox.length === 4 && _bbox.every(Number.isFinite)) { return { - bounds: { + bbox: { west: _bbox[0], south: _bbox[1], east: _bbox[2], @@ -252,7 +251,7 @@ function getImageOptionsFromBoundingBox (bbox = '') { function getImage({ previewBackend, label }) { return function getImageMiddleware (req, res, next) { const { imageOpts, mapConfigProvider } = res.locals; - const { zoom, center, bounds } = imageOpts; + const { zoom, center, bbox } = imageOpts; let { width, height } = req.params; @@ -262,8 +261,9 @@ function getImage({ previewBackend, label }) { const format = req.params.format === 'jpg' ? 'jpeg' : 'png'; if (zoom !== undefined && center) { - return previewBackend.getImage(mapConfigProvider, format, width, height, zoom, center, - (err, image, stats) => { + const options = { mapConfigProvider, format, width, height, zoom, center }; + + return previewBackend.getImage(options, (err, image, stats) => { req.profiler.add(stats); if (err) { @@ -278,7 +278,9 @@ function getImage({ previewBackend, label }) { }); } - previewBackend.getImage(mapConfigProvider, format, width, height, bounds, (err, image, stats) => { + const options = { mapConfigProvider, format, width, height, bbox }; + + previewBackend.getImage(options, (err, image, stats) => { req.profiler.add(stats); req.profiler.done('render-' + format); @@ -348,7 +350,7 @@ function templateBounds(view) { if (hasAllBounds) { return { - bounds: { + bbox: { west: view.bounds.west, south: view.bounds.south, east: view.bounds.east, diff --git a/lib/cartodb/backends/tables-extent.js b/lib/cartodb/backends/tables-extent.js index ff41701c..f7499ee7 100644 --- a/lib/cartodb/backends/tables-extent.js +++ b/lib/cartodb/backends/tables-extent.js @@ -41,7 +41,7 @@ TablesExtentBackend.prototype.getBounds = function (username, tables, callback) var result = null; if (rows.length > 0) { result = { - bounds: rows[0] + bbox: rows[0] }; } callback(null, result); diff --git a/package-lock.json b/package-lock.json index 9d2cdc69..359f4829 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,8 +5,8 @@ "requires": true, "dependencies": { "@carto/cartonik": { - "version": "github:cartodb/cartonik#405095bf5b1a002754917b177d376d25e8f00ff9", - "from": "github:cartodb/cartonik#abaculus-integration", + "version": "github:cartodb/cartonik#c3ad19d9533a2ca938e002b33fded4f474aea723", + "from": "github:cartodb/cartonik#master", "requires": { "@carto/mapnik": "^3.6.2-carto.15", "@mapbox/sphericalmercator": "^1.1.0", @@ -14,11 +14,6 @@ "mime": "^2.4.0" }, "dependencies": { - "@mapbox/sphericalmercator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@mapbox/sphericalmercator/-/sphericalmercator-1.1.0.tgz", - "integrity": "sha512-pEsfZyG4OMThlfFQbCte4gegvHUjxXCjz0KZ4Xk8NdOYTQBLflj6U8PL05RPAiuRAMAQNUUKJuL6qYZ5Y4kAWA==" - }, "mime": { "version": "2.4.4", "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", @@ -48,6 +43,11 @@ } } }, + "@mapbox/sphericalmercator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@mapbox/sphericalmercator/-/sphericalmercator-1.1.0.tgz", + "integrity": "sha512-pEsfZyG4OMThlfFQbCte4gegvHUjxXCjz0KZ4Xk8NdOYTQBLflj6U8PL05RPAiuRAMAQNUUKJuL6qYZ5Y4kAWA==" + }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -3708,11 +3708,6 @@ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz", "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==" }, - "sphericalmercator": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/sphericalmercator/-/sphericalmercator-1.0.5.tgz", - "integrity": "sha1-3cWgSeNg4ADQ+tn8IsQHGIJYSYA=" - }, "split": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", @@ -3727,9 +3722,9 @@ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, "sqlite3": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.8.tgz", - "integrity": "sha512-kgwHu4j10KhpCHtx//dejd/tVQot7jc3sw+Sn0vMuKOw0X00Ckyg9VceKgzPyGmmz+zEoYue9tOLriWTvYy0ww==", + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.9.tgz", + "integrity": "sha512-IkvzjmsWQl9BuBiM4xKpl5X8WCR4w0AeJHRdobCdXZ8dT/lNc1XS6WqvY35N6+YzIIgzSBeY5prdFObID9F9tA==", "requires": { "nan": "^2.12.1", "node-pre-gyp": "^0.11.0", @@ -4126,10 +4121,10 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "github:cartodb/windshaft#82688a6a6d9f13b7dbe67a0da76a5ec823af962d", + "version": "github:cartodb/windshaft#ff176e1ab4a094ea4f786cca1c78f2c5e3481e8a", "from": "github:cartodb/windshaft#abaculus-cartofy", "requires": { - "@carto/cartonik": "github:cartodb/cartonik#abaculus-integration", + "@carto/cartonik": "github:cartodb/cartonik#master", "@carto/mapnik": "3.6.2-carto.15", "canvas": "^2.4.1", "carto": "github:cartodb/carto#0.15.1-cdb5", @@ -4140,7 +4135,6 @@ "redis-mpool": "0.7.0", "request": "2.87.0", "semver": "5.5.0", - "sphericalmercator": "1.0.5", "torque.js": "^3.1.0", "underscore": "1.6.0" } From b09a35f272cd5fe233932b5e9d42cfbc4e60f071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 17 Jun 2019 15:37:51 +0200 Subject: [PATCH 6/7] Upgrade windshaft to version 5.3.0 --- package-lock.json | 12 +++++++----- package.json | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 359f4829..5de9a345 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,8 +5,9 @@ "requires": true, "dependencies": { "@carto/cartonik": { - "version": "github:cartodb/cartonik#c3ad19d9533a2ca938e002b33fded4f474aea723", - "from": "github:cartodb/cartonik#master", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@carto/cartonik/-/cartonik-0.6.0.tgz", + "integrity": "sha512-p8Y9OvR/tTKm82juUVDRs0dEeN7yHt0Wrh+J81aDuBkbFTPPDxIlWm+hsDr+kLnta67zCfTtJYQJjeHEgCfbSg==", "requires": { "@carto/mapnik": "^3.6.2-carto.15", "@mapbox/sphericalmercator": "^1.1.0", @@ -4121,10 +4122,11 @@ "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "windshaft": { - "version": "github:cartodb/windshaft#ff176e1ab4a094ea4f786cca1c78f2c5e3481e8a", - "from": "github:cartodb/windshaft#abaculus-cartofy", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-5.3.0.tgz", + "integrity": "sha512-tirrSpUXJ3vJ3Es95yDq0DzEkb2M0ueNIPIONqCwjyCEikjvFRbu9N+j1pcJAhFiitbdG36rUZftO++vPCMiiQ==", "requires": { - "@carto/cartonik": "github:cartodb/cartonik#master", + "@carto/cartonik": "^0.6.0", "@carto/mapnik": "3.6.2-carto.15", "canvas": "^2.4.1", "carto": "github:cartodb/carto#0.15.1-cdb5", diff --git a/package.json b/package.json index c43f95b8..cc871137 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "step-profiler": "0.3.0", "turbo-carto": "0.21.0", "underscore": "1.6.0", - "windshaft": "github:cartodb/windshaft#abaculus-cartofy", + "windshaft": "^5.3.0", "yargs": "11.1.0" }, "devDependencies": { From 3121d907c1cd12590bd1eb25023e90487fda590e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 17 Jun 2019 15:40:31 +0200 Subject: [PATCH 7/7] Update NEWS --- NEWS.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 463160b2..578d8c77 100644 --- a/NEWS.md +++ b/NEWS.md @@ -6,8 +6,9 @@ Released 2019-XX-XX Announcements: - Update deps: - - windshaft@5.2.1: + - windshaft@5.3.0: - Update @carto/mapnik to [`3.6.2-carto.15`](https://github.com/CartoDB/node-mapnik/blob/v3.6.2-carto.15/CHANGELOG.carto.md#362-carto15). + - Upgrade `@carto/cartonik` to version [0.6.0](https://github.com/CartoDB/cartonik/blob/v0.6.0/CHANGELOG.md#v060-2019-06-17). ## 7.1.0 Released 2019-05-06