Merge branch 'master' into turbo-carto-tokens

lib/cartodb/backends/dataview.js

@@ -123,7 +123,7 @@ DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, param
             var queryRewriteData = layer && layer.options.query_rewrite_data;
             if ( queryRewriteData ) {
                 if ( node.type === 'source' ) {
-                    var filters = node.filters; // TODO: node.getFilters() when available in camshaft
+                    var filters = node.getFilters();
                     var filters_disabler = Object.keys(filters).reduce(
                         function(disabler, filter_id){ disabler[filter_id] = false; return disabler; },
                         {}

lib/cartodb/cache/named_map_provider_cache.js

@@ -1,8 +1,8 @@
 var _ = require('underscore');
 var dot = require('dot');
-var NamedMapMapConfigProvider = require('../models/mapconfig/named_map_provider');
-var MapConfigNamedLayersAdapter = require('../models/mapconfig_named_layers_adapter');
-var AnalysisMapConfigAdapter = require('../models/analysis-mapconfig-adapter');
+var NamedMapMapConfigProvider = require('../models/mapconfig/provider/named-map-provider');
+var MapConfigNamedLayersAdapter = require('../models/mapconfig/adapter/mapconfig-named-layers-adapter');
+var AnalysisMapConfigAdapter = require('../models/mapconfig/adapter/analysis-mapconfig-adapter');
 var templateName = require('../backends/template_maps').templateName;
 var queue = require('queue-async');
 

lib/cartodb/controllers/layergroup.js

@@ -10,7 +10,7 @@ var userMiddleware = require('../middleware/user');
 var DataviewBackend = require('../backends/dataview');
 var AnalysisStatusBackend = require('../backends/analysis-status');
 
-var MapStoreMapConfigProvider = require('../models/mapconfig/map_store_provider');
+var MapStoreMapConfigProvider = require('../models/mapconfig/provider/map-store-provider');
 
 var QueryTables = require('cartodb-query-tables');
 

lib/cartodb/controllers/map.js

@@ -15,10 +15,10 @@ var Datasource = windshaft.model.Datasource;
 
 var NamedMapsCacheEntry = require('../cache/model/named_maps_entry');
 
-var MapConfigNamedLayersAdapter = require('../models/mapconfig_named_layers_adapter');
-var AnalysisMapConfigAdapter = require('../models/analysis-mapconfig-adapter');
-var NamedMapMapConfigProvider = require('../models/mapconfig/named_map_provider');
-var CreateLayergroupMapConfigProvider = require('../models/mapconfig/create_layergroup_provider');
+var MapConfigNamedLayersAdapter = require('../models/mapconfig/adapter/mapconfig-named-layers-adapter');
+var AnalysisMapConfigAdapter = require('../models/mapconfig/adapter/analysis-mapconfig-adapter');
+var NamedMapMapConfigProvider = require('../models/mapconfig/provider/named-map-provider');
+var CreateLayergroupMapConfigProvider = require('../models/mapconfig/provider/create-layergroup-provider');
 var SqlWrapMapConfigAdapter = require('../models/mapconfig/adapter/sql-wrap-mapconfig-adapter');
 
 /**

lib/cartodb/models/layergroup_token.js

@@ -1,29 +0,0 @@
-/**
- * @param {String} token might match the following pattern: {user}@{tpl_id}@{token}:{cache_buster}
- */
-function parse(token) {
-    var signer, cacheBuster;
-
-    var tokenSplit = token.split(':');
-
-    token = tokenSplit[0];
-    if (tokenSplit.length > 1) {
-        cacheBuster = tokenSplit[1];
-    }
-
-    tokenSplit = token.split('@');
-    if ( tokenSplit.length > 1 ) {
-        signer = tokenSplit.shift();
-        if ( tokenSplit.length > 1 ) {
-            /*var template_hash = */tokenSplit.shift(); // unused
-        }
-        token = tokenSplit.shift();
-    }
-
-    return {
-        token: token,
-        signer: signer,
-        cacheBuster: cacheBuster
-    };
-}
-module.exports.parse = parse;

lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js

@@ -35,7 +35,7 @@ MapConfigOverviewsAdapter.prototype.getLayers = function(username, layers, analy
                            var node = _.find(analysesResults, function(a){ return a.rootNode.params.id === sourceId; });
                            if ( node ) {
                                node = node.rootNode;
-                               filters = node.filters; // TODO: node.getFilters() when available in camshaft
+                               filters = node.getFilters();
                                var filters_disabler = Object.keys(filters).reduce(
                                    function(disabler, filter_id){ disabler[filter_id] = false; return disabler; },
                                    {}

lib/cartodb/models/mapconfig/provider/create-layergroup-provider.js

@@ -1,7 +1,7 @@
 var assert = require('assert');
 var step = require('step');
 
-var MapStoreMapConfigProvider = require('./map_store_provider');
+var MapStoreMapConfigProvider = require('./map-store-provider');
 
 /**
  * @param {MapConfig} mapConfig

lib/cartodb/models/mapconfig/provider/named-map-provider.js

@@ -4,9 +4,9 @@ var crypto = require('crypto');
 var dot = require('dot');
 var step = require('step');
 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 SqlWrapMapConfigAdapter = require('./adapter/sql-wrap-mapconfig-adapter');
+var SqlWrapMapConfigAdapter = require('./../adapter/sql-wrap-mapconfig-adapter');
 
 /**
  * @constructor

lib/cartodb/server.js

@@ -34,7 +34,7 @@ var AnalysisBackend = require('./backends/analysis');
 var timeoutErrorTilePath = __dirname + '/../../assets/render-timeout-fallback.png';
 var timeoutErrorTile = require('fs').readFileSync(timeoutErrorTilePath, {encoding: null});
 
-var MapConfigOverviewsAdapter = require('./models/mapconfig_overviews_adapter');
+var MapConfigOverviewsAdapter = require('./models/mapconfig/adapter/mapconfig-overviews-adapter');
 
 var TurboCartoParser = require('./utils/style/turbo-carto-parser');
 var TurboCartoAdapter = require('./utils/style/turbo-carto-adapter');

lib/cartodb/utils/style/postgres-datasource.js

@@ -23,8 +23,35 @@ var methodTemplates = Object.keys(methods).reduce(function(methodTemplates, meth
     return methodTemplates;
 }, {});
 
+methodTemplates.category = dot.template([
+    'WITH',
+    'categories AS (',
+    '  SELECT {{=it._column}} AS category, count(1) AS value, row_number() OVER (ORDER BY count(1) desc) as rank',
+    '  FROM ({{=it._sql}}) _cdb_aggregation_all',
+    '  GROUP BY {{=it._column}}',
+    '  ORDER BY 2 DESC',
+    '),',
+    'agg_categories AS (',
+    '  SELECT \'__other\' category',
+    '  FROM categories',
+    '  WHERE rank >= {{=it._buckets}}',
+    '  GROUP BY 1',
+    '  UNION ALL',
+    '  SELECT CAST(category AS text)',
+    '  FROM categories',
+    '  WHERE rank < {{=it._buckets}}',
+    ')',
+    'SELECT array_agg(category) AS category FROM agg_categories'
+].join('\n'));
+
+var STRATEGY = {
+    SPLIT: 'split',
+    EXACT: 'exact'
+};
+
 var method2strategy = {
-    headtails: 'split'
+    headtails: STRATEGY.SPLIT,
+    category: STRATEGY.EXACT
 };
 
 function PostgresDatasource (pgQueryRunner, username, query) {
@@ -53,11 +80,15 @@ PostgresDatasource.prototype.getRamp = function (column, buckets, method, callba
             return callback(err);
         }
 
-        var ramp = result[0][methodName].sort(function(a, b) {
-            return a - b;
-        });
+        var strategy = method2strategy[methodName];
+        var ramp = result[0][methodName];
+        if (strategy !== STRATEGY.EXACT) {
+            ramp = ramp.sort(function(a, b) {
+                return a - b;
+            });
+        }
 
-        return callback(null, { ramp: ramp, strategy: method2strategy[methodName] });
+        return callback(null, { ramp: ramp, strategy: strategy });
     });
 };