Allow to instantiate maps with analyses filters
This decouples filters from dataviews. They are more verbose now. Misses validation of filters.
This commit is contained in:
@@ -58,6 +58,13 @@ AnalysisMapConfigAdapter.prototype.getMapConfig = function(user, requestMapConfi
|
||||
|
||||
requestMapConfig = appendFiltersToNodes(requestMapConfig, dataviewsFiltersBySourceId);
|
||||
|
||||
// Expected format for analyses filters
|
||||
// filters = {analyses: {
|
||||
// a1: [{min, max}, {accept, reject}],
|
||||
// b1: [{range, column, min, max}, {category, column, accept, reject}]
|
||||
// }}
|
||||
requestMapConfig = appendFiltersToNodes(requestMapConfig, filters.analyses);
|
||||
|
||||
function createAnalysis(analysisDefinition, done) {
|
||||
self.analysisBackend.create(analysisConfiguration, analysisDefinition, function (err, analysis) {
|
||||
if (err) {
|
||||
@@ -200,6 +207,7 @@ function dataviewQuery(node, dataviewName, ownFilter) {
|
||||
|
||||
function appendFiltersToNodes(requestMapConfig, dataviewsFiltersBySourceId) {
|
||||
var analyses = requestMapConfig.analyses || [];
|
||||
dataviewsFiltersBySourceId = dataviewsFiltersBySourceId || {};
|
||||
|
||||
requestMapConfig.analyses = analyses.map(function(analysisDefinition) {
|
||||
var analysisGraph = new camshaft.reference.AnalysisGraph(analysisDefinition);
|
||||
|
||||
Reference in New Issue
Block a user