Merge pull request #471 from CartoDB/mapconfig-fix-adapters-order

Order of adapters: named maps should expand named layers as first step

lib/cartodb/server.js

@@ -157,9 +157,9 @@ module.exports = function(serverOptions) {
     var turboCartoParser = new TurboCartoParser(pgQueryRunner);
 
     var mapConfigAdapter = new MapConfigAdapter([
+        new MapConfigNamedLayersAdapter(templateMaps, pgConnection),
         new SqlWrapMapConfigAdapter(),
         new AnalysisMapConfigAdapter(analysisBackend),
-        new MapConfigNamedLayersAdapter(templateMaps, pgConnection),
         new MapConfigOverviewsAdapter(overviewsMetadataApi, filterStatsApi),
         new TurboCartoAdapter(turboCartoParser)
     ]);