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

early return

Browse Source
This commit is contained in:
Simon Martín
2018-07-31 15:01:22 +02:00
parent 324e614902
commit ea0805b017
1 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js
+42 -42
View File
@@ -26,55 +26,55 @@ MapConfigOverviewsAdapter.prototype.getMapConfig = function (user, requestMapCon
}
self.overviewsMetadataBackend.getOverviewsMetadata(user, layer.options.sql, function (err, metadata) {
if (err) {
done(err, layer);
} else {
var query_rewrite_data = { overviews: metadata };
return done(err, layer);
}
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;
}
var query_rewrite_data = { overviews: metadata };
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;
}
}
if (filters) {
self.filterStatsBackend.getFilterStats(
user,
unfiltered_query,
filters,
function (err, stats) {
if (err) {
return done(null, layer);
}
query_rewrite_data.filter_stats = stats;
if (!_.isEmpty(metadata)) {
layer = Object.assign({}, layer);
layer.options = Object.assign({}, layer.options, { query_rewrite_data });
}
if (filters) {
self.filterStatsBackend.getFilterStats(
user,
unfiltered_query,
filters,
function (err, stats) {
if (err) {
return done(null, layer);
}
);
} else {
if (!_.isEmpty(metadata)) {
layer = Object.assign({}, layer);
layer.options = Object.assign({}, layer.options, { query_rewrite_data });
}
return done(null, layer);
query_rewrite_data.filter_stats = stats;
if (!_.isEmpty(metadata)) {
layer = Object.assign({}, layer);
layer.options = Object.assign({}, layer.options, { query_rewrite_data });
}
return done(null, layer);
}
);
} else {
if (!_.isEmpty(metadata)) {
layer = Object.assign({}, layer);
layer.options = Object.assign({}, layer.options, { query_rewrite_data });
}
return done(null, layer);
}
});
}