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

remove step

Browse Source
This commit is contained in:
Simon Martín
2018-07-30 17:32:57 +02:00
parent 1e70717554
commit 1f6bb6839a
1 changed files with 41 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js
+41 -43
View File
@@ -1,4 +1,3 @@
var step = require('step');
var queue = require('queue-async');
var _ = require('underscore');
@@ -30,51 +29,50 @@ MapConfigOverviewsAdapter.prototype.getMapConfig = function (user, requestMapCon
done(err, layer);
} else {
var query_rewrite_data = { overviews: metadata };
step(
function collectFiltersData() {
var filters, unfiltered_query;
if (layer.options.source && analysesResults && !layer.options.sql_wrap) {
var sourceId = layer.options.source.id;
var node = _.find(analysesResults, function (a) { return a.rootNode.params.id === sourceId; });
if (node) {
node = node.rootNode;
filters = node.getFilters();
var filters_disabler = Object.keys(filters).reduce(
function (disabler, filter_id) { disabler[filter_id] = false; return disabler; },
{}
);
unfiltered_query = node.getQuery(filters_disabler);
query_rewrite_data.filters = filters;
query_rewrite_data.unfiltered_query = unfiltered_query;
}
}
this(null, filters, unfiltered_query);
},
function collectStatsData(err, filters, unfiltered_query) {
var next_step = this;
if (filters) {
self.filterStatsBackend.getFilterStats(
user,
unfiltered_query, filters,
function (err, stats) {
if (!err) {
query_rewrite_data.filter_stats = stats;
}
return next_step(err);
}
function collectFiltersData() {
var filters, unfiltered_query;
if (layer.options.source && analysesResults && !layer.options.sql_wrap) {
var sourceId = layer.options.source.id;
var node = _.find(analysesResults, function (a) { return a.rootNode.params.id === sourceId; });
if (node) {
node = node.rootNode;
filters = node.getFilters();
var filters_disabler = Object.keys(filters).reduce(
function (disabler, filter_id) { disabler[filter_id] = false; return disabler; },
{}
);
} else {
return next_step(null);
unfiltered_query = node.getQuery(filters_disabler);
query_rewrite_data.filters = filters;
query_rewrite_data.unfiltered_query = unfiltered_query;
}
},
function addDataToLayer(err) {
if (!err && !_.isEmpty(metadata)) {
layer = _.extend({}, layer);
layer.options = _.extend({}, layer.options, { query_rewrite_data: query_rewrite_data });
}
done(null, layer);
}
);
this(null, filters, unfiltered_query);
},
function collectStatsData(err, filters, unfiltered_query) {
var next_step = this;
if (filters) {
self.filterStatsBackend.getFilterStats(
user,
unfiltered_query, filters,
function (err, stats) {
if (!err) {
query_rewrite_data.filter_stats = stats;
}
return next_step(err);
}
);
} else {
return next_step(null);
}
},
function addDataToLayer(err) {
if (!err && !_.isEmpty(metadata)) {
layer = _.extend({}, layer);
layer.options = _.extend({}, layer.options, { query_rewrite_data: query_rewrite_data });
}
done(null, layer);
}
}
});
}