From faa24caf5ba303000df04c3953c0613aafe279ff Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Mon, 23 May 2016 23:35:42 +0200
Subject: [PATCH] Use generic map config adapter

---
 lib/cartodb/controllers/map.js | 25 +++----------------------
 lib/cartodb/server.js          |  4 +---
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/lib/cartodb/controllers/map.js b/lib/cartodb/controllers/map.js
index 66b42e7b..32459059 100644
--- a/lib/cartodb/controllers/map.js
+++ b/lib/cartodb/controllers/map.js
@@ -15,12 +15,8 @@ var Datasource = windshaft.model.Datasource;
 
 var NamedMapsCacheEntry = require('../cache/model/named_maps_entry');
 
-var MapConfigNamedLayersAdapter = require('../models/mapconfig/adapter/mapconfig-named-layers-adapter');
-var AnalysisMapConfigAdapter = require('../models/mapconfig/adapter/analysis-mapconfig-adapter');
 var NamedMapMapConfigProvider = require('../models/mapconfig/provider/named-map-provider');
 var CreateLayergroupMapConfigProvider = require('../models/mapconfig/provider/create-layergroup-provider');
-var SqlWrapMapConfigAdapter = require('../models/mapconfig/adapter/sql-wrap-mapconfig-adapter');
-var MapConfigAdapter = require('../models/mapconfig/adapter');
 
 /**
  * @param {AuthApi} authApi
@@ -31,14 +27,11 @@ var MapConfigAdapter = require('../models/mapconfig/adapter');
  * @param {SurrogateKeysCache} surrogateKeysCache
  * @param {UserLimitsApi} userLimitsApi
  * @param {LayergroupAffectedTables} layergroupAffectedTables
- * @param {MapConfigOverviewsAdapter} overviewsAdapter
- * @param {TurboCartoAdapter} turboCartoAdapter
- * @param {AnalysisBackend} analysisBackend
+ * @param {MapConfigAdapter} mapConfigAdapter
  * @constructor
  */
 function MapController(authApi, pgConnection, templateMaps, mapBackend, metadataBackend,
-                       surrogateKeysCache, userLimitsApi, layergroupAffectedTables,
-                       overviewsAdapter, turboCartoAdapter, analysisBackend) {
+                       surrogateKeysCache, userLimitsApi, layergroupAffectedTables, mapConfigAdapter) {
 
     BaseController.call(this, authApi, pgConnection);
 
@@ -49,20 +42,8 @@ function MapController(authApi, pgConnection, templateMaps, mapBackend, metadata
     this.surrogateKeysCache = surrogateKeysCache;
     this.userLimitsApi = userLimitsApi;
     this.layergroupAffectedTables = layergroupAffectedTables;
-    this.turboCartoAdapter = turboCartoAdapter;
 
-    this.analysisMapConfigAdapter = new AnalysisMapConfigAdapter(analysisBackend);
-    this.namedLayersAdapter = new MapConfigNamedLayersAdapter(templateMaps, pgConnection);
-    this.overviewsAdapter = overviewsAdapter;
-    this.sqlWrapMapConfigAdapter = new SqlWrapMapConfigAdapter();
-
-    this.mapConfigAdapter = new MapConfigAdapter([
-        this.sqlWrapMapConfigAdapter,
-        this.analysisMapConfigAdapter,
-        this.namedLayersAdapter,
-        this.overviewsAdapter,
-        this.turboCartoAdapter
-    ]);
+    this.mapConfigAdapter = mapConfigAdapter;
 }
 
 util.inherits(MapController, BaseController);
diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js
index cc3ac029..826fe2f8 100644
--- a/lib/cartodb/server.js
+++ b/lib/cartodb/server.js
@@ -212,9 +212,7 @@ module.exports = function(serverOptions) {
         surrogateKeysCache,
         userLimitsApi,
         layergroupAffectedTablesCache,
-        overviewsAdapter,
-        turboCartoAdapter,
-        analysisBackend
+        mapConfigAdapter
     ).register(app);
 
     new controller.NamedMaps(