diff --git a/lib/cartodb/controllers/layergroup.js b/lib/cartodb/controllers/layergroup.js index 08722815..3762e0c5 100644 --- a/lib/cartodb/controllers/layergroup.js +++ b/lib/cartodb/controllers/layergroup.js @@ -43,8 +43,10 @@ function LayergroupController(prepareContext, pgConnection, mapStore, tileBacken module.exports = LayergroupController; LayergroupController.prototype.register = function(app) { + const { base_url_mapconfig: basePath } = app; + app.get( - app.base_url_mapconfig + '/:token/:z/:x/:y@:scale_factor?x.:format', + `${basePath}/:token/:z/:x/:y@:scale_factor?x.:format`, cors(), userMiddleware, this.prepareContext, @@ -63,7 +65,7 @@ LayergroupController.prototype.register = function(app) { ); app.get( - app.base_url_mapconfig + '/:token/:z/:x/:y.:format', + `${basePath}/:token/:z/:x/:y.:format`, cors(), userMiddleware, this.prepareContext, @@ -82,7 +84,7 @@ LayergroupController.prototype.register = function(app) { ); app.get( - app.base_url_mapconfig + '/:token/:layer/:z/:x/:y.(:format)', + `${basePath}/:token/:layer/:z/:x/:y.(:format)`, cors(), userMiddleware, validateLayerRouteMiddleware, @@ -102,7 +104,7 @@ LayergroupController.prototype.register = function(app) { ); app.get( - app.base_url_mapconfig + '/:token/:layer/attributes/:fid', + `${basePath}/:token/:layer/attributes/:fid`, cors(), userMiddleware, this.prepareContext, @@ -119,7 +121,7 @@ LayergroupController.prototype.register = function(app) { const forcedFormat = 'png'; app.get( - app.base_url_mapconfig + '/static/center/:token/:z/:lat/:lng/:width/:height.:format', + `${basePath}/static/center/:token/:z/:lat/:lng/:width/:height.:format`, cors(), userMiddleware, allowQueryParams(['layer']), @@ -135,7 +137,7 @@ LayergroupController.prototype.register = function(app) { ); app.get( - app.base_url_mapconfig + '/static/bbox/:token/:west,:south,:east,:north/:width/:height.:format', + `${basePath}/static/bbox/:token/:west,:south,:east,:north/:width/:height.:format`, cors(), userMiddleware, allowQueryParams(['layer']), @@ -169,7 +171,7 @@ LayergroupController.prototype.register = function(app) { ]; app.get( - app.base_url_mapconfig + '/:token/dataview/:dataviewName', + `${basePath}/:token/dataview/:dataviewName`, cors(), userMiddleware, allowQueryParams(allowedDataviewQueryParams), @@ -185,7 +187,7 @@ LayergroupController.prototype.register = function(app) { ); app.get( - app.base_url_mapconfig + '/:token/:layer/widget/:dataviewName', + `${basePath}/:token/:layer/widget/:dataviewName`, cors(), userMiddleware, allowQueryParams(allowedDataviewQueryParams), @@ -201,7 +203,7 @@ LayergroupController.prototype.register = function(app) { ); app.get( - app.base_url_mapconfig + '/:token/dataview/:dataviewName/search', + `${basePath}/:token/dataview/:dataviewName/search`, cors(), userMiddleware, allowQueryParams(allowedDataviewQueryParams), @@ -217,7 +219,7 @@ LayergroupController.prototype.register = function(app) { ); app.get( - app.base_url_mapconfig + '/:token/:layer/widget/:dataviewName/search', + `${basePath}/:token/:layer/widget/:dataviewName/search`, cors(), userMiddleware, allowQueryParams(allowedDataviewQueryParams), @@ -233,7 +235,7 @@ LayergroupController.prototype.register = function(app) { ); app.get( - app.base_url_mapconfig + '/:token/analysis/node/:nodeId', + `${basePath}/:token/analysis/node/:nodeId`, cors(), userMiddleware, this.prepareContext,