From 90b92f0180e3885de71d5b39a417b1bd8eaab5fd Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Tue, 22 Mar 2016 12:22:04 +0100 Subject: [PATCH] Adds support for category filters --- .../models/analysis_mapconfig_adapter.js | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/lib/cartodb/models/analysis_mapconfig_adapter.js b/lib/cartodb/models/analysis_mapconfig_adapter.js index 27cacd1d..845c9425 100644 --- a/lib/cartodb/models/analysis_mapconfig_adapter.js +++ b/lib/cartodb/models/analysis_mapconfig_adapter.js @@ -76,6 +76,20 @@ function shouldAdaptLayers(requestMapConfig) { Array.isArray(requestMapConfig.analyses) && requestMapConfig.analyses.length > 0; } +var DATAVIEW_TYPE_2_FILTER_TYPE = { + aggregation: 'category', + histogram: 'range' +}; +function getFilter(dataview, params) { + var type = dataview.type; + + return { + type: DATAVIEW_TYPE_2_FILTER_TYPE[type], + column: dataview.options.column, + params: params + }; +} + AnalysisMapConfigAdapter.prototype.getLayers = function(analysisConfiguration, requestMapConfig, filters, callback) { // jshint maxcomplexity:7 filters = filters || {}; @@ -91,11 +105,7 @@ AnalysisMapConfigAdapter.prototype.getLayers = function(analysisConfiguration, r bySourceId[sourceId] = {}; } - bySourceId[sourceId][dataviewName] = { - type: 'range', - column: dataview.options.column, - params: dataviewsFilters[dataviewName] - }; + bySourceId[sourceId][dataviewName] = getFilter(dataview, dataviewsFilters[dataviewName]); } return bySourceId; }, {});