cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Follow node.js convention regarding early returns

Browse Source
This commit is contained in:
Daniel García Aubert
2017-10-31 15:49:10 +01:00
parent fab87e2168
commit 12822c4341
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cartodb/controllers/map.js
+20 -20
View File
@@ -293,27 +293,27 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn
if (err) {
err.label = 'NAMED MAP LAYERGROUP';
next(err);
}
const { layergroup } = res.locals;
var templateHash = self.templateMaps.fingerPrint(mapConfigProvider.template).substring(0, 8);
layergroup.layergroupid = cdbuser + '@' + templateHash + '@' + layergroup.layergroupid;
var _mapConfig = mapConfig.obj();
self.addDataviewsAndWidgetsUrls(cdbuser, layergroup, _mapConfig);
self.addAnalysesMetadata(cdbuser, layergroup, mapConfigProvider.analysesResults);
addContextMetadata(layergroup, _mapConfig, mapConfigProvider.context);
res.set('X-Layergroup-Id', layergroup.layergroupid);
self.surrogateKeysCache.tag(res, new NamedMapsCacheEntry(cdbuser, mapConfigProvider.getTemplateName()));
res.status(200);
if (req.query && req.query.callback) {
res.jsonp(layergroup);
} else {
const { layergroup } = res.locals;
var templateHash = self.templateMaps.fingerPrint(mapConfigProvider.template).substring(0, 8);
layergroup.layergroupid = cdbuser + '@' + templateHash + '@' + layergroup.layergroupid;
var _mapConfig = mapConfig.obj();
self.addDataviewsAndWidgetsUrls(cdbuser, layergroup, _mapConfig);
self.addAnalysesMetadata(cdbuser, layergroup, mapConfigProvider.analysesResults);
addContextMetadata(layergroup, _mapConfig, mapConfigProvider.context);
res.set('X-Layergroup-Id', layergroup.layergroupid);
self.surrogateKeysCache.tag(res, new NamedMapsCacheEntry(cdbuser, mapConfigProvider.getTemplateName()));
res.status(200);
if (req.query && req.query.callback) {
res.jsonp(layergroup);
} else {
res.json(layergroup);
}
res.json(layergroup);
}
}
);