From 3b3e0c0acdcfd5f8ed253ecbc52eeae9ee29ecfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Wed, 14 Mar 2018 13:15:38 +0100
Subject: [PATCH] Extract getImage middleware from controller's context

---
 lib/cartodb/controllers/named_maps.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/cartodb/controllers/named_maps.js b/lib/cartodb/controllers/named_maps.js
index ed8ebd1f..494620aa 100644
--- a/lib/cartodb/controllers/named_maps.js
+++ b/lib/cartodb/controllers/named_maps.js
@@ -65,6 +65,7 @@ NamedMapsController.prototype.register = function(app) {
     );
 
     const staticOptions = {
+        previewBackend: this.previewBackend,
         namedMapProviderCache: this.namedMapProviderCache,
         forcedFormat: 'png',
         label: 'STATIC_VIZ_MAP'
@@ -81,7 +82,7 @@ NamedMapsController.prototype.register = function(app) {
         getTemplate(staticOptions),
         prepareLayerFilterFromPreviewLayers(staticOptions),
         getStaticImageOptions({ tablesExtentApi: this.tablesExtentApi }),
-        this.getImage(staticOptions),
+        getImage(staticOptions),
         this.incrementMapViews(),
         this.setSurrogateKey(),
         this.setCacheChannelHeader(),
@@ -318,7 +319,7 @@ function getImageOptionsFromBoundingBox (bbox = '') {
     }
 }
 
-NamedMapsController.prototype.getImage = function ({ label }) {
+function getImage({ previewBackend, label }) {
     return function getImageMiddleware (req, res, next) {
         const { imageOpts, namedMapProvider } = res.locals;
         const { zoom, center, bounds } = imageOpts;
@@ -331,7 +332,7 @@ NamedMapsController.prototype.getImage = function ({ label }) {
         const format = req.params.format === 'jpg' ? 'jpeg' : 'png';
 
         if (zoom !== undefined && center) {
-            return this.previewBackend.getImage(namedMapProvider, format, width, height, zoom, center,
+            return previewBackend.getImage(namedMapProvider, format, width, height, zoom, center,
                 (err, image, headers, stats) => {
                 if (err) {
                     err.label = label;
@@ -346,7 +347,7 @@ NamedMapsController.prototype.getImage = function ({ label }) {
             });
         }
 
-        this.previewBackend.getImage(namedMapProvider, format, width, height, bounds, (err, image, headers, stats) => {
+        previewBackend.getImage(namedMapProvider, format, width, height, bounds, (err, image, headers, stats) => {
             if (err) {
                 err.label = label;
                 return next(err);
@@ -358,8 +359,8 @@ NamedMapsController.prototype.getImage = function ({ label }) {
 
             next();
         });
-    }.bind(this);
-};
+    };
+}
 
 function incrementMapViewsError (ctx) {
     return `ERROR: failed to increment mapview count for user '${ctx.user}': ${ctx.err}`;