Update windshaft devel branch

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
@@ -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;