From 6b3dc8ece0772dc0224833d695f7d6b93ebd182f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 14 Mar 2018 13:05:05 +0100 Subject: [PATCH] Extract prepareLayerFilterFromPreviewLayers middleware from controller's context --- lib/cartodb/controllers/named_maps.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/cartodb/controllers/named_maps.js b/lib/cartodb/controllers/named_maps.js index 09b27dbc..c78a8174 100644 --- a/lib/cartodb/controllers/named_maps.js +++ b/lib/cartodb/controllers/named_maps.js @@ -78,7 +78,7 @@ NamedMapsController.prototype.register = function(app) { getNamedMapProvider(staticOptions), getAffectedTables(), getTemplate(staticOptions), - this.prepareLayerFilterFromPreviewLayers(staticOptions), + prepareLayerFilterFromPreviewLayers(staticOptions), this.getStaticImageOptions(), this.getImage(staticOptions), this.incrementMapViews(), @@ -152,7 +152,7 @@ function getTemplate ({ label }) { }; }; -NamedMapsController.prototype.prepareLayerFilterFromPreviewLayers = function ({ label }) { +function prepareLayerFilterFromPreviewLayers ({ namedMapProviderCache, label }) { return function prepareLayerFilterFromPreviewLayersMiddleware (req, res, next) { const { user, template } = res.locals; const { template_id } = req.params; @@ -181,7 +181,7 @@ NamedMapsController.prototype.prepareLayerFilterFromPreviewLayers = function ({ params.layer = layerVisibilityFilter.join(','); // recreates the provider - this.namedMapProviderCache.get(user, template_id, config, auth_token, params, (err, provider) => { + namedMapProviderCache.get(user, template_id, config, auth_token, params, (err, provider) => { if (err) { err.label = label; return next(err); @@ -191,7 +191,7 @@ NamedMapsController.prototype.prepareLayerFilterFromPreviewLayers = function ({ next(); }); - }.bind(this); + }; }; NamedMapsController.prototype.getTile = function ({ label }) {