From 64a87690eeec6506afdfd04fed81ec79baf493a1 Mon Sep 17 00:00:00 2001
From: Javier Goizueta <jgoizueta@gmail.com>
Date: Thu, 12 May 2016 16:20:34 +0200
Subject: [PATCH] :lipstick: Fix line lengths, etc.

---
 lib/cartodb/backends/dataview.js              | 17 ++++++++++----
 lib/cartodb/controllers/map.js                | 22 ++++++++++---------
 .../models/mapconfig_overviews_adapter.js     |  7 ++++--
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/lib/cartodb/backends/dataview.js b/lib/cartodb/backends/dataview.js
index fc22804b..b5e57f0e 100644
--- a/lib/cartodb/backends/dataview.js
+++ b/lib/cartodb/backends/dataview.js
@@ -115,14 +115,23 @@ DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, param
             }
 
             var sourceId =  dataviewDefinition.source.id; // node.id
-            var layer = _.find(mapConfig.obj().layers, function(l){ return l.options.source && (l.options.source.id === sourceId); })
+            var layer = _.find(
+                mapConfig.obj().layers,
+                function(l){ return l.options.source && (l.options.source.id === sourceId); }
+            );
             var queryRewriteData = layer.options.query_rewrite_data;
             if ( queryRewriteData ) {
-                if ( node.type == 'source' ) {
+                if ( node.type === 'source' ) {
                     var filters = node.filters; // TODO: node.getFilters() when available in camshaft
-                    var filters_disabler = _.keys(filters).reduce(function(disabler, filter_id){ disabler[filter_id] = false; return disabler; }, {});
+                    var filters_disabler = _.keys(filters).reduce(
+                        function(disabler, filter_id){ disabler[filter_id] = false; return disabler; },
+                        {}
+                    );
                     var unfiltered_query = node.getQuery(filters_disabler);
-                    queryRewriteData = _.extend({}, queryRewriteData, { filters: filters, unfiltered_query: unfiltered_query });
+                    queryRewriteData = _.extend(
+                        {},
+                        queryRewriteData, { filters: filters, unfiltered_query: unfiltered_query }
+                    );
                     query = overviewsQueryRewriter.query(query, queryRewriteData, { bounding_box: params.bbox });
                 }
             }
diff --git a/lib/cartodb/controllers/map.js b/lib/cartodb/controllers/map.js
index d5307d12..feaf6fa5 100644
--- a/lib/cartodb/controllers/map.js
+++ b/lib/cartodb/controllers/map.js
@@ -185,18 +185,20 @@ MapController.prototype.create = function(req, res, prepareConfigFn) {
         function addOverviewsInformation(err, requestMapConfig, datasource) {
             assert.ifError(err);
             var next = this;
-            self.overviewsAdapter.getLayers(req.context.user, requestMapConfig.layers, function(err, layers) {
-            self.overviewsAdapter.getLayers(req.context.user, requestMapConfig.layers, analysesResults, function(err, layers) {
-                if (err) {
-                    return next(err);
-                }
+            self.overviewsAdapter.getLayers(
+                req.context.user, requestMapConfig.layers, analysesResults,
+                function(err, layers) {
+                    if (err) {
+                        return next(err);
+                    }
 
-                if (layers) {
-                    requestMapConfig.layers = layers;
-                }
+                    if (layers) {
+                        requestMapConfig.layers = layers;
+                    }
 
-                return next(null, requestMapConfig, datasource);
-            });
+                    return next(null, requestMapConfig, datasource);
+                }
+            );
         },
         function parseTurboCarto(err, requestMapConfig, datasource) {
             assert.ifError(err);
diff --git a/lib/cartodb/models/mapconfig_overviews_adapter.js b/lib/cartodb/models/mapconfig_overviews_adapter.js
index f0587d1c..ca16957e 100644
--- a/lib/cartodb/models/mapconfig_overviews_adapter.js
+++ b/lib/cartodb/models/mapconfig_overviews_adapter.js
@@ -27,11 +27,14 @@ MapConfigOverviewsAdapter.prototype.getLayers = function(username, layers, analy
                var query_rewrite_data = { overviews: metadata };
                if ( layer.options.source && analysesResults ) {
                    var sourceId = layer.options.source.id;
-                   var node = _.find(analysesResults, function(a){ a.rootNode.params.id === sourceId });
+                   var node = _.find(analysesResults, function(a){ return a.rootNode.params.id === sourceId; });
                    if ( node ) {
                        node = node.roorNode;
                        var filters = node.filters; // TODO: node.getFilters() when available in camshaft
-                       var filters_disabler = _.keys(filters).reduce(function(disabler, filter_id){ disabler[filter_id] = false; return disabler; }, {});
+                       var filters_disabler = _.keys(filters).reduce(
+                           function(disabler, filter_id){ disabler[filter_id] = false; return disabler; },
+                           {}
+                       );
                        var unfiltered_query = node.getQuery(filters_disabler);
                        query_rewrite_data.filters = filters;
                        query_rewrite_data.unfiltered_query = unfiltered_query;