From ed56094be2c3fc214dd7a3ed8f143df8cf1944b9 Mon Sep 17 00:00:00 2001
From: Mario de Frutos <mario.defrutos@cartodb.com>
Date: Thu, 18 May 2017 11:51:12 +0200
Subject: [PATCH] PR changes

---
 lib/cartodb/backends/layer-stats/empty-layer-stats.js |  2 +-
 lib/cartodb/backends/layer-stats/layer-stats.js       |  4 ++--
 .../backends/layer-stats/mapnik-layer-stats.js        |  2 +-
 lib/cartodb/controllers/map.js                        | 11 ++++-------
 .../{backends/layer-stats => utils}/query-utils.js    |  0
 5 files changed, 8 insertions(+), 11 deletions(-)
 rename lib/cartodb/{backends/layer-stats => utils}/query-utils.js (100%)

diff --git a/lib/cartodb/backends/layer-stats/empty-layer-stats.js b/lib/cartodb/backends/layer-stats/empty-layer-stats.js
index 0923b59c..0760c0b6 100644
--- a/lib/cartodb/backends/layer-stats/empty-layer-stats.js
+++ b/lib/cartodb/backends/layer-stats/empty-layer-stats.js
@@ -8,7 +8,7 @@ EmptyLayerStats.prototype.is = function (type) {
 
 EmptyLayerStats.prototype.getStats =
 function (layer, dbConnection, callback) {
-    process.nextTick(function() {
+    setImmediate(function() {
         callback(null, {});
     });
 };
diff --git a/lib/cartodb/backends/layer-stats/layer-stats.js b/lib/cartodb/backends/layer-stats/layer-stats.js
index bc1787c2..2464fb22 100644
--- a/lib/cartodb/backends/layer-stats/layer-stats.js
+++ b/lib/cartodb/backends/layer-stats/layer-stats.js
@@ -1,4 +1,4 @@
-var d3 = require('d3-queue');
+var queue = require('queue-async');
 
 function LayerStats(layerStatsIterator) {
     this.layerStatsIterator = layerStatsIterator;
@@ -11,7 +11,7 @@ LayerStats.prototype.getStats = function (mapConfig, dbConnection, callback) {
     if (!mapConfig.getLayers().length) {
         return callback(null, stats);
     }
-    var metaQueue = d3.queue(mapConfig.getLayers().length);
+    var metaQueue = queue(mapConfig.getLayers().length);
     mapConfig.getLayers().forEach(function (layer, layerId) {
         var layerType = mapConfig.layerType(layerId);
 
diff --git a/lib/cartodb/backends/layer-stats/mapnik-layer-stats.js b/lib/cartodb/backends/layer-stats/mapnik-layer-stats.js
index 7dfd97af..c060f964 100644
--- a/lib/cartodb/backends/layer-stats/mapnik-layer-stats.js
+++ b/lib/cartodb/backends/layer-stats/mapnik-layer-stats.js
@@ -1,4 +1,4 @@
-var queryUtils = require('./query-utils');
+var queryUtils = require('../../utils/query-utils');
 
 function MapnikLayerStats () {
     this._types = {
diff --git a/lib/cartodb/controllers/map.js b/lib/cartodb/controllers/map.js
index cd5bbed3..3bb72574 100644
--- a/lib/cartodb/controllers/map.js
+++ b/lib/cartodb/controllers/map.js
@@ -166,7 +166,7 @@ MapController.prototype.create = function(req, res, prepareConfigFn) {
         },
         function afterLayergroupCreate(err, layergroup) {
             assert.ifError(err);
-            self.afterLayergroupCreate(req, res, mapConfig, layergroup, context.analysesResults, req.params, this);
+            self.afterLayergroupCreate(req, res, mapConfig, layergroup, context.analysesResults, this);
         },
         function finish(err, layergroup) {
             if (err) {
@@ -219,8 +219,6 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn
 
     var mapConfigProvider;
     var mapConfig;
-    var rendererParams;
-
     step(
         function setupParams(){
             self.req2params(req, this);
@@ -244,9 +242,8 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn
             );
             mapConfigProvider.getMapConfig(this);
         },
-        function createLayergroup(err, mapConfig_, _rendererParams) {
+        function createLayergroup(err, mapConfig_, rendererParams) {
             assert.ifError(err);
-            rendererParams = _rendererParams;
             mapConfig = mapConfig_;
             self.mapBackend.createLayergroup(
                 mapConfig, rendererParams,
@@ -258,7 +255,7 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn
             assert.ifError(err);
             self.afterLayergroupCreate(req, res, mapConfig, layergroup,
                                        mapConfigProvider.analysesResults,
-                                       rendererParams, this);
+                                       this);
         },
         function finishTemplateInstantiation(err, layergroup) {
             if (err) {
@@ -282,7 +279,7 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn
 };
 
 MapController.prototype.afterLayergroupCreate =
-function(req, res, mapconfig, layergroup, analysesResults, rendererParams, callback) {
+function(req, res, mapconfig, layergroup, analysesResults, callback) {
     var self = this;
 
     var username = req.context.user;
diff --git a/lib/cartodb/backends/layer-stats/query-utils.js b/lib/cartodb/utils/query-utils.js
similarity index 100%
rename from lib/cartodb/backends/layer-stats/query-utils.js
rename to lib/cartodb/utils/query-utils.js