Use req2params middleware for name maps static views endpoint

2017-09-22 00:58:44 +02:00
parent a8898a8022
commit 8139cdf8b2
1 changed files with 4 additions and 7 deletions
@@ -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,