From 8139cdf8b248eb6c7bd6eed56c5aaaf1acfbca03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Fri, 22 Sep 2017 00:58:44 +0200
Subject: [PATCH] Use req2params middleware for name maps static views endpoint

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

diff --git a/lib/cartodb/controllers/named_maps.js b/lib/cartodb/controllers/named_maps.js
index a6c0888c..033b449b 100644
--- a/lib/cartodb/controllers/named_maps.js
+++ b/lib/cartodb/controllers/named_maps.js
@@ -42,6 +42,7 @@ NamedMapsController.prototype.register = function(app) {
         cors(),
         userMiddleware,
         allowQueryParams(['layer']),
+        this.req2paramsMiddleware,
         this.staticMap.bind(this)
     );
 };
@@ -124,16 +125,12 @@ NamedMapsController.prototype.staticMap = function(req, res, next) {
     var cdbUser = req.context.user;
 
     var format = req.params.format === 'jpg' ? 'jpeg' : 'png';
-    req.params.format = 'png';
-    req.params.layer = 'all';
+    req.params.format = req.params.format || 'png';
+    req.params.layer = req.params.layer || 'all';
 
     var namedMapProvider;
     step(
-        function reqParams() {
-            self.req2params(req, res, this);
-        },
-        function getNamedMapProvider(err) {
-            assert.ifError(err);
+        function getNamedMapProvider() {
             self.namedMapProviderCache.get(
                 cdbUser,
                 req.params.template_id,