Append dataviews filters after checking if mapconfig must be adapted

2016-04-20 15:40:14 +02:00
parent d70af7c9c1
commit e04a9a2579
1 changed files with 5 additions and 4 deletions
@@ -70,6 +70,11 @@ AnalysisMapConfigAdapter.prototype.getLayers = function(analysisConfiguration, r
    // jshint maxcomplexity:7
    var self = this;
    filters = filters || {};
+
+    if (!shouldAdaptLayers(requestMapConfig)) {
+        return callback(null, requestMapConfig);
+    }
+
    var dataviewsFilters = filters.dataviews || {};
    debug(dataviewsFilters);
    var dataviews = requestMapConfig.dataviews || {};
@@ -93,10 +98,6 @@ AnalysisMapConfigAdapter.prototype.getLayers = function(analysisConfiguration, r

    requestMapConfig = appendFiltersToNodes(requestMapConfig, dataviewsFiltersBySourceId);

-    if (!shouldAdaptLayers(requestMapConfig)) {
-        return callback(null, requestMapConfig);
-    }
-
    function createAnalysis(analysisDefinition, done) {
        self.analysisBackend.create(analysisConfiguration, analysisDefinition, done);
    }