From a8d31d52cf7c5b1b445d928c67b48e1a14784927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 14 Mar 2018 17:08:04 +0100 Subject: [PATCH] Pass only required params --- lib/cartodb/controllers/named_maps.js | 34 ++++++++++++--------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/lib/cartodb/controllers/named_maps.js b/lib/cartodb/controllers/named_maps.js index 8f6e8cd7..f083cf1c 100644 --- a/lib/cartodb/controllers/named_maps.js +++ b/lib/cartodb/controllers/named_maps.js @@ -41,20 +41,20 @@ function NamedMapsController(prepareContext, namedMapProviderCache, tileBackend, module.exports = NamedMapsController; NamedMapsController.prototype.register = function(app) { - const tileOptions = { - namedMapProviderCache: this.namedMapProviderCache, - tileBackend: this.tileBackend, - label: 'NAMED_MAP_TILE' - }; - app.get( app.base_url_templated + '/:template_id/:layer/:z/:x/:y.(:format)', cors(), userMiddleware(), this.prepareContext, - getNamedMapProvider(tileOptions), + getNamedMapProvider({ + namedMapProviderCache: this.namedMapProviderCache, + label: 'NAMED_MAP_TILE' + }), getAffectedTables(), - getTile(tileOptions), + getTile({ + tileBackend: this.tileBackend, + label: 'NAMED_MAP_TILE' + }), setSurrogateKeyHeader({ surrogateKeysCache: this.surrogateKeysCache }), setCacheChannelHeader(), setLastModifiedHeader(), @@ -64,25 +64,21 @@ NamedMapsController.prototype.register = function(app) { vectorError() ); - const staticOptions = { - previewBackend: this.previewBackend, - namedMapProviderCache: this.namedMapProviderCache, - forcedFormat: 'png', - label: 'STATIC_VIZ_MAP' - }; - app.get( app.base_url_mapconfig + '/static/named/:template_id/:width/:height.:format', cors(), userMiddleware(), allowQueryParams(['layer', 'zoom', 'lon', 'lat', 'bbox']), this.prepareContext, - getNamedMapProvider(staticOptions), + getNamedMapProvider({ previewBackend: this.previewBackend, label: 'STATIC_VIZ_MAP', forcedFormat: 'png' }), getAffectedTables(), - getTemplate(staticOptions), - prepareLayerFilterFromPreviewLayers(staticOptions), + getTemplate({ label: 'STATIC_VIZ_MAP' }), + prepareLayerFilterFromPreviewLayers({ + namedMapProviderCache: this.namedMapProviderCache, + label: 'STATIC_VIZ_MAP' + }), getStaticImageOptions({ tablesExtentApi: this.tablesExtentApi }), - getImage(staticOptions), + getImage({ previewBackend: this.previewBackend, label: 'STATIC_VIZ_MAP' }), incrementMapViews({ metadataBackend: this.metadataBackend }), setSurrogateKeyHeader({ surrogateKeysCache: this.surrogateKeysCache }), setCacheChannelHeader(),