From f14d8b1e575a594194221109eb222887204e0df3 Mon Sep 17 00:00:00 2001 From: Petr Sloup Date: Fri, 20 Jan 2017 10:20:06 +0100 Subject: [PATCH] Update sharp dependency --- package.json | 2 +- src/serve_rendered.js | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index f70ef63..02456f6 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "nomnom": "1.8.1", "pbf": "3.0.5", "request": "2.79.0", - "sharp": "0.16.2", + "sharp": "0.17.1", "tileserver-gl-styles": "1.1.0", "vector-tile": "1.3.0", "@mapbox/mapbox-gl-native": "3.4.4", diff --git a/src/serve_rendered.js b/src/serve_rendered.js index 77f8cd7..09f686c 100644 --- a/src/serve_rendered.js +++ b/src/serve_rendered.js @@ -327,16 +327,15 @@ module.exports = function(options, repo, params, id, dataResolver) { image.overlayWith(opt_overlay); } - image.toFormat(format); - var formatQuality = (params.formatQuality || {})[format] || (options.formatQuality || {})[format]; + if (format == 'png') { - image.withoutAdaptiveFiltering(); + image.png({adaptiveFiltering: false}); } else if (format == 'jpeg') { - image.quality(formatQuality || 80); + image.jpeg({quality: formatQuality || 80}); } else if (format == 'webp') { - image.quality(formatQuality || 90); + image.webp({quality: formatQuality || 90}); } image.toBuffer(function(err, buffer, info) { if (!buffer) {