cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update windshaft devel branch

Browse Source
This commit is contained in:
Daniel García Aubert
2019-06-10 12:49:56 +02:00
parent bfaf764f13
commit dc16f4cebf
3 changed files with 25 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cartodb/api/map/preview-layergroup-controller.js
+4 -12
View File
@@ -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;
package-lock.json
Generated
+20 -27
View File
@@ -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",
package.json
+1 -1
View File
@@ -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": {