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

Extract adaptLayer method

Browse Source
This commit is contained in:
Daniel García Aubert
2017-12-11 18:34:22 +01:00
parent 006dd86614
commit 68f967e582
1 changed files with 46 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
+46 -42
View File
@@ -118,48 +118,7 @@ module.exports = class AggregationMapConfigAdapter {
const isVectorOnlyMapConfig = mapConfig.isVectorOnlyMapConfig();
const adaptLayerPromises = requestMapConfig.layers.map((layer, index) => {
return new Promise((resolve, reject) => {
if (!isVectorOnlyMapConfig && !this._hasLayerAggregation(layer)) {
return resolve({ layer, index, adapted: false });
}
const threshold = layer.options.aggregation && layer.options.aggregation.threshold ?
layer.options.aggregation.threshold :
1e5;
const aggregationMetadata = queryUtils.getAggregationMetadata({ query: layer.options.sql });
connection.query(aggregationMetadata, (err, res) => {
if (err) {
return resolve({ layer, index, adapted: false });
}
const estimatedFeatureCount = res.rows[0].count;
const geometryType = res.rows[0].type;
if (estimatedFeatureCount < threshold) {
return resolve({ layer, index, adapted: false });
}
if (geometryType !== 'ST_Point') {
return reject(new Error(unsupportedGeometryTypeErrorMessage({ geometryType })));
}
const aggregation = new AggregationProxy(mapConfig, layer.options.aggregation);
const sqlQueryWrap = layer.options.sql_wrap;
let aggregationSql = aggregation.sql(layer.options);
if (sqlQueryWrap) {
layer.options.sql_raw = aggregationSql;
aggregationSql = sqlQueryWrap.replace(/<%=\s*sql\s*%>/g, aggregationSql);
}
layer.options.sql = aggregationSql;
return resolve({ layer, index, adapted: true });
});
});
return this._adaptLayer(connection, layer, index, isVectorOnlyMapConfig, mapConfig);
});
Promise.all(adaptLayerPromises)
@@ -183,6 +142,51 @@ module.exports = class AggregationMapConfigAdapter {
});
}
_adaptLayer (connection, layer, index, isVectorOnlyMapConfig, mapConfig) {
return new Promise((resolve, reject) => {
if (!isVectorOnlyMapConfig && !this._hasLayerAggregation(layer)) {
return resolve({ layer, index, adapted: false });
}
const threshold = layer.options.aggregation && layer.options.aggregation.threshold ?
layer.options.aggregation.threshold :
1e5;
const aggregationMetadata = queryUtils.getAggregationMetadata({ query: layer.options.sql });
connection.query(aggregationMetadata, (err, res) => {
if (err) {
return resolve({ layer, index, adapted: false });
}
const estimatedFeatureCount = res.rows[0].count;
const geometryType = res.rows[0].type;
if (estimatedFeatureCount < threshold) {
return resolve({ layer, index, adapted: false });
}
if (geometryType !== 'ST_Point') {
return reject(new Error(unsupportedGeometryTypeErrorMessage({ geometryType })));
}
const aggregation = new AggregationProxy(mapConfig, layer.options.aggregation);
const sqlQueryWrap = layer.options.sql_wrap;
let aggregationSql = aggregation.sql(layer.options);
if (sqlQueryWrap) {
layer.options.sql_raw = aggregationSql;
aggregationSql = sqlQueryWrap.replace(/<%=\s*sql\s*%>/g, aggregationSql);
}
layer.options.sql = aggregationSql;
return resolve({ layer, index, adapted: true });
});
});
}
_getAggregationMetadata (isVectorOnlyMapConfig, layer, adapted) {
if (adapted) {
if (isVectorOnlyMapConfig) {