From 20fe04de38240b5af74ea9914995245293a513b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Mon, 10 Jun 2019 13:16:05 +0200
Subject: [PATCH] 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();
     };