From 1f6bb6839a90aaf824d1a39f02c2ae667cd6df95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Mart=C3=ADn?= Date: Mon, 30 Jul 2018 17:32:57 +0200 Subject: [PATCH] remove step --- .../adapter/mapconfig-overviews-adapter.js | 84 +++++++++---------- 1 file changed, 41 insertions(+), 43 deletions(-) diff --git a/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js b/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js index 308b078d..c8df8b21 100644 --- a/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js +++ b/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js @@ -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); + } } }); }