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

Do not remove analysis, camshaft takes care of source root nodes now

Browse Source
This commit is contained in:
Raul Ochoa 2016-03-21 18:02:19 +01:00
parent ff147ca3bf
commit d5c5c7bdbb
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/cartodb/models/analysis_mapconfig_adapter.js
View File

@ -104,17 +104,7 @@ AnalysisMapConfigAdapter.prototype.getLayers = function(analysisConfiguration, r
debug('mapconfig input', JSON.stringify(requestMapConfig, null, 4));
var analysisToRemove = {};
if (Array.isArray(requestMapConfig.analyses)) {
requestMapConfig = replaceSourceRootQueries(requestMapConfig, analysisToRemove);
requestMapConfig = appendFiltersToNodes(requestMapConfig, dataviewsFiltersBySourceId);
if (Object.keys(dataviews).length === 0) {
requestMapConfig.analyses = requestMapConfig.analyses.filter(function(analysis, index) {
return !analysisToRemove.hasOwnProperty(index);
});
}
}
requestMapConfig = appendFiltersToNodes(requestMapConfig, dataviewsFiltersBySourceId);
if (!shouldAdaptLayers(requestMapConfig)) {
debug('mapconfig output', JSON.stringify(requestMapConfig, null, 4));