From 532d50ad7adff6379e43368beaef65a8ef65fe43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Wed, 30 May 2018 17:09:01 +0200
Subject: [PATCH] Return 'null' explicitly

---
 .../provider/create-layergroup-provider.js    |  2 +-
 .../mapconfig/provider/map-store-provider.js  | 37 +++++++++----------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/lib/cartodb/models/mapconfig/provider/create-layergroup-provider.js b/lib/cartodb/models/mapconfig/provider/create-layergroup-provider.js
index 32865b37..f1e2ac37 100644
--- a/lib/cartodb/models/mapconfig/provider/create-layergroup-provider.js
+++ b/lib/cartodb/models/mapconfig/provider/create-layergroup-provider.js
@@ -44,7 +44,7 @@ CreateLayergroupMapConfigProvider.prototype.getMapConfig = function(callback) {
         context.limits = renderLimits;
         this.context = context;
 
-        return callback(err, this.mapConfig, this.params, context);
+        return callback(null, this.mapConfig, this.params, context);
     });
 };
 
diff --git a/lib/cartodb/models/mapconfig/provider/map-store-provider.js b/lib/cartodb/models/mapconfig/provider/map-store-provider.js
index 1fd9dadf..0adebde3 100644
--- a/lib/cartodb/models/mapconfig/provider/map-store-provider.js
+++ b/lib/cartodb/models/mapconfig/provider/map-store-provider.js
@@ -28,33 +28,30 @@ function MapStoreMapConfigProvider(mapStore, user, userLimitsBackend, pgConnecti
 module.exports = MapStoreMapConfigProvider;
 
 MapStoreMapConfigProvider.prototype.getMapConfig = function(callback) {
-    var self = this;
-
     if (this.mapConfig !== null) {
         return callback(null, this.mapConfig, this.params, this.context);
     }
 
     var context = {};
 
-    step(
-        function prepareContextLimits() {
-            self.userLimitsBackend.getRenderLimits(self.user, self.params.api_key, this);
-        },
-        function handleRenderLimits(err, renderLimits) {
-            assert.ifError(err);
-            context.limits = renderLimits;
-            return null;
-        },
-        function loadMapConfig(err) {
-            assert.ifError(err);
-            self.mapStore.load(self.token, this);
-        },
-        function finish(err, mapConfig) {
-            self.mapConfig = mapConfig;
-            self.context = context;
-            return callback(err, mapConfig, self.params, context);
+    this.userLimitsBackend.getRenderLimits(this.user, this.params.api_key, (err, renderLimits) => {
+        if (err) {
+            return callback(err);
         }
-    );
+
+        context.limits = renderLimits;
+
+        this.mapStore.load(this.token, (err, mapConfig) => {
+            if (err) {
+                return callback(err);
+            }
+
+            this.mapConfig = mapConfig;
+            this.context = context;
+
+            return callback(null, mapConfig, this.params, context);
+        });
+    });
 };
 
 MapStoreMapConfigProvider.prototype.getKey = function() {