From 658763da8c7d7d246cd775b1d7404e43940c1ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Thu, 2 Nov 2017 10:33:39 +0100
Subject: [PATCH] Build after layergroup create while registering routes

---
 lib/cartodb/controllers/map.js | 56 ++++++++--------------------------
 1 file changed, 12 insertions(+), 44 deletions(-)

diff --git a/lib/cartodb/controllers/map.js b/lib/cartodb/controllers/map.js
index 72d597a1..384678cb 100644
--- a/lib/cartodb/controllers/map.js
+++ b/lib/cartodb/controllers/map.js
@@ -59,7 +59,9 @@ MapController.prototype.register = function(app) {
         createGetPrepareConfig,
         this.prepareAdapterMapConfig.bind(this),
         this.createLayergroup.bind(this),
-        this.create.bind(this),
+        this.afterLayergroupCreateBuilder({
+            includeQuery: true
+        }),
         respond,
         mapErrorMiddleware({
             label: 'ANONYMOUS LAYERGROUP',
@@ -74,7 +76,9 @@ MapController.prototype.register = function(app) {
         createPostPrepareConfig,
         this.prepareAdapterMapConfig.bind(this),
         this.createLayergroup.bind(this),
-        this.create.bind(this),
+        this.afterLayergroupCreateBuilder({
+            includeQuery: true
+        }),
         respond,
         mapErrorMiddleware({
             label: 'ANONYMOUS LAYERGROUP',
@@ -89,7 +93,9 @@ MapController.prototype.register = function(app) {
         prepareJsonTemplateParams,
         this.getTemplate.bind(this),
         this.createLayergroupFromTemplate.bind(this),
-        this.instantiateTemplate.bind(this),
+        this.afterLayergroupCreateBuilder({
+            useTemplateHash: true
+        }),
         respond,
         mapErrorMiddleware({
             label: 'NAMED MAP LAYERGROUP'
@@ -103,7 +109,9 @@ MapController.prototype.register = function(app) {
         prepareTemplateParams,
         this.getTemplate.bind(this),
         this.createLayergroupFromTemplate.bind(this),
-        this.instantiateTemplate.bind(this),
+        this.afterLayergroupCreateBuilder({
+            useTemplateHash: true
+        }),
         respond,
         mapErrorMiddleware({
             label: 'NAMED MAP LAYERGROUP'
@@ -224,26 +232,6 @@ MapController.prototype.createLayergroup = function(req, res, next) {
     });
 };
 
-MapController.prototype.create = function(req, res, next) {
-    var self = this;
-
-    step(
-        function afterLayergroupCreate() {
-            const afterLayergroupCreate = self.afterLayergroupCreateBuilder({
-                includeQuery: true
-            });
-
-            afterLayergroupCreate(req, res, this);
-        },
-        function finish(err) {
-            if (err) {
-                return next(err);
-            }
-            next();
-        }
-    );
-};
-
 MapController.prototype.getTemplate = function(req, res, next) {
     const templateParams = req.body;
     const { user } = res.locals;
@@ -298,26 +286,6 @@ MapController.prototype.createLayergroupFromTemplate = function(req, res, next)
     });
 };
 
-MapController.prototype.instantiateTemplate = function(req, res, next) {
-    var self = this;
-
-    step(
-        function afterLayergroupCreate() {
-            const afterLayergroupCreate = self.afterLayergroupCreateBuilder({
-                useTemplateHash: true
-            });
-
-            afterLayergroupCreate(req, res, this);
-        },
-        function finishTemplateInstantiation(err) {
-            if (err) {
-                return next(err);
-            }
-            next();
-        }
-    );
-};
-
 function respond (req, res) {
     const { layergroup } = res.locals;