diff --git a/lib/cartodb/cache/named_map_provider_cache.js b/lib/cartodb/cache/named_map_provider_cache.js index dac98b21..ebafbbac 100644 --- a/lib/cartodb/cache/named_map_provider_cache.js +++ b/lib/cartodb/cache/named_map_provider_cache.js @@ -1,24 +1,17 @@ var _ = require('underscore'); var dot = require('dot'); var NamedMapMapConfigProvider = require('../models/mapconfig/provider/named-map-provider'); -var MapConfigNamedLayersAdapter = require('../models/mapconfig/adapter/mapconfig-named-layers-adapter'); -var AnalysisMapConfigAdapter = require('../models/mapconfig/adapter/analysis-mapconfig-adapter'); var templateName = require('../backends/template_maps').templateName; var queue = require('queue-async'); var LruCache = require("lru-cache"); -function NamedMapProviderCache(templateMaps, pgConnection, metadataBackend, analysisBackend, userLimitsApi, - overviewsAdapter, turboCartoAdapter) { +function NamedMapProviderCache(templateMaps, pgConnection, metadataBackend, userLimitsApi, mapConfigAdapter) { this.templateMaps = templateMaps; this.pgConnection = pgConnection; this.metadataBackend = metadataBackend; this.userLimitsApi = userLimitsApi; - - this.namedLayersAdapter = new MapConfigNamedLayersAdapter(templateMaps); - this.analysisMapConfigAdapter = new AnalysisMapConfigAdapter(analysisBackend); - this.overviewsAdapter = overviewsAdapter; - this.turboCartoAdapter = turboCartoAdapter; + this.mapConfigAdapter = mapConfigAdapter; this.providerCache = new LruCache({ max: 2000 }); } @@ -36,10 +29,7 @@ NamedMapProviderCache.prototype.get = function(user, templateId, config, authTok this.pgConnection, this.metadataBackend, this.userLimitsApi, - this.namedLayersAdapter, - this.overviewsAdapter, - this.turboCartoAdapter, - this.analysisMapConfigAdapter, + this.mapConfigAdapter, user, templateId, config, diff --git a/lib/cartodb/controllers/map.js b/lib/cartodb/controllers/map.js index 50cc21bd..32459059 100644 --- a/lib/cartodb/controllers/map.js +++ b/lib/cartodb/controllers/map.js @@ -15,11 +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'); /** * @param {AuthApi} authApi @@ -30,14 +27,11 @@ var SqlWrapMapConfigAdapter = require('../models/mapconfig/adapter/sql-wrap-mapc * @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); @@ -48,12 +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); - this.overviewsAdapter = overviewsAdapter; - this.sqlWrapMapConfigAdapter = new SqlWrapMapConfigAdapter(); + this.mapConfigAdapter = mapConfigAdapter; } util.inherits(MapController, BaseController); @@ -134,20 +124,17 @@ MapController.prototype.create = function(req, res, prepareConfigFn) { var self = this; var mapConfig; - var analysesResults = []; + + var context = {}; step( function setupParams(){ self.req2params(req, this); }, prepareConfigFn, - function prepareSqlWrap(err, requestMapConfig) { + function prepareAdapterMapConfig(err, requestMapConfig) { assert.ifError(err); - self.sqlWrapMapConfigAdapter.getMapConfig(requestMapConfig, this); - }, - function prepareAnalysisLayers(err, requestMapConfig) { - assert.ifError(err); - var analysisConfiguration = { + context.analysisConfiguration = { db: { host: req.params.dbhost, port: req.params.dbport, @@ -160,59 +147,12 @@ MapController.prototype.create = function(req, res, prepareConfigFn) { apiKey: req.params.api_key } }; - - var filters = {}; - if (req.params.filters) { - try { - filters = JSON.parse(req.params.filters); - } catch (e) { - // ignore - } - } - self.analysisMapConfigAdapter.getMapConfig(analysisConfiguration, requestMapConfig, filters, this); + self.mapConfigAdapter.getMapConfig(req.context.user, requestMapConfig, req.params, context, this); }, - function beforeLayergroupCreate(err, requestMapConfig, _analysesResults) { + function createLayergroup(err, requestMapConfig) { assert.ifError(err); - var next = this; - analysesResults = _analysesResults; - self.namedLayersAdapter.getMapConfig(req.context.user, requestMapConfig, self.pgConnection, - function(err, requestMapConfig, datasource) { - if (err) { - return next(err); - } - - return next(null, requestMapConfig, datasource); - } - ); - }, - function addOverviewsInformation(err, requestMapConfig, datasource) { - assert.ifError(err); - var next = this; - self.overviewsAdapter.getMapConfig(req.context.user, requestMapConfig, analysesResults, - function(err, requestMapConfig) { - if (err) { - return next(err); - } - - return next(null, requestMapConfig, datasource); - } - ); - }, - function parseTurboCarto(err, requestMapConfig, datasource) { - assert.ifError(err); - - var next = this; - self.turboCartoAdapter.getMapConfig(req.context.user, requestMapConfig, function (err, requestMapConfig) { - if (err) { - return next(err); - } - - return next(null, requestMapConfig, datasource); - }); - }, - function createLayergroup(err, requestMapConfig, datasource) { - assert.ifError(err); - mapConfig = new MapConfig(requestMapConfig, datasource || Datasource.EmptyDatasource()); + var datasource = context.datasource || Datasource.EmptyDatasource(); + mapConfig = new MapConfig(requestMapConfig, datasource); self.mapBackend.createLayergroup( mapConfig, req.params, new CreateLayergroupMapConfigProvider(mapConfig, req.context.user, self.userLimitsApi, req.params), @@ -221,6 +161,7 @@ MapController.prototype.create = function(req, res, prepareConfigFn) { }, function afterLayergroupCreate(err, layergroup) { assert.ifError(err); + var analysesResults = context.analysesResults || []; self.afterLayergroupCreate(req, res, mapConfig, analysesResults, layergroup, this); }, function finish(err, layergroup) { @@ -258,10 +199,7 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn self.pgConnection, self.metadataBackend, self.userLimitsApi, - self.namedLayersAdapter, - self.overviewsAdapter, - self.turboCartoAdapter, - self.analysisMapConfigAdapter, + self.mapConfigAdapter, cdbuser, req.params.template_id, templateParams, diff --git a/lib/cartodb/models/mapconfig/adapter/analysis-mapconfig-adapter.js b/lib/cartodb/models/mapconfig/adapter/analysis-mapconfig-adapter.js index fa6aee47..c48de8a4 100644 --- a/lib/cartodb/models/mapconfig/adapter/analysis-mapconfig-adapter.js +++ b/lib/cartodb/models/mapconfig/adapter/analysis-mapconfig-adapter.js @@ -69,15 +69,25 @@ function getFilter(dataview, params) { }; } -AnalysisMapConfigAdapter.prototype.getMapConfig = function(analysisConfiguration, requestMapConfig, filters, callback) { +AnalysisMapConfigAdapter.prototype.getMapConfig = function(user, requestMapConfig, params, context, callback) { // jshint maxcomplexity:7 var self = this; - filters = filters || {}; if (!shouldAdaptLayers(requestMapConfig)) { return callback(null, requestMapConfig); } + var analysisConfiguration = context.analysisConfiguration; + + var filters = {}; + if (params.filters) { + try { + filters = JSON.parse(params.filters); + } catch (e) { + // ignore + } + } + var dataviewsFilters = filters.dataviews || {}; debug(dataviewsFilters); var dataviews = requestMapConfig.dataviews || {}; @@ -168,7 +178,9 @@ AnalysisMapConfigAdapter.prototype.getMapConfig = function(analysisConfiguration return callback(missingNodesErrors); } - return callback(null, requestMapConfig, analysesResults); + context.analysesResults = analysesResults; + + return callback(null, requestMapConfig); }); }; diff --git a/lib/cartodb/models/mapconfig/adapter/index.js b/lib/cartodb/models/mapconfig/adapter/index.js new file mode 100644 index 00000000..f7b49ebc --- /dev/null +++ b/lib/cartodb/models/mapconfig/adapter/index.js @@ -0,0 +1,26 @@ +'use strict'; + +function MapConfigAdapter(adapters) { + this.adapters = adapters; +} + +module.exports = MapConfigAdapter; + +MapConfigAdapter.prototype.getMapConfig = function(user, requestMapConfig, params, context, callback) { + var self = this; + var i = 0; + var tasksLeft = this.adapters.length; + + function next(err, _requestMapConfig) { + if (err) { + return callback(err); + } + if (tasksLeft-- === 0) { + return callback(null, _requestMapConfig); + } + var nextAdapter = self.adapters[i++]; + nextAdapter.getMapConfig(user, _requestMapConfig, params, context, next); + } + + next(null, requestMapConfig); +}; diff --git a/lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter.js b/lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter.js index e8792def..fd00e344 100644 --- a/lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter.js +++ b/lib/cartodb/models/mapconfig/adapter/mapconfig-named-layers-adapter.js @@ -2,13 +2,14 @@ var queue = require('queue-async'); var _ = require('underscore'); var Datasource = require('windshaft').model.Datasource; -function MapConfigNamedLayersAdapter(templateMaps) { +function MapConfigNamedLayersAdapter(templateMaps, pgConnection) { this.templateMaps = templateMaps; + this.pgConnection = pgConnection; } module.exports = MapConfigNamedLayersAdapter; -MapConfigNamedLayersAdapter.prototype.getMapConfig = function(username, requestMapConfig, dbMetadata, callback) { +MapConfigNamedLayersAdapter.prototype.getMapConfig = function (user, requestMapConfig, params, context, callback) { var self = this; var layers = requestMapConfig.layers; @@ -30,9 +31,9 @@ MapConfigNamedLayersAdapter.prototype.getMapConfig = function(username, requestM var templateConfigParams = layer.options.config || {}; var templateAuthTokens = layer.options.auth_tokens; - self.templateMaps.getTemplate(username, templateName, function(err, template) { + self.templateMaps.getTemplate(user, templateName, function(err, template) { if (err || !template) { - return done(new Error("Template '" + templateName + "' of user '" + username + "' not found")); + return done(new Error("Template '" + templateName + "' of user '" + user + "' not found")); } if (self.templateMaps.isAuthorized(template, templateAuthTokens)) { @@ -99,8 +100,9 @@ MapConfigNamedLayersAdapter.prototype.getMapConfig = function(username, requestM }); requestMapConfig.layers = layers; + context.datasource = datasourceBuilder.build(); - return callback(null, requestMapConfig, datasourceBuilder.build()); + return callback(null, requestMapConfig); } @@ -108,7 +110,7 @@ MapConfigNamedLayersAdapter.prototype.getMapConfig = function(username, requestM if (_.some(layers, isNamedTypeLayer)) { // Lazy load dbAuth - dbMetadata.setDBAuth(username, dbAuth, function(err) { + this.pgConnection.setDBAuth(user, dbAuth, function(err) { if (err) { return callback(err); } @@ -118,7 +120,8 @@ MapConfigNamedLayersAdapter.prototype.getMapConfig = function(username, requestM adaptLayersQueue.awaitAll(layersAdaptQueueFinish); }); } else { - return callback(null, requestMapConfig, datasourceBuilder.build()); + context.datasource = datasourceBuilder.build(); + return callback(null, requestMapConfig); } }; diff --git a/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js b/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js index a438d0ca..b8a473b5 100644 --- a/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js +++ b/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js @@ -9,10 +9,11 @@ function MapConfigOverviewsAdapter(overviewsMetadataApi, filterStatsApi) { module.exports = MapConfigOverviewsAdapter; -MapConfigOverviewsAdapter.prototype.getMapConfig = function(username, requestMapConfig, analysesResults, callback) { +MapConfigOverviewsAdapter.prototype.getMapConfig = function(user, requestMapConfig, params, context, callback) { var self = this; var layers = requestMapConfig.layers; + var analysesResults = context.analysesResults; if (!layers || layers.length === 0) { return callback(null, requestMapConfig); @@ -24,7 +25,7 @@ MapConfigOverviewsAdapter.prototype.getMapConfig = function(username, requestMap if ( layer.type !== 'mapnik' && layer.type !== 'cartodb' ) { return done(null, layer); } - self.overviewsMetadataApi.getOverviewsMetadata(username, layer.options.sql, function(err, metadata){ + self.overviewsMetadataApi.getOverviewsMetadata(user, layer.options.sql, function(err, metadata){ if (err) { done(err, layer); } else { @@ -53,7 +54,7 @@ MapConfigOverviewsAdapter.prototype.getMapConfig = function(username, requestMap var next_step = this; if ( filters ) { self.filterStatsApi.getFilterStats( - username, + user, unfiltered_query, filters, function(err, stats) { if ( !err ) { diff --git a/lib/cartodb/models/mapconfig/adapter/sql-wrap-mapconfig-adapter.js b/lib/cartodb/models/mapconfig/adapter/sql-wrap-mapconfig-adapter.js index 6b9a5130..8bb3d201 100644 --- a/lib/cartodb/models/mapconfig/adapter/sql-wrap-mapconfig-adapter.js +++ b/lib/cartodb/models/mapconfig/adapter/sql-wrap-mapconfig-adapter.js @@ -4,7 +4,7 @@ function SqlWrapMapConfigAdapter() { module.exports = SqlWrapMapConfigAdapter; -SqlWrapMapConfigAdapter.prototype.getMapConfig = function(requestMapConfig, callback) { +SqlWrapMapConfigAdapter.prototype.getMapConfig = function(user, requestMapConfig, params, context, callback) { if (requestMapConfig && Array.isArray(requestMapConfig.layers)) { requestMapConfig.layers = requestMapConfig.layers.map(function(layer) { if (layer.options) { diff --git a/lib/cartodb/models/mapconfig/adapter/turbo-carto-adapter.js b/lib/cartodb/models/mapconfig/adapter/turbo-carto-adapter.js index fd2b0c20..3eb29197 100644 --- a/lib/cartodb/models/mapconfig/adapter/turbo-carto-adapter.js +++ b/lib/cartodb/models/mapconfig/adapter/turbo-carto-adapter.js @@ -11,7 +11,7 @@ function TurboCartoAdapter(turboCartoParser) { module.exports = TurboCartoAdapter; -TurboCartoAdapter.prototype.getMapConfig = function (username, requestMapConfig, callback) { +TurboCartoAdapter.prototype.getMapConfig = function (user, requestMapConfig, params, context, callback) { var self = this; var layers = requestMapConfig.layers; @@ -23,7 +23,7 @@ TurboCartoAdapter.prototype.getMapConfig = function (username, requestMapConfig, var parseCartoQueue = queue(layers.length); layers.forEach(function(layer) { - parseCartoQueue.defer(self._parseCartoCss.bind(self), username, layer); + parseCartoQueue.defer(self._parseCartoCss.bind(self), user, layer); }); parseCartoQueue.awaitAll(function (err, layers) { diff --git a/lib/cartodb/models/mapconfig/provider/named-map-provider.js b/lib/cartodb/models/mapconfig/provider/named-map-provider.js index 25d9b50d..7c9c0dc5 100644 --- a/lib/cartodb/models/mapconfig/provider/named-map-provider.js +++ b/lib/cartodb/models/mapconfig/provider/named-map-provider.js @@ -6,24 +6,18 @@ var step = require('step'); var MapConfig = require('windshaft').model.MapConfig; var templateName = require('../../../backends/template_maps').templateName; var QueryTables = require('cartodb-query-tables'); -var SqlWrapMapConfigAdapter = require('./../adapter/sql-wrap-mapconfig-adapter'); /** * @constructor * @type {NamedMapMapConfigProvider} */ -function NamedMapMapConfigProvider(templateMaps, pgConnection, metadataBackend, userLimitsApi, - namedLayersAdapter, overviewsAdapter, turboCartoAdapter, analysisMapConfigAdapter, +function NamedMapMapConfigProvider(templateMaps, pgConnection, metadataBackend, userLimitsApi, mapConfigAdapter, owner, templateId, config, authToken, params) { this.templateMaps = templateMaps; this.pgConnection = pgConnection; this.metadataBackend = metadataBackend; this.userLimitsApi = userLimitsApi; - this.namedLayersAdapter = namedLayersAdapter; - this.turboCartoAdapter = turboCartoAdapter; - this.analysisMapConfigAdapter = analysisMapConfigAdapter; - this.overviewsAdapter = overviewsAdapter; - this.sqlWrapMapConfigAdapter = new SqlWrapMapConfigAdapter(); + this.mapConfigAdapter = mapConfigAdapter; this.owner = owner; this.templateName = templateName(templateId); @@ -56,10 +50,11 @@ NamedMapMapConfigProvider.prototype.getMapConfig = function(callback) { var self = this; var mapConfig = null; - var datasource = null; var rendererParams; var apiKey; + var context = {}; + step( function getTemplate() { self.getTemplate(this); @@ -97,13 +92,9 @@ NamedMapMapConfigProvider.prototype.getMapConfig = function(callback) { assert.ifError(err); return self.templateMaps.instance(self.template, templateParams); }, - function prepareSqlWrap(err, requestMapConfig) { + function prepareAdapterMapConfig(err, requestMapConfig) { assert.ifError(err); - self.sqlWrapMapConfigAdapter.getMapConfig(requestMapConfig, this); - }, - function prepareAnalysisLayers(err, requestMapConfig) { - assert.ifError(err); - var analysisConfiguration = { + context.analysisConfiguration = { db: { host: rendererParams.dbhost, port: rendererParams.dbport, @@ -116,64 +107,17 @@ NamedMapMapConfigProvider.prototype.getMapConfig = function(callback) { apiKey: apiKey } }; - - var filters = {}; - if (self.params.filters) { - try { - filters = JSON.parse(self.params.filters); - } catch (e) { - // ignore - } - } - self.analysisMapConfigAdapter.getMapConfig(analysisConfiguration, requestMapConfig, filters, this); + self.mapConfigAdapter.getMapConfig(self.owner, requestMapConfig, rendererParams, context, this); }, - function prepareLayergroup(err, _mapConfig, analysesResults) { - assert.ifError(err); - var next = this; - self.analysesResults = analysesResults || []; - self.namedLayersAdapter.getMapConfig(self.owner, _mapConfig, self.pgConnection, - function(err, _mapConfig, datasource) { - if (err) { - return next(err); - } - - return next(null, _mapConfig, datasource); - } - ); - }, - function addOverviewsInformation(err, _mapConfig, datasource) { - assert.ifError(err); - var next = this; - - self.overviewsAdapter.getMapConfig(self.owner, _mapConfig, self.analysesResults, function(err, _mapConfig) { - if (err) { - return next(err); - } - - return next(null, _mapConfig, datasource); - }); - }, - function parseTurboCarto(err, _mapConfig, datasource) { - assert.ifError(err); - var next = this; - - self.turboCartoAdapter.getMapConfig(self.owner, _mapConfig, function (err, _mapConfig) { - if (err) { - return next(err); - } - - return next(null, _mapConfig, datasource); - }); - }, - function prepareContextLimits(err, _mapConfig, _datasource) { + function prepareContextLimits(err, _mapConfig) { assert.ifError(err); mapConfig = _mapConfig; - datasource = _datasource; self.userLimitsApi.getRenderLimits(self.owner, this); }, function cacheAndReturnMapConfig(err, renderLimits) { self.err = err; - self.mapConfig = (mapConfig === null) ? null : new MapConfig(mapConfig, datasource); + self.mapConfig = (mapConfig === null) ? null : new MapConfig(mapConfig, context.datasource); + self.analysesResults = context.analysesResults || []; self.rendererParams = rendererParams; self.context.limits = renderLimits || {}; return callback(self.err, self.mapConfig, self.rendererParams, self.context); diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js index cb8cc452..826fe2f8 100644 --- a/lib/cartodb/server.js +++ b/lib/cartodb/server.js @@ -34,11 +34,16 @@ var AnalysisBackend = require('./backends/analysis'); var timeoutErrorTilePath = __dirname + '/../../assets/render-timeout-fallback.png'; var timeoutErrorTile = require('fs').readFileSync(timeoutErrorTilePath, {encoding: null}); -var MapConfigOverviewsAdapter = require('./models/mapconfig/adapter/mapconfig-overviews-adapter'); - var TurboCartoParser = require('./utils/style/turbo-carto-parser'); + +var SqlWrapMapConfigAdapter = require('./models/mapconfig/adapter/sql-wrap-mapconfig-adapter'); +var MapConfigNamedLayersAdapter = require('./models/mapconfig/adapter/mapconfig-named-layers-adapter'); +var AnalysisMapConfigAdapter = require('./models/mapconfig/adapter/analysis-mapconfig-adapter'); +var MapConfigOverviewsAdapter = require('./models/mapconfig/adapter/mapconfig-overviews-adapter'); var TurboCartoAdapter = require('./models/mapconfig/adapter/turbo-carto-adapter'); +var MapConfigAdapter = require('./models/mapconfig/adapter'); + module.exports = function(serverOptions) { // Make stats client globally accessible global.statsClient = StatsClient.getInstance(serverOptions.statsd); @@ -155,14 +160,20 @@ module.exports = function(serverOptions) { var turboCartoParser = new TurboCartoParser(pgQueryRunner); var turboCartoAdapter = new TurboCartoAdapter(turboCartoParser); + var mapConfigAdapter = new MapConfigAdapter([ + new SqlWrapMapConfigAdapter(), + new AnalysisMapConfigAdapter(analysisBackend), + new MapConfigNamedLayersAdapter(templateMaps, pgConnection), + overviewsAdapter, + turboCartoAdapter + ]); + var namedMapProviderCache = new NamedMapProviderCache( templateMaps, pgConnection, metadataBackend, - analysisBackend, userLimitsApi, - overviewsAdapter, - turboCartoAdapter + mapConfigAdapter ); ['update', 'delete'].forEach(function(eventType) { @@ -201,9 +212,7 @@ module.exports = function(serverOptions) { surrogateKeysCache, userLimitsApi, layergroupAffectedTablesCache, - overviewsAdapter, - turboCartoAdapter, - analysisBackend + mapConfigAdapter ).register(app); new controller.NamedMaps( diff --git a/test/integration/mapconfig_named_layers_datasource.js b/test/integration/mapconfig_named_layers_datasource.js index d372f138..aac8d335 100644 --- a/test/integration/mapconfig_named_layers_datasource.js +++ b/test/integration/mapconfig_named_layers_datasource.js @@ -14,7 +14,7 @@ var templateMaps = new TemplateMaps(redisPool, { max_user_templates: global.environment.maxUserTemplates }); -var mapConfigNamedLayersAdapter = new MapConfigNamedLayersAdapter(templateMaps); +var mapConfigNamedLayersAdapter = new MapConfigNamedLayersAdapter(templateMaps, pgConnection); var wadusSql = 'select 1 wadusLayer, null::geometry the_geom_webmercator'; var wadusLayer = { @@ -294,9 +294,11 @@ describe('named_layers datasources', function() { testScenarios.forEach(function(testScenario) { it('should return a list of layers ' + testScenario.desc, function(done) { - mapConfigNamedLayersAdapter.getMapConfig(username, testScenario.config, pgConnection, - function(err, mapConfig, datasource) { - testScenario.test(err, mapConfig.layers, datasource, done); + var params = {}; + var context = {}; + mapConfigNamedLayersAdapter.getMapConfig(username, testScenario.config, params, context, + function(err, mapConfig) { + testScenario.test(err, mapConfig.layers, context.datasource, done); } ); }); diff --git a/test/integration/mapconfig_named_layers_expanded.js b/test/integration/mapconfig_named_layers_expanded.js index 90c384f4..fd542514 100644 --- a/test/integration/mapconfig_named_layers_expanded.js +++ b/test/integration/mapconfig_named_layers_expanded.js @@ -16,7 +16,7 @@ describe('mapconfig-named-layers-adapter', function() { max_user_templates: global.environment.maxUserTemplates }); - var mapConfigNamedLayersAdapter = new MapConfigNamedLayersAdapter(templateMaps); + var mapConfigNamedLayersAdapter = new MapConfigNamedLayersAdapter(templateMaps, pgConnection); var wadusLayer = { type: 'cartodb', @@ -134,6 +134,8 @@ describe('mapconfig-named-layers-adapter', function() { }; } + var params = {}; + var context = {}; beforeEach(function(done) { templateMaps.addTemplate(username, template, done); @@ -147,11 +149,11 @@ describe('mapconfig-named-layers-adapter', function() { var missingNamedMapLayerConfig = makeNamedMapLayerConfig({ config: {} }); - mapConfigNamedLayersAdapter.getMapConfig(username, missingNamedMapLayerConfig, pgConnection, - function(err, mapConfig, datasource) { + mapConfigNamedLayersAdapter.getMapConfig(username, missingNamedMapLayerConfig, params, context, + function(err, mapConfig) { assert.ok(err); assert.ok(!mapConfig); - assert.ok(!datasource); + assert.ok(!context.datasource); assert.equal(err.message, 'Missing Named Map `name` in layer options'); done(); @@ -164,11 +166,11 @@ describe('mapconfig-named-layers-adapter', function() { var nonExistentNamedMapLayerConfig = makeNamedMapLayerConfig({ name: missingTemplateName }); - mapConfigNamedLayersAdapter.getMapConfig(username, nonExistentNamedMapLayerConfig, pgConnection, - function(err, mapConfig, datasource) { + mapConfigNamedLayersAdapter.getMapConfig(username, nonExistentNamedMapLayerConfig, params, context, + function(err, mapConfig) { assert.ok(err); assert.ok(!mapConfig); - assert.ok(!datasource); + assert.ok(!context.datasource); assert.equal( err.message, "Template '" + missingTemplateName + "' of user '" + username + "' not found" ); @@ -187,11 +189,11 @@ describe('mapconfig-named-layers-adapter', function() { var nonAuthTokensNamedMapLayerConfig = makeNamedMapLayerConfig({ name: tokenAuthTemplateName }); - mapConfigNamedLayersAdapter.getMapConfig(username, nonAuthTokensNamedMapLayerConfig, pgConnection, - function(err, mapConfig, datasource) { + mapConfigNamedLayersAdapter.getMapConfig(username, nonAuthTokensNamedMapLayerConfig, params, context, + function(err, mapConfig) { assert.ok(err); assert.ok(!mapConfig); - assert.ok(!datasource); + assert.ok(!context.datasource); assert.equal(err.message, "Unauthorized '" + tokenAuthTemplateName + "' template instantiation"); templateMaps.delTemplate(username, tokenAuthTemplateName, done); @@ -209,11 +211,11 @@ describe('mapconfig-named-layers-adapter', function() { var nestedNamedMapLayerConfig = makeNamedMapLayerConfig({ name: nestedNamedMapTemplateName }); - mapConfigNamedLayersAdapter.getMapConfig(username, nestedNamedMapLayerConfig, pgConnection, - function(err, mapConfig, datasource) { + mapConfigNamedLayersAdapter.getMapConfig(username, nestedNamedMapLayerConfig, params, context, + function(err, mapConfig) { assert.ok(err); assert.ok(!mapConfig); - assert.ok(!datasource); + assert.ok(!context.datasource); assert.equal(err.message, 'Nested named layers are not allowed'); templateMaps.delTemplate(username, nestedNamedMapTemplateName, done); @@ -226,13 +228,13 @@ describe('mapconfig-named-layers-adapter', function() { var validNamedMapMapLayerConfig = makeNamedMapLayerConfig({ name: templateName }); - mapConfigNamedLayersAdapter.getMapConfig(username, validNamedMapMapLayerConfig, pgConnection, - function(err, mapConfig, datasource) { + mapConfigNamedLayersAdapter.getMapConfig(username, validNamedMapMapLayerConfig, params, context, + function(err, mapConfig) { assert.ok(!err); var layers = mapConfig.layers; assert.ok(layers.length, 1); assert.ok(layers[0].type, 'cartodb'); - assert.notEqual(datasource.getLayerDatasource(0), undefined); + assert.notEqual(context.datasource.getLayerDatasource(0), undefined); done(); } @@ -249,12 +251,12 @@ describe('mapconfig-named-layers-adapter', function() { name: tokenAuthTemplateName, auth_tokens: ['valid1'] }); - mapConfigNamedLayersAdapter.getMapConfig(username, validAuthTokensNamedMapLayerConfig, pgConnection, - function(err, mapConfig, datasource) { + mapConfigNamedLayersAdapter.getMapConfig(username, validAuthTokensNamedMapLayerConfig, params, context, + function(err, mapConfig) { assert.ok(!err); var layers = mapConfig.layers; assert.equal(layers.length, 1); - assert.notEqual(datasource.getLayerDatasource(0), undefined); + assert.notEqual(context.datasource.getLayerDatasource(0), undefined); templateMaps.delTemplate(username, tokenAuthTemplateName, done); } @@ -272,19 +274,19 @@ describe('mapconfig-named-layers-adapter', function() { name: multipleLayersTemplateName, auth_tokens: ['valid2'] }); - mapConfigNamedLayersAdapter.getMapConfig(username, multipleLayersNamedMapLayerConfig, pgConnection, - function(err, mapConfig, datasource) { + mapConfigNamedLayersAdapter.getMapConfig(username, multipleLayersNamedMapLayerConfig, params, context, + function(err, mapConfig) { assert.ok(!err); var layers = mapConfig.layers; assert.equal(layers.length, 2); assert.equal(layers[0].type, 'mapnik'); assert.equal(layers[0].options.cartocss, '#layer { polygon-fill: green; }'); - assert.notEqual(datasource.getLayerDatasource(0), undefined); + assert.notEqual(context.datasource.getLayerDatasource(0), undefined); assert.equal(layers[1].type, 'cartodb'); assert.equal(layers[1].options.cartocss, '#layer { marker-fill: red; }'); - assert.notEqual(datasource.getLayerDatasource(1), undefined); + assert.notEqual(context.datasource.getLayerDatasource(1), undefined); templateMaps.delTemplate(username, multipleLayersTemplateName, done); } @@ -309,19 +311,19 @@ describe('mapconfig-named-layers-adapter', function() { }, auth_tokens: ['valid2'] }); - mapConfigNamedLayersAdapter.getMapConfig(username, multipleLayersNamedMapLayerConfig, pgConnection, - function(err, mapConfig, datasource) { + mapConfigNamedLayersAdapter.getMapConfig(username, multipleLayersNamedMapLayerConfig, params, context, + function(err, mapConfig) { assert.ok(!err); var layers = mapConfig.layers; assert.equal(layers.length, 2); assert.equal(layers[0].type, 'mapnik'); assert.equal(layers[0].options.cartocss, '#layer { polygon-fill: ' + polygonColor + '; }'); - assert.notEqual(datasource.getLayerDatasource(0), undefined); + assert.notEqual(context.datasource.getLayerDatasource(0), undefined); assert.equal(layers[1].type, 'cartodb'); assert.equal(layers[1].options.cartocss, '#layer { marker-fill: ' + color + '; }'); - assert.notEqual(datasource.getLayerDatasource(1), undefined); + assert.notEqual(context.datasource.getLayerDatasource(1), undefined); templateMaps.delTemplate(username, multipleLayersTemplateName, done); } diff --git a/test/integration/mapconfig_overviews_adapter.js b/test/integration/mapconfig_overviews_adapter.js index 6444f18f..87a87935 100644 --- a/test/integration/mapconfig_overviews_adapter.js +++ b/test/integration/mapconfig_overviews_adapter.js @@ -37,7 +37,10 @@ describe('MapConfigOverviewsAdapter', function() { layers: [layer_without_overviews] }; - mapConfigOverviewsAdapter.getMapConfig('localhost', _mapConfig, [], function(err, mapConfig) { + var params = {}; + var context = {}; + + mapConfigOverviewsAdapter.getMapConfig('localhost', _mapConfig, params, context, function(err, mapConfig) { assert.ok(!err); var layers = mapConfig.layers; assert.equal(layers.length, 1); @@ -70,7 +73,10 @@ describe('MapConfigOverviewsAdapter', function() { layers: [layer_with_overviews] }; - mapConfigOverviewsAdapter.getMapConfig('localhost', _mapConfig, [], function(err, mapConfig) { + var params = {}; + var context = {}; + + mapConfigOverviewsAdapter.getMapConfig('localhost', _mapConfig, params, context, function(err, mapConfig) { assert.ok(!err); var layers = mapConfig.layers; assert.equal(layers.length, 1);