cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Named layers adapter with getMapConfig signature

Browse Source
This commit is contained in:
Raul Ochoa
2016-05-23 18:03:45 +02:00
parent 70750d2c43
commit efcb73e0d1
6 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/integration/mapconfig_named_layers_datasource.js
+4 -2
View File
@@ -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,7 +294,9 @@ 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,
var params = {};
var context = {};
mapConfigNamedLayersAdapter.getMapConfig(username, testScenario.config, params, context,
function(err, mapConfig, datasource) {
testScenario.test(err, mapConfig.layers, datasource, done);
}
test/integration/mapconfig_named_layers_expanded.js
+11 -9
View File
@@ -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,7 +149,7 @@ describe('mapconfig-named-layers-adapter', function() {
var missingNamedMapLayerConfig = makeNamedMapLayerConfig({
config: {}
});
mapConfigNamedLayersAdapter.getMapConfig(username, missingNamedMapLayerConfig, pgConnection,
mapConfigNamedLayersAdapter.getMapConfig(username, missingNamedMapLayerConfig, params, context,
function(err, mapConfig, datasource) {
assert.ok(err);
assert.ok(!mapConfig);
@@ -164,7 +166,7 @@ describe('mapconfig-named-layers-adapter', function() {
var nonExistentNamedMapLayerConfig = makeNamedMapLayerConfig({
name: missingTemplateName
});
mapConfigNamedLayersAdapter.getMapConfig(username, nonExistentNamedMapLayerConfig, pgConnection,
mapConfigNamedLayersAdapter.getMapConfig(username, nonExistentNamedMapLayerConfig, params, context,
function(err, mapConfig, datasource) {
assert.ok(err);
assert.ok(!mapConfig);
@@ -187,7 +189,7 @@ describe('mapconfig-named-layers-adapter', function() {
var nonAuthTokensNamedMapLayerConfig = makeNamedMapLayerConfig({
name: tokenAuthTemplateName
});
mapConfigNamedLayersAdapter.getMapConfig(username, nonAuthTokensNamedMapLayerConfig, pgConnection,
mapConfigNamedLayersAdapter.getMapConfig(username, nonAuthTokensNamedMapLayerConfig, params, context,
function(err, mapConfig, datasource) {
assert.ok(err);
assert.ok(!mapConfig);
@@ -209,7 +211,7 @@ describe('mapconfig-named-layers-adapter', function() {
var nestedNamedMapLayerConfig = makeNamedMapLayerConfig({
name: nestedNamedMapTemplateName
});
mapConfigNamedLayersAdapter.getMapConfig(username, nestedNamedMapLayerConfig, pgConnection,
mapConfigNamedLayersAdapter.getMapConfig(username, nestedNamedMapLayerConfig, params, context,
function(err, mapConfig, datasource) {
assert.ok(err);
assert.ok(!mapConfig);
@@ -226,7 +228,7 @@ describe('mapconfig-named-layers-adapter', function() {
var validNamedMapMapLayerConfig = makeNamedMapLayerConfig({
name: templateName
});
mapConfigNamedLayersAdapter.getMapConfig(username, validNamedMapMapLayerConfig, pgConnection,
mapConfigNamedLayersAdapter.getMapConfig(username, validNamedMapMapLayerConfig, params, context,
function(err, mapConfig, datasource) {
assert.ok(!err);
var layers = mapConfig.layers;
@@ -249,7 +251,7 @@ describe('mapconfig-named-layers-adapter', function() {
name: tokenAuthTemplateName,
auth_tokens: ['valid1']
});
mapConfigNamedLayersAdapter.getMapConfig(username, validAuthTokensNamedMapLayerConfig, pgConnection,
mapConfigNamedLayersAdapter.getMapConfig(username, validAuthTokensNamedMapLayerConfig, params, context,
function(err, mapConfig, datasource) {
assert.ok(!err);
var layers = mapConfig.layers;
@@ -272,7 +274,7 @@ describe('mapconfig-named-layers-adapter', function() {
name: multipleLayersTemplateName,
auth_tokens: ['valid2']
});
mapConfigNamedLayersAdapter.getMapConfig(username, multipleLayersNamedMapLayerConfig, pgConnection,
mapConfigNamedLayersAdapter.getMapConfig(username, multipleLayersNamedMapLayerConfig, params, context,
function(err, mapConfig, datasource) {
assert.ok(!err);
var layers = mapConfig.layers;
@@ -309,7 +311,7 @@ describe('mapconfig-named-layers-adapter', function() {
},
auth_tokens: ['valid2']
});
mapConfigNamedLayersAdapter.getMapConfig(username, multipleLayersNamedMapLayerConfig, pgConnection,
mapConfigNamedLayersAdapter.getMapConfig(username, multipleLayersNamedMapLayerConfig, params, context,
function(err, mapConfig, datasource) {
assert.ok(!err);
var layers = mapConfig.layers;