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

Add filters information at map instantion time to the query rewriter data

Browse Source
This commit is contained in:
Javier Goizueta
2016-05-11 19:24:13 +02:00
parent fa19f90a6a
commit 65612f0109
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cartodb/backends/dataview.js
+1 -1
View File
@@ -114,7 +114,7 @@ DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, param
var filters = node.filters; // TODO: node.getFilters() when available in camshaft
var filters_disabler = _.keys(filters).reduce(function(disabler, filter_id){ disabler[filter_id] = false; return disabler; }, {});
var unfiltered_query = node.getQuery(filters_disabler);
queryRewriteData = _.extend({}, queryRewriteData, { filters: filters });
queryRewriteData = _.extend({}, queryRewriteData, { filters: filters, unfiltered_query: unfiltered_query });
var rewritten_query = overviewsQueryRewriter.query(unfiltered_query, queryRewriteData, { bounding_box: params.bbox });
if ( rewritten_query !== unfiltered_query ) {
query = rewritten_query;
lib/cartodb/controllers/map.js
+1
View File
@@ -186,6 +186,7 @@ MapController.prototype.create = function(req, res, prepareConfigFn) {
assert.ifError(err);
var next = this;
self.overviewsAdapter.getLayers(req.context.user, requestMapConfig.layers, function(err, layers) {
self.overviewsAdapter.getLayers(req.context.user, requestMapConfig.layers, analysesResults, function(err, layers) {
if (err) {
return next(err);
}
lib/cartodb/models/mapconfig/named_map_provider.js
+1 -1
View File
@@ -142,7 +142,7 @@ NamedMapMapConfigProvider.prototype.getMapConfig = function(callback) {
assert.ifError(err);
var next = this;
self.overviewsAdapter.getLayers(self.owner, _mapConfig.layers, function(err, layers) {
self.overviewsAdapter.getLayers(self.owner, _mapConfig.layers, self.analysesResults, function(err, layers) {
if (err) {
return next(err);
}
lib/cartodb/models/mapconfig_overviews_adapter.js
+15 -2
View File
@@ -7,7 +7,7 @@ function MapConfigOverviewsAdapter(overviewsMetadataApi) {
module.exports = MapConfigOverviewsAdapter;
MapConfigOverviewsAdapter.prototype.getLayers = function(username, layers, callback) {
MapConfigOverviewsAdapter.prototype.getLayers = function(username, layers, analysesResults, callback) {
var self = this;
if (!layers || layers.length === 0) {
@@ -24,9 +24,22 @@ MapConfigOverviewsAdapter.prototype.getLayers = function(username, layers, callb
if (err) {
done(err, layer);
} else {
var query_rewrite_data = { overviews: metadata };
if ( layer.options.source && analysesResults ) {
var sourceId = layer.options.source.id;
var node = _.find(analysesResults, function(a){ a.rootNode.params.id === sourceId });
if ( node ) {
node = node.roorNode;
var filters = node.filters; // TODO: node.getFilters() when available in camshaft
var filters_disabler = _.keys(filters).reduce(function(disabler, filter_id){ disabler[filter_id] = false; return disabler; }, {});
var unfiltered_query = node.getQuery(filters_disabler);
query_rewrite_data.filters = filters;
query_rewrite_data.unfiltered_query = unfiltered_query;
}
}
if ( !_.isEmpty(metadata) ) {
layer = _.extend({}, layer);
layer.options = _.extend({}, layer.options, { query_rewrite_data: { overviews: metadata } });
layer.options = _.extend({}, layer.options, { query_rewrite_data: query_rewrite_data });
}
done(null, layer);
}