From e037c8c1b27a239e04eaee97dfe10091ef9542cb Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 14 Apr 2016 11:08:39 +0200 Subject: [PATCH] Do not use layer index as analysis node is are unique --- lib/cartodb/controllers/layergroup.js | 2 +- lib/cartodb/controllers/map.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/cartodb/controllers/layergroup.js b/lib/cartodb/controllers/layergroup.js index b6289619..915ff839 100644 --- a/lib/cartodb/controllers/layergroup.js +++ b/lib/cartodb/controllers/layergroup.js @@ -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)); }; diff --git a/lib/cartodb/controllers/map.js b/lib/cartodb/controllers/map.js index 643c946d..811122e3 100644 --- a/lib/cartodb/controllers/map.js +++ b/lib/cartodb/controllers/map.js @@ -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(),