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

Do not use layer index as analysis node is are unique

Browse Source
This commit is contained in:
Raul Ochoa
2016-04-14 11:08:39 +02:00
parent 09687b3811
commit e037c8c1b2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cartodb/controllers/layergroup.js
View File

@@ -94,7 +94,7 @@ LayergroupController.prototype.register = function(app) {
this.dataviewSearch.bind(this));
app.get(app.base_url_mapconfig +
'/:token/analysis/:analysisIndex/node/:nodeId', cors(), userMiddleware,
'/:token/analysis/node/:nodeId', cors(), userMiddleware,
this.analysisNodeStatus.bind(this));
};

4
lib/cartodb/controllers/map.js
View File

@@ -394,12 +394,12 @@ function addAnalysesMetadata(username, layergroup, analysesResults) {
analysesResults = analysesResults || [];
layergroup.metadata.analyses = layergroup.metadata.analyses || [];
analysesResults.forEach(function(analysis, index) {
analysesResults.forEach(function(analysis) {
var nodes = analysis.getSortedNodes();
layergroup.metadata.analyses.push({
nodes: nodes.reduce(function(nodesIdMap, node) {
if (node.params.id) {
var nodeResource = layergroup.layergroupid + '/analysis/' + index + '/node/' + node.id();
var nodeResource = layergroup.layergroupid + '/analysis/node/' + node.id();
nodesIdMap[node.params.id] = {
status: node.getStatus(),
query: node.getQuery(),