From ea0805b017559bd58be3655a2bf01faefacb753d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Tue, 31 Jul 2018 15:01:22 +0200 Subject: [PATCH] early return --- .../adapter/mapconfig-overviews-adapter.js | 84 +++++++++---------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js b/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js index 4134b19f..2f458f0d 100644 --- a/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js +++ b/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js @@ -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); } }); }