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

Use generic adapter in named maps

Browse Source
This commit is contained in:
Raul Ochoa 2016-05-23 21:56:38 +02:00
parent 8efe844474
commit 9ce4929d87
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/cartodb/models/mapconfig/provider/named-map-provider.js
View File

@ -7,6 +7,7 @@ var MapConfig = require('windshaft').model.MapConfig;
var templateName = require('../../../backends/template_maps').templateName; var templateName = require('../../../backends/template_maps').templateName;
var QueryTables = require('cartodb-query-tables'); var QueryTables = require('cartodb-query-tables');
var SqlWrapMapConfigAdapter = require('./../adapter/sql-wrap-mapconfig-adapter'); var SqlWrapMapConfigAdapter = require('./../adapter/sql-wrap-mapconfig-adapter');
var MapConfigAdapter = require('./../adapter');
/** /**
* @constructor * @constructor
@ -25,6 +26,14 @@ function NamedMapMapConfigProvider(templateMaps, pgConnection, metadataBackend,
this.overviewsAdapter = overviewsAdapter; this.overviewsAdapter = overviewsAdapter;
this.sqlWrapMapConfigAdapter = new SqlWrapMapConfigAdapter(); this.sqlWrapMapConfigAdapter = new SqlWrapMapConfigAdapter();
this.mapConfigAdapter = new MapConfigAdapter([
this.sqlWrapMapConfigAdapter,
this.analysisMapConfigAdapter,
this.namedLayersAdapter,
this.overviewsAdapter,
this.turboCartoAdapter
]);
this.owner = owner; this.owner = owner;
this.templateName = templateName(templateId); this.templateName = templateName(templateId);
this.config = config; this.config = config;
@ -114,28 +123,7 @@ NamedMapMapConfigProvider.prototype.getMapConfig = function(callback) {
apiKey: apiKey apiKey: apiKey
} }
}; };
return requestMapConfig; self.mapConfigAdapter.getMapConfig(self.owner, requestMapConfig, rendererParams, context, this);
},
function prepareSqlWrap(err, requestMapConfig) {
assert.ifError(err);
self.sqlWrapMapConfigAdapter.getMapConfig(user, requestMapConfig, rendererParams, context, this);
},
function prepareAnalysisLayers(err, requestMapConfig) {
assert.ifError(err);
self.analysisMapConfigAdapter.getMapConfig(user, requestMapConfig, rendererParams, context, this);
},
function prepareLayergroup(err, _mapConfig) {
assert.ifError(err);
self.analysesResults = context.analysesResults || [];
self.namedLayersAdapter.getMapConfig(self.owner, _mapConfig, rendererParams, context, this);
},
function addOverviewsInformation(err, _mapConfig) {
assert.ifError(err);
self.overviewsAdapter.getMapConfig(self.owner, _mapConfig, rendererParams, context, this);
},
function parseTurboCarto(err, _mapConfig) {
assert.ifError(err);
self.turboCartoAdapter.getMapConfig(self.owner, _mapConfig, rendererParams, context, this);
}, },
function prepareContextLimits(err, _mapConfig) { function prepareContextLimits(err, _mapConfig) {
assert.ifError(err); assert.ifError(err);
@ -145,6 +133,7 @@ NamedMapMapConfigProvider.prototype.getMapConfig = function(callback) {
function cacheAndReturnMapConfig(err, renderLimits) { function cacheAndReturnMapConfig(err, renderLimits) {
self.err = err; self.err = err;
self.mapConfig = (mapConfig === null) ? null : new MapConfig(mapConfig, context.datasource); self.mapConfig = (mapConfig === null) ? null : new MapConfig(mapConfig, context.datasource);
self.analysesResults = context.analysesResults || [];
self.rendererParams = rendererParams; self.rendererParams = rendererParams;
self.context.limits = renderLimits || {}; self.context.limits = renderLimits || {};
return callback(self.err, self.mapConfig, self.rendererParams, self.context); return callback(self.err, self.mapConfig, self.rendererParams, self.context);