From 2ff33b501065e28ae988975a9059cadef7625601 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 26 May 2016 11:02:43 +0200 Subject: [PATCH] Generic MapConfig adapter can receive an arbitrary number of adapters --- lib/cartodb/models/mapconfig/adapter/index.js | 4 ++-- lib/cartodb/server.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/cartodb/models/mapconfig/adapter/index.js b/lib/cartodb/models/mapconfig/adapter/index.js index f7b49ebc..bf64e611 100644 --- a/lib/cartodb/models/mapconfig/adapter/index.js +++ b/lib/cartodb/models/mapconfig/adapter/index.js @@ -1,7 +1,7 @@ 'use strict'; -function MapConfigAdapter(adapters) { - this.adapters = adapters; +function MapConfigAdapter() { + this.adapters = Array.apply(null, arguments); } module.exports = MapConfigAdapter; diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js index 837b8a74..825ae2b7 100644 --- a/lib/cartodb/server.js +++ b/lib/cartodb/server.js @@ -156,13 +156,13 @@ module.exports = function(serverOptions) { var turboCartoParser = new TurboCartoParser(pgQueryRunner); - var mapConfigAdapter = new MapConfigAdapter([ + var mapConfigAdapter = new MapConfigAdapter( new MapConfigNamedLayersAdapter(templateMaps, pgConnection), new SqlWrapMapConfigAdapter(), new AnalysisMapConfigAdapter(analysisBackend), new MapConfigOverviewsAdapter(overviewsMetadataApi, filterStatsApi), new TurboCartoAdapter(turboCartoParser) - ]); + ); var namedMapProviderCache = new NamedMapProviderCache( templateMaps,