Release 3.0.0

Merge pull request #635 from CartoDB/node-v6
Support Node v6 LTS and upgrade to Mapnik v3.x
2017-03-21 15:34:47 +01:00 · 2017-03-21 15:30:59 +01:00 · 2017-03-21 14:58:09 +01:00 · 2017-03-17 17:58:33 +01:00 · 2017-03-17 17:49:19 +01:00 · 2017-03-17 17:41:20 +01:00
47 changed files with 3224 additions and 4981 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@ node_modules*
 config.status*
 config/environments/*.js
 .idea
+.vscode
+.nvmrc
 tools/munin/windshaft.conf
 logs/
 pids/
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,18 @@
-dist: trusty # only environment that supports Postgres 9.5 at this time
-sudo: required
+dist: trusty
 addons:
  postgresql: "9.5"
  apt:
+    sources:
+      - ubuntu-toolchain-r-test
    packages:
+      - postgresql-9.5-postgis-2.3
      - postgresql-plpython-9.5
      - pkg-config
      - libcairo2-dev
      - libjpeg8-dev
      - libgif-dev
      - libpango1.0-dev
+      - g++-4.9

 before_install:
  - createdb template_postgis
@@ -17,14 +20,8 @@ before_install:
  - psql -c "CREATE EXTENSION postgis" template_postgis

 env:
-  - NPROCS=1 JOBS=1 PGUSER=postgres
+  - NPROCS=1 JOBS=1 PGUSER=postgres CXX=g++-4.9

 language: node_js
 node_js:
-  - "0.10"
-
-notifications:
-  irc:
-    channels:
-      - "irc.freenode.org#cartodb"
-    use_notice: true
+  - "6"
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,4 +8,4 @@ We love pull requests from everyone, see [Contributing to Open Source on GitHub]

 ## Submitting Contributions

-* You will need to sign a Contributor License Agreement (CLA) before making a submission. [Learn more here](https://cartodb.com/contributing).
+* You will need to sign a Contributor License Agreement (CLA) before making a submission. [Learn more here](https://carto.com/contributions).
--- a/5
+++ b/5
@@ -1,11 +1,10 @@
 1. Test (make clean all check), fix if broken before proceeding
 2. Ensure proper version in package.json
 3. Ensure NEWS section exists for the new version, review it, add release date
-4. Recreate npm-shrinkwrap.json with: `npm install --no-shrinkwrap && npm shrinkwrap`
+4. Recreate npm-shrinkwrap.json with: `make shrinkwrap`
 5. Commit package.json, npm-shrinwrap.json, NEWS
 6. git tag -a Major.Minor.Patch # use NEWS section as content
-7. Announce on cartodb@googlegroups.com
-8. Stub NEWS/package for next version
+7. Stub NEWS/package for next version

 Versions:

--- a/INSTALL.md
+++ b/INSTALL.md
@@ -4,11 +4,11 @@
 Make sure that you have the requirements needed. These are

 - Core
-  - Node.js >=0.8
-  - npm >=1.2.1 <2.0.0
+  - Node.js >=6.9.x
+  - yarn >=0.21.3
  - PostgreSQL >8.3.x, PostGIS >1.5.x
  - Redis >2.4.0 (http://www.redis.io)
-  - Mapnik 2.0.1, 2.0.2, 2.1.0, 2.2.0, 2.3.0. See [Installing Mapnik](https://github.com/CartoDB/Windshaft#installing-mapnik).
+  - Mapnik >3.x. See [Installing Mapnik](https://github.com/CartoDB/Windshaft#installing-mapnik).
  - Windshaft: check [Windshaft dependencies and installation notes](https://github.com/CartoDB/Windshaft#dependencies)
  - libcairo2-dev, libpango1.0-dev, libjpeg8-dev and libgif-dev for server side canvas support

@@ -43,11 +43,11 @@ psql -d template_postgis -c 'CREATE EXTENSION postgis;'
 To fetch and build all node-based dependencies, run:

 ```
-npm install
+yarn
 ```

-Note that the ```npm install``` step will populate the node_modules/
+Note that the ```yarn``` step will populate the node_modules/
 directory with modules, some of which being compiled on demand. If you
 happen to have startup errors you may need to force rebuilding those
 modules. At any time just wipe out the node_modules/ directory and run
-```npm install``` again.
+```yarn``` again.
--- a/8
+++ b/8
@@ -7,7 +7,13 @@ all:
 	@$(SHELL) ./scripts/install.sh

 clean:
-	rm -rf node_modules/*
+	rm -rf node_modules/
+
+shrinkwrap: clean
+	rm npm-shrinkwrap.json
+	npm install --no-shrinkwrap --production
+	npm prune
+	npm shrinkwrap

 distclean: clean
 	rm config.status*
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,164 @@
 # Changelog

+## 3.0.0
+Released 2017-03-21
+
+Announcements:
+ - Supports Node v6.9.x
+ - Drops support for Node v0.10.x
+ - Upgrades windshaft to 3.0.0
+ - Upgrades cartodb-query-tables to 0.2.0
+ - Upgrades cartodb-redis to 0.13.2
+ - Upgrades redis-mpool to 0.4.1
+
+**Note**: Due to this [issue](https://github.com/npm/npm/issues/15713), Windshaft-cartodb must be installed with `yarn` instead of `npm` providing just a `yarn.lock` to get consistent installs across machines.
+
+## 2.89.0
+Released 2017-03-17
+
+**Deprecation warning**: v2.89.0 is the last release that supports Node v0.10.x. Next mayor release will support Node v6.9.x and further versions.
+
+Announcements:
+ - Upgrades windshaft to [2.8.0](https://github.com/CartoDB/windshaft/releases/tag/2.8.0).
+
+Bug fixes:
+ - Histogram column type discovery query uses non-filtered query #637
+
+
+## 2.88.4
+Released 2017-03-10
+
+Announcements:
+ - Upgrades camshaft to [0.50.3](https://github.com/CartoDB/camshaft/releases/tag/0.50.3).
+
+
+## 2.88.3
+Released 2017-03-02
+
+Bug fixes:
+- Category dataviews now uses the proper aggregation function for the 'Other' category. See https://github.com/CartoDB/Windshaft-cartodb/issues/628
+
+## 2.88.2
+Released 2017-02-23
+
+Announcements:
+ - Upgrades camshaft to [0.50.2](https://github.com/CartoDB/camshaft/releases/tag/0.50.2).
+
+
+## 2.88.1
+Released 2017-02-21
+
+Announcements:
+ - Upgrades camshaft to [0.50.1](https://github.com/CartoDB/camshaft/releases/tag/0.50.1)
+
+
+## 2.88.0
+Released 2017-02-21
+
+Announcements:
+ - Upgrades camshaft to [0.50.0](https://github.com/CartoDB/camshaft/releases/tag/0.50.0).
+ - Upgrades cartodb-psql to [0.7.1](https://github.com/CartoDB/node-cartodb-psql/releases/tag/0.7.1).
+ - Upgrades windshaft to [2.7.0](https://github.com/CartoDB/windshaft/releases/tag/2.7.0).
+
+
+## 2.87.5
+Released 2017-02-02
+
+Bug fixes:
+ - Cast dataview override values to Number or throw error.
+
+
+## 2.87.4
+Released 2017-01-20
+
+Bug fixes:
+ - Be able to not compute NULL categories and null values  in aggregation dataviews #617.
+
+
+## 2.87.3
+Released 2016-12-19
+
+Bug fixes:
+ - Fix overviews-related dataviews problems. See https://github.com/CartoDB/Windshaft-cartodb/pull/604
+
+
+## 2.87.2
+Released 2016-12-19
+
+- Use exception safe Dataservices API functions. See https://github.com/CartoDB/dataservices-api/issues/314 and https://github.com/CartoDB/camshaft/issues/242
+
+
+## 2.87.1
+Released 2016-12-13
+
+Announcements:
+ - Upgrades windshaft to [2.6.4](https://github.com/CartoDB/Windshaft/releases/tag/2.6.4).
+ - Upgrades request dependency.
+ - Regenerate npm-shrinkwrap.json: missing dependency updates.
+
+
+## 2.87.0
+Released 2016-12-12
+
+Enhancements:
+ - Upgrade turbo-carto dependency to version 0.19.0.
+
+## 2.86.1
+Released 2016-12-02
+
+Bug fixes:
+ - Maps with analyses and `sql_wrap` were broken #599.
+
+
+## 2.86.0
+Released 2016-12-02
+
+Announcements:
+ - Upgrades windshaft to [2.6.3](https://github.com/CartoDB/Windshaft/releases/tag/2.6.3).
+
+
+## 2.85.1
+Released 2016-11-30
+
+Announcements:
+ - Upgrades camshaft to [0.48.4](https://github.com/CartoDB/camshaft/releases/tag/0.48.4).
+
+
+## 2.85.0
+Released 2016-11-24
+
+New features:
+ - Allow to set resource URL templates with substitution tokens #594.
+
+
+## 2.84.2
+Released 2016-11-23
+
+Announcements:
+ - Upgrades camshaft to [0.48.3](https://github.com/CartoDB/camshaft/releases/tag/0.48.3).
+
+
+## 2.84.1
+Released 2016-11-23
+
+Announcements:
+ - Upgrades camshaft to [0.48.2](https://github.com/CartoDB/camshaft/releases/tag/0.48.2).
+
+
+## 2.84.0
+Released 2016-11-11
+
+New features:
+ - Analyses limit configuration allows to set other limits than timeout.
+
+
+## 2.83.1
+Released 2016-11-10
+
+Announcements:
+ - Upgrades camshaft to [0.48.1](https://github.com/CartoDB/camshaft/releases/tag/0.48.1).
+
+
 ## 2.83.0
 Released 2016-11-10

--- a/README.md
+++ b/README.md
@@ -32,14 +32,14 @@ Upgrading
 Checkout your commit/branch. If you need to reinstall dependencies (you can check [NEWS](NEWS.md)) do the following:

 ```
-rm -rf node_modules; npm install
+rm -rf node_modules; yarn
 ```

 Run
 ---

 ```
-node app.js <env> 
+node app.js <env>
 ```

 Where <env> is the name of a configuration file under config/environments/.
@@ -71,12 +71,12 @@ See [CONTRIBUTING.md](CONTRIBUTING.md).
 ### Developing with a custom windshaft version

 If you plan or want to use a custom / not released yet version of windshaft (or any other dependency) the best option is
-to use `npm link`. You can read more about it at [npm-link: Symlink a package folder](https://docs.npmjs.com/cli/link).
+to use `yarn link`. You can read more about it at [yarn-link: Symlink a package folder](https://yarnpkg.com/en/docs/cli/link).

 **Quick start**:

 ```shell
-~/windshaft-directory $ npm install
-~/windshaft-directory $ npm link
-~/windshaft-cartodb-directory $ npm link windshaft
+~/windshaft-directory $ yarn
+~/windshaft-directory $ yarn link
+~/windshaft-cartodb-directory $ yarn link windshaft
 ```
--- a/app.js
+++ b/app.js
@@ -110,6 +110,7 @@ var listener = server.listen(serverOptions.bind.port, serverOptions.bind.host, b
 var version = require("./package").version;

 listener.on('listening', function() {
+    log("Using Node.js %s", process.version);
    log('Using configuration file "%s"', configurationFile);
    log(
        "Windshaft tileserver %s started on %s:%s PID=%d (%s)",
--- a/config/environments/development.js.example
+++ b/config/environments/development.js.example
@@ -23,6 +23,21 @@ var config = {
    // "tiles/layergroup" is for compatibility with versions up to 1.6.x
    ,base_url_detached: '(?:/api/v1/map|/user/:user/api/v1/map|/tiles/layergroup)'

+    // Resource URLs expose endpoints to request/retrieve metadata associated to Maps: dataviews, analysis node status.
+    //
+    // This URLs depend on how `base_url_detached` and `user_from_host` are configured: the application can be
+    // configured to accept request with the {user} in the header host or in the request path.
+    // It also might depend on the configured cdn_url via `serverMetadata.cdn_url`.
+    //
+    // This template allows to make the endpoints generation more flexible, the template exposes the following params:
+    //  1. {{=it.cdn_url}}: will be used when `serverMetadata.cdn_url` exists.
+    //  2. {{=it.user}}: will use the username as extraced from `user_from_host` or `base_url_detached`.
+    //  3. {{=it.port}}: will use the `port` from this very same configuration file.
+    ,resources_url_templates: {
+        http: 'http://{{=it.user}}.localhost.lan:{{=it.port}}/api/v1/map',
+        https: 'http://localhost.lan:{{=it.port}}/user/{{=it.user}}/api/v1/map'
+    }
+
    // Maximum number of connections for one process
    // 128 is a good value with a limit of 1024 open file descriptors
    ,maxConnections:128
@@ -96,6 +111,10 @@ var config = {
          // Important: check the configuration of uv_threadpool_size to use suitable value
          poolSize: 8,

+          // Whether grainstore will use a child process or not to transform CartoCSS into Mapnik XML.
+          // This will prevent blocking the main thread.
+          useCartocssWorkers: false,
+
          // Metatile is the number of tiles-per-side that are going
          // to be rendered at once. If all of them will be requested
          // we'd have saved time. If only one will be used, we'd have
@@ -220,8 +239,8 @@ var config = {
        // Define max execution time in ms for analyses or tags
        // If analysis or tag are not found in redis this values will be used as default.
        limits: {
-            moran: 120000,
-            cpu2x: 60000
+            moran: { timeout: 120000, maxNumberOfRows: 1e5 },
+            cpu2x: { timeout: 60000 }
        }
    }
    ,millstone: {
--- a/config/environments/production.js.example
+++ b/config/environments/production.js.example
@@ -23,6 +23,21 @@ var config = {
    // "tiles/layergroup" is for compatibility with versions up to 1.6.x
    ,base_url_detached: '(?:/api/v1/map|/user/:user/api/v1/map|/tiles/layergroup)'

+    // Resource URLs expose endpoints to request/retrieve metadata associated to Maps: dataviews, analysis node status.
+    //
+    // This URLs depend on how `base_url_detached` and `user_from_host` are configured: the application can be
+    // configured to accept request with the {user} in the header host or in the request path.
+    // It also might depend on the configured cdn_url via `serverMetadata.cdn_url`.
+    //
+    // This template allows to make the endpoints generation more flexible, the template exposes the following params:
+    //  1. {{=it.cdn_url}}: will be used when `serverMetadata.cdn_url` exists.
+    //  2. {{=it.user}}: will use the username as extraced from `user_from_host` or `base_url_detached`.
+    //  3. {{=it.port}}: will use the `port` from this very same configuration file.
+    ,resources_url_templates: {
+        http: 'http://{{=it.cdn_url}}/{{=it.user}}/api/v1/map',
+        https: 'https://{{=it.cdn_url}}/{{=it.user}}/api/v1/map'
+    }
+
    // Maximum number of connections for one process
    // 128 is a good value with a limit of 1024 open file descriptors
    ,maxConnections:128
@@ -90,6 +105,10 @@ var config = {
          // Important: check the configuration of uv_threadpool_size to use suitable value
          poolSize: 8,

+          // Whether grainstore will use a child process or not to transform CartoCSS into Mapnik XML.
+          // This will prevent blocking the main thread.
+          useCartocssWorkers: false,
+
          // Metatile is the number of tiles-per-side that are going
          // to be rendered at once. If all of them will be requested
          // we'd have saved time. If only one will be used, we'd have
@@ -214,8 +233,8 @@ var config = {
        // Define max execution time in ms for analyses or tags
        // If analysis or tag are not found in redis this values will be used as default.
        limits: {
-            moran: 120000,
-            cpu2x: 60000
+            moran: { timeout: 120000, maxNumberOfRows: 1e5 },
+            cpu2x: { timeout: 60000 }
        }
    }
    ,millstone: {
--- a/config/environments/staging.js.example
+++ b/config/environments/staging.js.example
@@ -23,6 +23,21 @@ var config = {
    // "/tiles/layergroup" is for compatibility with versions up to 1.6.x
    ,base_url_detached: '(?:/api/v1/map|/user/:user/api/v1/map|/tiles/layergroup)'

+    // Resource URLs expose endpoints to request/retrieve metadata associated to Maps: dataviews, analysis node status.
+    //
+    // This URLs depend on how `base_url_detached` and `user_from_host` are configured: the application can be
+    // configured to accept request with the {user} in the header host or in the request path.
+    // It also might depend on the configured cdn_url via `serverMetadata.cdn_url`.
+    //
+    // This template allows to make the endpoints generation more flexible, the template exposes the following params:
+    //  1. {{=it.cdn_url}}: will be used when `serverMetadata.cdn_url` exists.
+    //  2. {{=it.user}}: will use the username as extraced from `user_from_host` or `base_url_detached`.
+    //  3. {{=it.port}}: will use the `port` from this very same configuration file.
+    ,resources_url_templates: {
+        http: 'http://{{=it.user}}.localhost.lan:{{=it.port}}/api/v1/map',
+        https: 'https://{{=it.cdn_url}}/{{=it.user}}/api/v1/map'
+    }
+
    // Maximum number of connections for one process
    // 128 is a good value with a limit of 1024 open file descriptors
    ,maxConnections:128
@@ -90,6 +105,10 @@ var config = {
          // Important: check the configuration of uv_threadpool_size to use suitable value
          poolSize: 8,

+          // Whether grainstore will use a child process or not to transform CartoCSS into Mapnik XML.
+          // This will prevent blocking the main thread.
+          useCartocssWorkers: false,
+
          // Metatile is the number of tiles-per-side that are going
          // to be rendered at once. If all of them will be requested
          // we'd have saved time. If only one will be used, we'd have
@@ -214,8 +233,8 @@ var config = {
        // Define max execution time in ms for analyses or tags
        // If analysis or tag are not found in redis this values will be used as default.
        limits: {
-            moran: 120000,
-            cpu2x: 60000
+            moran: { timeout: 120000, maxNumberOfRows: 1e5 },
+            cpu2x: { timeout: 60000 }
        }
    }
    ,millstone: {
--- a/config/environments/test.js.example
+++ b/config/environments/test.js.example
@@ -23,6 +23,20 @@ var config = {
    // "tiles/layergroup" is for compatibility with versions up to 1.6.x
    ,base_url_detached: '(?:/api/v1/map|/user/:user/api/v1/map|/tiles/layergroup)'

+    // Resource URLs expose endpoints to request/retrieve metadata associated to Maps: dataviews, analysis node status.
+    //
+    // This URLs depend on how `base_url_detached` and `user_from_host` are configured: the application can be
+    // configured to accept request with the {user} in the header host or in the request path.
+    // It also might depend on the configured cdn_url via `serverMetadata.cdn_url`.
+    //
+    // This template allows to make the endpoints generation more flexible, the template exposes the following params:
+    //  1. {{=it.cdn_url}}: will be used when `serverMetadata.cdn_url` exists.
+    //  2. {{=it.user}}: will use the username as extraced from `user_from_host` or `base_url_detached`.
+    //  3. {{=it.port}}: will use the `port` from this very same configuration file.
+    ,resources_url_templates: {
+        http: 'http://{{=it.user}}.localhost.lan:{{=it.port}}/api/v1/map'
+    }
+
    // Maximum number of connections for one process
    // 128 is a good value with a limit of 1024 open file descriptors
    ,maxConnections:128
@@ -90,6 +104,10 @@ var config = {
          // Important: check the configuration of uv_threadpool_size to use suitable value
          poolSize: 8,

+          // Whether grainstore will use a child process or not to transform CartoCSS into Mapnik XML.
+          // This will prevent blocking the main thread.
+          useCartocssWorkers: false,
+
          // Metatile is the number of tiles-per-side that are going
          // to be rendered at once. If all of them will be requested
          // we'd have saved time. If only one will be used, we'd have
@@ -215,8 +233,8 @@ var config = {
        // Define max execution time in ms for analyses or tags
        // If analysis or tag are not found in redis this values will be used as default.
        limits: {
-            moran: 120000,
-            cpu2x: 60000
+            moran: { timeout: 120000, maxNumberOfRows: 1e5 },
+            cpu2x: { timeout: 60000 }
        }
    }
    ,millstone: {
--- a/docs/named_maps.md
+++ b/docs/named_maps.md
@@ -73,10 +73,6 @@ The `name` argument defines how to name this "template_name".json. Note that the
      }
    ]
  },
-  "preview_layers": {
-    "0": true,
-    "layer1": false
-  },
  "view": {
    "zoom": 4,
    "center": {
@@ -88,6 +84,10 @@ The `name` argument defines how to name this "template_name".json. Note that the
      "south": -45,
      "east": 45,
      "north": 45
+    },
+    "preview_layers": {
+      "0": true,
+      "layer1": false
    }
  }
 }
@@ -105,7 +105,7 @@ auth |
 &#124;_ valid_tokens | when `"method"` is set to `"token"`, the values listed here allow you to instantiate the Named Map. See this [example](http://docs.carto.com/faqs/manipulating-your-data/#how-to-create-a-password-protected-named-map) for how to create a password-protected map.
 placeholders | Placeholders are variables that can be placed in your template.json file's SQL or CartoCSS.
 layergroup | the layergroup configurations, as specified in the template. See [MapConfig File Format](http://docs.carto.com/carto-engine/maps-api/mapconfig/) for more information.
-view (optional) | extra keys to specify the view area for the map. It can be used to have a static preview of a Named Map without having to instantiate it. It is possible to specify it with `center` + `zoom` or with a bounding box `bbox`. Center+zoom takes precedence over bounding box.
+view (optional) | extra keys to specify the view area for the map. It can be used to have a static preview of a Named Map without having to instantiate it. It is possible to specify it with `center` + `zoom` or with a bounding box `bbox`. Center+zoom takes precedence over bounding box. Also it is possible to choose which layers are visible or not with `preview_layers` indicating its visibility by layer index or id (visible by default).
 --- | ---
 &#124;_ zoom | The zoom level to use

--- a/docs/static_maps_api.md
+++ b/docs/static_maps_api.md
@@ -146,10 +146,10 @@ It is important to note that generated images are cached from the live data refe

 ### Limits

-* While images can encompass an entirety of a map, the default limit for pixel range is 8192 x 8192.
-* Image resolution by default is set to 72 DPI
-* JPEG quality by default is 85%
-* Timeout limits for generating static maps are the same across the CARTO Editor and CARTO Engine. It is important to ensure timely processing of queries.
+* While images can encompass an entirety of a map, the limit for pixel range is 8192 x 8192.
+* Image resolution is set to 72 DPI
+* JPEG quality is 85%
+* Timeout limits for generating static maps are the same across CARTO Builder and CARTO Engine. It is important to ensure timely processing of queries.

 ## Examples

--- a/lib/cartodb/backends/analysis.js
+++ b/lib/cartodb/backends/analysis.js
@@ -12,6 +12,7 @@ var REDIS_LIMITS = {
 function AnalysisBackend (metadataBackend, options) {
    this.metadataBackend = metadataBackend;
    this.options = options || {};
+    this.options.limits = this.options.limits || {};
    this.setBatchConfig(this.options.batch);
    this.setLoggerConfig(this.options.logger);
 }
@@ -59,24 +60,32 @@ AnalysisBackend.prototype.create = function(analysisConfiguration, analysisDefin

 AnalysisBackend.prototype.getAnalysesLimits = function(username, callback) {
    var self = this;
+
+    var analysesLimits = {
+        analyses: {
+            // buffer: {
+            //     timeout: 1000,
+            //     maxNumberOfRows: 1e6
+            // }
+        }
+    };
+
+    Object.keys(self.options.limits).forEach(function(analysisTypeOrTag) {
+        analysesLimits.analyses[analysisTypeOrTag] = _.extend({}, self.options.limits[analysisTypeOrTag]);
+    });
+
    var analysesLimitsKey = REDIS_LIMITS.PREFIX + username;
    this.metadataBackend.redisCmd(REDIS_LIMITS.DB, 'HGETALL', [analysesLimitsKey], function(err, analysesTimeouts) {
+        // analysesTimeouts wil be something like: { moran: 3000, intersection: 5000 }
        analysesTimeouts = analysesTimeouts || {};

-        _.defaults(analysesTimeouts, self.options.limits);
-
-        var analysesLimits = {
-            analyses: {
-                // buffer: {
-                //     timeout: 1000
-                // }
-            }
-        };
-
        Object.keys(analysesTimeouts).forEach(function(analysisType) {
-            analysesLimits.analyses[analysisType] = {
-                timeout: Number.isFinite(+analysesTimeouts[analysisType]) ? +analysesTimeouts[analysisType] : 0
-            };
+            analysesLimits.analyses[analysisType] = _.defaults(
+                {
+                    timeout: Number.isFinite(+analysesTimeouts[analysisType]) ? +analysesTimeouts[analysisType] : 0
+                },
+                analysesLimits.analyses[analysisType]
+            );
        });

        return callback(null, analysesLimits);
--- a/lib/cartodb/backends/dataview.js
+++ b/lib/cartodb/backends/dataview.js
@@ -79,7 +79,10 @@ DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, param

            var overrideParams = _.reduce(_.pick(params, 'start', 'end', 'bins'),
                function castNumbers(overrides, val, k) {
-                    overrides[k] = Number.isFinite(+val) ? +val : val;
+                    if (!Number.isFinite(+val)) {
+                        throw new Error('Invalid number format for parameter \'' + k + '\'');
+                    }
+                    overrides[k] = +val;
                    return overrides;
                },
                {ownFilter: ownFilter}
--- a/lib/cartodb/backends/template_maps.js
+++ b/lib/cartodb/backends/template_maps.js
@@ -55,11 +55,9 @@ util.inherits(TemplateMaps, EventEmitter);
 module.exports = TemplateMaps;


-var o = TemplateMaps.prototype;
-
 //--------------- PRIVATE METHODS --------------------------------

-o._userTemplateLimit = function() {
+TemplateMaps.prototype._userTemplateLimit = function() {
  return this.opts.max_user_templates || 0;
 };

@@ -70,7 +68,7 @@ o._userTemplateLimit = function() {
 * @param redisArgs - the arguments for the redis function in an array
 * @param callback - function to pass results too.
 */
-o._redisCmd = function(redisFunc, redisArgs, callback) {
+TemplateMaps.prototype._redisCmd = function(redisFunc, redisArgs, callback) {
  var redisClient;
  var that = this;
  var db = that.db_signatures;
@@ -97,7 +95,7 @@ o._redisCmd = function(redisFunc, redisArgs, callback) {
 var _reValidNameIdentifier = /^[a-z0-9][0-9a-z_\-]*$/i;
 var _reValidPlaceholderIdentifier = /^[a-z][0-9a-z_]*$/i;
 // jshint maxcomplexity:15
-o._checkInvalidTemplate = function(template) {
+TemplateMaps.prototype._checkInvalidTemplate = function(template) {
  if ( template.version !== '0.0.1' ) {
    return new Error("Unsupported template version " + template.version);
  }
@@ -200,7 +198,7 @@ function templateDefaults(template) {
 // @param callback function(err, tpl_id)
 //        Return template identifier (only valid for given user)
 //
-o.addTemplate = function(owner, template, callback) {
+TemplateMaps.prototype.addTemplate = function(owner, template, callback) {
    var self = this;

    template = templateDefaults(template);
@@ -258,7 +256,7 @@ o.addTemplate = function(owner, template, callback) {
 //
 // @param callback function(err)
 //
-o.delTemplate = function(owner, tpl_id, callback) {
+TemplateMaps.prototype.delTemplate = function(owner, tpl_id, callback) {
    var self = this;
    step(
        function deleteTemplate() {
@@ -297,7 +295,8 @@ o.delTemplate = function(owner, tpl_id, callback) {
 //
 // @param callback function(err)
 //
-o.updTemplate = function(owner, tpl_id, template, callback) {
+TemplateMaps.prototype.updTemplate = function(owner, tpl_id, template, callback) {
+    
    var self = this;

    template = templateDefaults(template);
@@ -356,7 +355,7 @@ o.updTemplate = function(owner, tpl_id, template, callback) {
 // @param callback function(err, tpl_id_list)
 //        Returns a list of template identifiers
 //
-o.listTemplates = function(owner, callback) {
+TemplateMaps.prototype.listTemplates = function(owner, callback) {
    this._redisCmd('HKEYS', [ this.key_usr_tpl({owner:owner}) ], callback);
 };

@@ -370,7 +369,7 @@ o.listTemplates = function(owner, callback) {
 // @param callback function(err, template)
 //        Return full template definition
 //
-o.getTemplate = function(owner, tpl_id, callback) {
+TemplateMaps.prototype.getTemplate = function(owner, tpl_id, callback) {
    var self = this;
    step(
        function getTemplate() {
@@ -386,7 +385,7 @@ o.getTemplate = function(owner, tpl_id, callback) {
    );
 };

-o.isAuthorized = function(template, authTokens) {
+TemplateMaps.prototype.isAuthorized = function(template, authTokens) {
    if (!template) {
        return false;
    }
@@ -438,7 +437,7 @@ function _replaceVars (str, params) {
    });
    return str;
 }
-o.instance = function(template, params) {
+TemplateMaps.prototype.instance = function(template, params) {
  var all_params = {};
  var phold = template.placeholders || {};
  Object.keys(phold).forEach(function(k) {
@@ -500,7 +499,7 @@ o.instance = function(template, params) {
 };

 // Return a fingerPrint of the object
-o.fingerPrint = function(template) {
+TemplateMaps.prototype.fingerPrint = function(template) {
  return crypto.createHash('md5')
    .update(JSON.stringify(template))
    .digest('hex')
--- a/lib/cartodb/controllers/layergroup.js
+++ b/lib/cartodb/controllers/layergroup.js
@@ -338,6 +338,8 @@ LayergroupController.prototype.staticMap = function(req, res, width, height, zoo
 LayergroupController.prototype.sendResponse = function(req, res, body, status, headers) {
    var self = this;

+    req.profiler.done('res');
+
    res.set('Cache-Control', 'public,max-age=31536000');

    // Set Last-Modified header
--- a/lib/cartodb/controllers/map.js
+++ b/lib/cartodb/controllers/map.js
@@ -1,4 +1,6 @@
 var _ = require('underscore');
+var dot = require('dot');
+dot.templateSettings.strip = false;
 var assert = require('assert');
 var step = require('step');
 var windshaft = require('windshaft');
@@ -44,6 +46,20 @@ function MapController(authApi, pgConnection, templateMaps, mapBackend, metadata
    this.layergroupAffectedTables = layergroupAffectedTables;

    this.mapConfigAdapter = mapConfigAdapter;
+
+    this.resourcesUrlTemplates = null;
+    if (global.environment.resources_url_templates) {
+        var templates = global.environment.resources_url_templates;
+
+        if (templates.http) {
+            this.resourcesUrlTemplates = this.resourcesUrlTemplates || {};
+            this.resourcesUrlTemplates.http = dot.template(templates.http + '/{{=it.resource}}');
+        }
+        if (templates.https) {
+            this.resourcesUrlTemplates = this.resourcesUrlTemplates || {};
+            this.resourcesUrlTemplates.https = dot.template(templates.https + '/{{=it.resource}}');
+        }
+    }
 }

 util.inherits(MapController, BaseController);
@@ -187,8 +203,8 @@ MapController.prototype.create = function(req, res, prepareConfigFn) {
                self.sendError(req, res, err, 'ANONYMOUS LAYERGROUP');
            } else {
                var analysesResults = context.analysesResults || [];
-                addDataviewsAndWidgetsUrls(req.context.user, layergroup, mapConfig.obj());
-                addAnalysesMetadata(req.context.user, layergroup, analysesResults, true);
+                self.addDataviewsAndWidgetsUrls(req.context.user, layergroup, mapConfig.obj());
+                self.addAnalysesMetadata(req.context.user, layergroup, analysesResults, true);
                addContextMetadata(layergroup, mapConfig.obj(), context);
                res.set('X-Layergroup-Id', layergroup.layergroupid);
                self.send(req, res, layergroup, 200);
@@ -260,8 +276,8 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn
                layergroup.layergroupid = cdbuser + '@' + templateHash + '@' + layergroup.layergroupid;

                var _mapConfig = mapConfig.obj();
-                addDataviewsAndWidgetsUrls(cdbuser, layergroup, _mapConfig);
-                addAnalysesMetadata(cdbuser, layergroup, mapConfigProvider.analysesResults);
+                self.addDataviewsAndWidgetsUrls(cdbuser, layergroup, _mapConfig);
+                self.addAnalysesMetadata(cdbuser, layergroup, mapConfigProvider.analysesResults);
                addContextMetadata(layergroup, _mapConfig, mapConfigProvider.context);

                res.set('X-Layergroup-Id', layergroup.layergroupid);
@@ -370,7 +386,7 @@ function getLastUpdatedTime(analysesResults, lastUpdateTime) {
    }, lastUpdateTime);
 }

-function addAnalysesMetadata(username, layergroup, analysesResults, includeQuery) {
+MapController.prototype.addAnalysesMetadata = function(username, layergroup, analysesResults, includeQuery) {
    includeQuery = includeQuery || false;
    analysesResults = analysesResults || [];
    layergroup.metadata.analyses = [];
@@ -383,7 +399,7 @@ function addAnalysesMetadata(username, layergroup, analysesResults, includeQuery
                    var nodeResource = layergroup.layergroupid + '/analysis/node/' + node.id();
                    var nodeRepr = {
                        status: node.getStatus(),
-                        url: getUrls(username, nodeResource)
+                        url: this.getUrls(username, nodeResource)
                    };
                    if (includeQuery) {
                        nodeRepr.query = node.getQuery();
@@ -395,30 +411,30 @@ function addAnalysesMetadata(username, layergroup, analysesResults, includeQuery
                }

                return nodesIdMap;
-            }, {})
+            }.bind(this), {})
        });
-    });
-}
+    }.bind(this));
+};

 // TODO this should take into account several URL patterns
-function addDataviewsAndWidgetsUrls(username, layergroup, mapConfig) {
-    addDataviewsUrls(username, layergroup, mapConfig);
-    addWidgetsUrl(username, layergroup, mapConfig);
-}
+MapController.prototype.addDataviewsAndWidgetsUrls = function(username, layergroup, mapConfig) {
+    this.addDataviewsUrls(username, layergroup, mapConfig);
+    this.addWidgetsUrl(username, layergroup, mapConfig);
+};

-function addDataviewsUrls(username, layergroup, mapConfig) {
+MapController.prototype.addDataviewsUrls = function(username, layergroup, mapConfig) {
    layergroup.metadata.dataviews = layergroup.metadata.dataviews || {};
    var dataviews = mapConfig.dataviews || {};

    Object.keys(dataviews).forEach(function(dataviewName) {
        var resource = layergroup.layergroupid + '/dataview/' + dataviewName;
        layergroup.metadata.dataviews[dataviewName] = {
-            url: getUrls(username, resource)
+            url: this.getUrls(username, resource)
        };
-    });
-}
+    }.bind(this));
+};

-function addWidgetsUrl(username, layergroup, mapConfig) {
+MapController.prototype.addWidgetsUrl = function(username, layergroup, mapConfig) {
    if (layergroup.metadata && Array.isArray(layergroup.metadata.layers) && Array.isArray(mapConfig.layers)) {
        layergroup.metadata.layers = layergroup.metadata.layers.map(function(layer, layerIndex) {
            var mapConfigLayer = mapConfig.layers[layerIndex];
@@ -428,16 +444,19 @@ function addWidgetsUrl(username, layergroup, mapConfig) {
                    var resource = layergroup.layergroupid + '/' + layerIndex + '/widget/' + widgetName;
                    layer.widgets[widgetName] = {
                        type: mapConfigLayer.options.widgets[widgetName].type,
-                        url: getUrls(username, resource)
+                        url: this.getUrls(username, resource)
                    };
-                });
+                }.bind(this));
            }
            return layer;
-        });
+        }.bind(this));
    }
-}
+};

-function getUrls(username, resource) {
+MapController.prototype.getUrls = function(username, resource) {
+    if (this.resourcesUrlTemplates) {
+        return this.getUrlsFromTemplate(username, resource);
+    }
    var cdnUrl = global.environment.serverMetadata && global.environment.serverMetadata.cdn_url;
    if (cdnUrl) {
        return {
@@ -450,4 +469,29 @@ function getUrls(username, resource) {
            http: 'http://' + username + '.' + 'localhost.lan:' + port +  '/api/v1/map/' + resource
        };
    }
-}
+};
+
+MapController.prototype.getUrlsFromTemplate = function(username, resource) {
+    var urls = {};
+    var cdnUrl = global.environment.serverMetadata && global.environment.serverMetadata.cdn_url || {};
+
+    if (this.resourcesUrlTemplates.http) {
+        urls.http = this.resourcesUrlTemplates.http({
+            cdn_url: cdnUrl.http,
+            user: username,
+            port: global.environment.port,
+            resource: resource
+        });
+    }
+
+    if (this.resourcesUrlTemplates.https) {
+        urls.https = this.resourcesUrlTemplates.https({
+            cdn_url: cdnUrl.https,
+            user: username,
+            port: global.environment.port,
+            resource: resource
+        });
+    }
+
+    return urls;
+};
--- a/lib/cartodb/models/dataview/aggregation.js
+++ b/lib/cartodb/models/dataview/aggregation.js
@@ -19,25 +19,38 @@ var rankedCategoriesQueryTpl = dot.template([
    '  SELECT {{=it._column}} AS category, {{=it._aggregation}} AS value,',
    '    row_number() OVER (ORDER BY {{=it._aggregation}} desc) as rank',
    '  FROM ({{=it._query}}) _cdb_aggregation_all',
+    '  {{?it._aggregationColumn!==null}}WHERE {{=it._aggregationColumn}} IS NOT NULL{{?}}',
    '  GROUP BY {{=it._column}}',
    '  ORDER BY 2 DESC',
    ')'
 ].join('\n'));

-var categoriesSummaryQueryTpl = dot.template([
-    'categories_summary AS(',
-    '  SELECT count(1) categories_count, max(value) max_val, min(value) min_val',
+var categoriesSummaryMinMaxQueryTpl = dot.template([
+    'categories_summary_min_max AS(',
+    '  SELECT max(value) max_val, min(value) min_val',
    '  FROM categories',
    ')'
 ].join('\n'));

+var categoriesSummaryCountQueryTpl = dot.template([
+    'categories_summary_count AS(',
+    '  SELECT count(1) AS categories_count',
+    '  FROM (',
+    '    SELECT {{=it._column}} AS category',
+    '    FROM ({{=it._query}}) _cdb_categories',
+    '    GROUP BY {{=it._column}}',
+    '  ) _cdb_categories_count',
+    ')'
+].join('\n'));
+
 var rankedAggregationQueryTpl = dot.template([
    'SELECT CAST(category AS text), value, false as agg, nulls_count, min_val, max_val, count, categories_count',
-    '  FROM categories, summary, categories_summary',
+    '  FROM categories, summary, categories_summary_min_max, categories_summary_count',
    '  WHERE rank < {{=it._limit}}',
    'UNION ALL',
-    'SELECT \'Other\' category, sum(value), true as agg, nulls_count, min_val, max_val, count, categories_count',
-    '  FROM categories, summary, categories_summary',
+    'SELECT \'Other\' category, {{=it._aggregationFn}}(value) as value, true as agg, nulls_count, min_val, max_val,',
+    '       count, categories_count',
+    '  FROM categories, summary, categories_summary_min_max, categories_summary_count',
    '  WHERE rank >= {{=it._limit}}',
    'GROUP BY nulls_count, min_val, max_val, count, categories_count'
 ].join('\n'));
@@ -45,7 +58,7 @@ var rankedAggregationQueryTpl = dot.template([
 var aggregationQueryTpl = dot.template([
    'SELECT CAST({{=it._column}} AS text) AS category, {{=it._aggregation}} AS value, false as agg,',
    '  nulls_count, min_val, max_val, count, categories_count',
-    'FROM ({{=it._query}}) _cdb_aggregation_all, summary, categories_summary',
+    'FROM ({{=it._query}}) _cdb_aggregation_all, summary, categories_summary_min_max, categories_summary_count',
    'GROUP BY category, nulls_count, min_val, max_val, count, categories_count',
    'ORDER BY value DESC'
 ].join('\n'));
@@ -114,24 +127,10 @@ Aggregation.prototype.sql = function(psql, override, callback) {
    var _query = this.query;

    var aggregationSql;
+
    if (!!override.ownFilter) {
        aggregationSql = [
-            "WITH",
-            [
-                summaryQueryTpl({
-                    _query: _query,
-                    _column: this.column
-                }),
-                rankedCategoriesQueryTpl({
-                    _query: _query,
-                    _column: this.column,
-                    _aggregation: this.getAggregationSql()
-                }),
-                categoriesSummaryQueryTpl({
-                    _query: _query,
-                    _column: this.column
-                })
-            ].join(',\n'),
+            this.getCategoriesCTESql(_query, this.column, this.aggregation, this.aggregationColumn),
            aggregationQueryTpl({
                _query: _query,
                _column: this.column,
@@ -141,25 +140,11 @@ Aggregation.prototype.sql = function(psql, override, callback) {
        ].join('\n');
    } else {
        aggregationSql = [
-            "WITH",
-            [
-                summaryQueryTpl({
-                    _query: _query,
-                    _column: this.column
-                }),
-                rankedCategoriesQueryTpl({
-                    _query: _query,
-                    _column: this.column,
-                    _aggregation: this.getAggregationSql()
-                }),
-                categoriesSummaryQueryTpl({
-                    _query: _query,
-                    _column: this.column
-                })
-            ].join(',\n'),
+            this.getCategoriesCTESql(_query, this.column, this.aggregation, this.aggregationColumn),
            rankedAggregationQueryTpl({
                _query: _query,
                _column: this.column,
+                _aggregationFn: this.aggregation !== 'count' ? this.aggregation : 'sum',
                _limit: CATEGORIES_LIMIT
            })
        ].join('\n');
@@ -170,6 +155,32 @@ Aggregation.prototype.sql = function(psql, override, callback) {
    return callback(null, aggregationSql);
 };

+Aggregation.prototype.getCategoriesCTESql = function(query, column, aggregation, aggregationColumn) {
+    return [
+                "WITH",
+                [
+                    summaryQueryTpl({
+                        _query: query,
+                        _column: column
+                    }),
+                    rankedCategoriesQueryTpl({
+                        _query: query,
+                        _column: column,
+                        _aggregation: this.getAggregationSql(),
+                        _aggregationColumn: aggregation !== 'count' ? aggregationColumn : null
+                    }),
+                    categoriesSummaryMinMaxQueryTpl({
+                        _query: query,
+                        _column: column
+                    }),
+                    categoriesSummaryCountQueryTpl({
+                        _query: query,
+                        _column: column
+                    })
+                ].join(',\n')
+            ].join('\n');
+};
+
 var aggregationFnQueryTpl = dot.template('{{=it._aggregationFn}}({{=it._aggregationColumn}})');
 Aggregation.prototype.getAggregationSql = function() {
    return aggregationFnQueryTpl({
--- a/lib/cartodb/models/dataview/factory.js
+++ b/lib/cartodb/models/dataview/factory.js
@@ -11,7 +11,7 @@ var DataviewFactory = {
        if (!this.dataviews[type]) {
            throw new Error('Invalid dataview type: "' + type + '"');
        }
-        return new this.dataviews[type](query, dataviewDefinition.options);
+        return new this.dataviews[type](query, dataviewDefinition.options, dataviewDefinition.sql);
    }
 };

--- a/lib/cartodb/models/dataview/histogram.js
+++ b/lib/cartodb/models/dataview/histogram.js
@@ -109,12 +109,13 @@ var TYPE = 'histogram';
     }
 }
 */
-function Histogram(query, options) {
+function Histogram(query, options, queries) {
    if (!_.isString(options.column)) {
        throw new Error('Histogram expects `column` in widget options');
    }

    this.query = query;
+    this.queries = queries;
    this.column = options.column;
    this.bins = options.bins;

@@ -143,7 +144,7 @@ Histogram.prototype.sql = function(psql, override, callback) {
    var _column = this.column;

    var columnTypeQuery = columnTypeQueryTpl({
-        column: _column, query: this.query
+        column: _column, query: this.queries.no_filters
    });

    if (this._columnType === null) {
--- a/lib/cartodb/models/dataview/overviews/aggregation.js
+++ b/lib/cartodb/models/dataview/overviews/aggregation.js
@@ -18,25 +18,37 @@ var rankedCategoriesQueryTpl = dot.template([
    '  SELECT {{=it._column}} AS category, {{=it._aggregation}} AS value,',
    '    row_number() OVER (ORDER BY {{=it._aggregation}} desc) as rank',
    '  FROM ({{=it._query}}) _cdb_aggregation_all',
+    '  {{?it._aggregationColumn!==null}}WHERE {{=it._aggregationColumn}} IS NOT NULL{{?}}',
    '  GROUP BY {{=it._column}}',
    '  ORDER BY 2 DESC',
    ')'
 ].join('\n'));

-var categoriesSummaryQueryTpl = dot.template([
-    'categories_summary AS(',
-    '  SELECT count(1) categories_count, max(value) max_val, min(value) min_val',
+var categoriesSummaryMinMaxQueryTpl = dot.template([
+    'categories_summary_min_max AS(',
+    '  SELECT max(value) max_val, min(value) min_val',
    '  FROM categories',
    ')'
 ].join('\n'));

+var categoriesSummaryCountQueryTpl = dot.template([
+    'categories_summary_count AS(',
+    '  SELECT count(1) AS categories_count',
+    '  FROM (',
+    '    SELECT {{=it._column}} AS category',
+    '    FROM ({{=it._query}}) _cdb_categories',
+    '    GROUP BY {{=it._column}}',
+    '  ) _cdb_categories_count',
+    ')'
+].join('\n'));
+
 var rankedAggregationQueryTpl = dot.template([
    'SELECT CAST(category AS text), value, false as agg, nulls_count, min_val, max_val, count, categories_count',
-    '  FROM categories, summary, categories_summary',
+    '  FROM categories, summary, categories_summary_min_max, categories_summary_count',
    '  WHERE rank < {{=it._limit}}',
    'UNION ALL',
    'SELECT \'Other\' category, sum(value), true as agg, nulls_count, min_val, max_val, count, categories_count',
-    '  FROM categories, summary, categories_summary',
+    '  FROM categories, summary, categories_summary_min_max, categories_summary_count',
    '  WHERE rank >= {{=it._limit}}',
    'GROUP BY nulls_count, min_val, max_val, count, categories_count'
 ].join('\n'));
@@ -44,7 +56,7 @@ var rankedAggregationQueryTpl = dot.template([
 var aggregationQueryTpl = dot.template([
    'SELECT CAST({{=it._column}} AS text) AS category, {{=it._aggregation}} AS value, false as agg,',
    '  nulls_count, min_val, max_val, count, categories_count',
-    'FROM ({{=it._query}}) _cdb_aggregation_all, summary, categories_summary',
+    'FROM ({{=it._query}}) _cdb_aggregation_all, summary, categories_summary_min_max, categories_summary_count',
    'GROUP BY category, nulls_count, min_val, max_val, count, categories_count',
    'ORDER BY value DESC'
 ].join('\n'));
@@ -65,7 +77,7 @@ Aggregation.prototype.constructor = Aggregation;

 module.exports = Aggregation;

-Aggregation.prototype.sql = function(psql, filters, override, callback) {
+Aggregation.prototype.sql = function(psql, override, callback) {
    if (!callback) {
        callback = override;
        override = {};
@@ -85,9 +97,14 @@ Aggregation.prototype.sql = function(psql, filters, override, callback) {
                rankedCategoriesQueryTpl({
                    _query: _query,
                    _column: this.column,
-                    _aggregation: this.getAggregationSql()
+                    _aggregation: this.getAggregationSql(),
+                    _aggregationColumn: this.aggregation !== 'count' ? this.aggregationColumn : null
                }),
-                categoriesSummaryQueryTpl({
+                categoriesSummaryMinMaxQueryTpl({
+                    _query: _query,
+                    _column: this.column
+                }),
+                categoriesSummaryCountQueryTpl({
                    _query: _query,
                    _column: this.column
                })
@@ -110,9 +127,14 @@ Aggregation.prototype.sql = function(psql, filters, override, callback) {
                rankedCategoriesQueryTpl({
                    _query: _query,
                    _column: this.column,
-                    _aggregation: this.getAggregationSql()
+                    _aggregation: this.getAggregationSql(),
+                    _aggregationColumn: this.aggregation !== 'count' ? this.aggregationColumn : null
                }),
-                categoriesSummaryQueryTpl({
+                categoriesSummaryMinMaxQueryTpl({
+                    _query: _query,
+                    _column: this.column
+                }),
+                categoriesSummaryCountQueryTpl({
                    _query: _query,
                    _column: this.column
                })
--- a/lib/cartodb/models/dataview/overviews/base.js
+++ b/lib/cartodb/models/dataview/overviews/base.js
@@ -55,20 +55,20 @@ BaseOverviewsDataview.prototype.rewrittenQuery = function(query) {
 };

 // Default behaviour
-BaseOverviewsDataview.prototype.defaultSql = function(psql, filters, override, callback) {
+BaseOverviewsDataview.prototype.defaultSql = function(psql, override, callback) {
    var query = this.query;
    var dataview = this.baseDataview;
    if ( SETTINGS.defaultOverviews ) {
        query = this.rewrittenQuery(query);
        dataview = new this.BaseDataview(query, this.queryOptions);
    }
-    return dataview.sql(psql, filters, override, callback);
+    return dataview.sql(psql, override, callback);
 };

 // default implementation that can be override in derived classes:

-BaseOverviewsDataview.prototype.sql = function(psql, filters, override, callback) {
-    return this.defaultSql(psql, filters, override, callback);
+BaseOverviewsDataview.prototype.sql = function(psql, override, callback) {
+    return this.defaultSql(psql, override, callback);
 };

 BaseOverviewsDataview.prototype.search = function(psql, userQuery, callback) {
--- a/lib/cartodb/models/dataview/overviews/factory.js
+++ b/lib/cartodb/models/dataview/overviews/factory.js
@@ -14,7 +14,8 @@ OverviewsDataviewFactory.prototype.getDataview = function(query, dataviewDefinit
        return parentFactory.getDataview(query, dataviewDefinition);
    }
    return new dataviews[type](
-        query, dataviewDefinition.options, this.queryRewriter, this.queryRewriteData, this.options
+        query, dataviewDefinition.options, this.queryRewriter, this.queryRewriteData, this.options,
+        dataviewDefinition.sql
    );
 };

--- a/lib/cartodb/models/dataview/overviews/formula.js
+++ b/lib/cartodb/models/dataview/overviews/formula.js
@@ -36,7 +36,7 @@ Formula.prototype.constructor = Formula;

 module.exports = Formula;

-Formula.prototype.sql = function(psql, filters, override, callback) {
+Formula.prototype.sql = function(psql, override, callback) {
    var formulaQueryTpl = formulaQueryTpls[this.operation];

    if ( formulaQueryTpl ) {
@@ -52,5 +52,5 @@ Formula.prototype.sql = function(psql, filters, override, callback) {
    }

    // default behaviour
-    return this.defaultSql(psql, filters, override, callback);
+    return this.defaultSql(psql, override, callback);
 };
--- a/lib/cartodb/models/dataview/overviews/histogram.js
+++ b/lib/cartodb/models/dataview/overviews/histogram.js
@@ -8,7 +8,6 @@ dot.templateSettings.strip = false;
 var columnTypeQueryTpl = dot.template(
    'SELECT pg_typeof({{=it.column}})::oid FROM ({{=it.query}}) _cdb_histogram_column_type limit 1'
 );
-var columnCastTpl = dot.template("date_part('epoch', {{=it.column}})");

 var BIN_MIN_NUMBER = 6;
 var BIN_MAX_NUMBER = 48;
@@ -97,10 +96,11 @@ var histogramQueryTpl = dot.template([
    'ORDER BY bin'
 ].join('\n'));

-function Histogram(query, options, queryRewriter, queryRewriteData, params) {
+function Histogram(query, options, queryRewriter, queryRewriteData, params, queries) {
    BaseOverviewsDataview.call(this, query, options, BaseDataview, queryRewriter, queryRewriteData, params);

    this.query = query;
+    this.queries = queries;
    this.column = options.column;
    this.bins = options.bins;

@@ -130,7 +130,7 @@ Histogram.prototype.sql = function(psql, override, callback) {
    var _column = this.column;

    var columnTypeQuery = columnTypeQueryTpl({
-        column: _column, query: this.rewrittenQuery(this.query)
+        column: _column, query: this.rewrittenQuery(this.queries.no_filters)
    });

    if (this._columnType === null) {
@@ -149,7 +149,9 @@ Histogram.prototype.sql = function(psql, override, callback) {
    }

    if (this._columnType === 'date') {
-        _column = columnCastTpl({column: _column});
+        // overviews currently aggregate dates to NULL
+        // to avoid problem we don't use overviews for histograms of date columns
+        return this.defaultSql(psql, override, callback);
    }

    var _query = this.rewrittenQuery(this.query);
--- a/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/mapconfig-overviews-adapter.js
@@ -33,7 +33,7 @@ MapConfigOverviewsAdapter.prototype.getMapConfig = function(user, requestMapConf
               step(
                   function collectFiltersData() {
                       var filters, unfiltered_query;
-                       if ( layer.options.source && analysesResults ) {
+                       if ( layer.options.source && analysesResults && !layer.options.sql_wrap) {
                           var sourceId = layer.options.source.id;
                           var node = _.find(analysesResults, function(a){ return a.rootNode.params.id === sourceId; });
                           if ( node ) {
--- a/lib/cartodb/models/mapconfig/adapter/turbo-carto-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/turbo-carto-adapter.js
@@ -4,6 +4,13 @@ var dot = require('dot');
 dot.templateSettings.strip = false;
 var queue = require('queue-async');
 var PSQL = require('cartodb-psql');
+/**
+ * cartodb-psql creates `global.Promise` as an empty constructor.
+ * However, `turbo-carto` relies on a polyfil that fails to create the polyfil
+ * as it finds `global.Promise` but it doesn't find `Promise.resolve`.
+ */
+global.Promise = global.Promise || function() {};
+global.Promise.resolve = global.Promise.resolve || function() {};
 var turboCarto = require('turbo-carto');

 var SubstitutionTokens = require('../../../utils/substitution-tokens');
--- a/lib/cartodb/server_options.js
+++ b/lib/cartodb/server_options.js
@@ -70,6 +70,7 @@ module.exports = {
        },
        datasource: global.environment.postgres,
        cachedir: global.environment.millstone.cache_basedir,
+        use_workers: rendererConfig.mapnik.useCartocssWorkers || false,
        mapnik_version: global.environment.mapnik_version,
        mapnik_tile_format: global.environment.mapnik_tile_format || 'png',
        default_layergroup_ttl: global.environment.mapConfigTTL || 7200
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "windshaft-cartodb",
-  "version": "2.83.0",
+  "version": "3.0.0",
  "description": "A map tile server for CartoDB",
  "keywords": [
    "cartodb"
@@ -20,10 +20,10 @@
  ],
  "dependencies": {
    "body-parser": "~1.14.0",
-    "camshaft": "0.48.0",
-    "cartodb-psql": "~0.6.1",
-    "cartodb-query-tables": "~0.1.0",
-    "cartodb-redis": "0.13.1",
+    "camshaft": "0.50.3",
+    "cartodb-psql": "~0.7.1",
+    "cartodb-query-tables": "0.2.0",
+    "cartodb-redis": "0.13.2",
    "debug": "~2.2.0",
    "dot": "~1.0.2",
    "express": "~4.13.3",
@@ -33,13 +33,13 @@
    "lzma": "~2.3.2",
    "node-statsd": "~0.0.7",
    "queue-async": "~1.0.7",
-    "redis-mpool": "~0.4.0",
-    "request": "~2.62.0",
+    "redis-mpool": "0.4.1",
+    "request": "~2.79.0",
    "step": "~0.0.6",
    "step-profiler": "~0.3.0",
-    "turbo-carto": "0.18.0",
+    "turbo-carto": "0.19.0",
    "underscore": "~1.6.0",
-    "windshaft": "2.6.2",
+    "windshaft": "3.0.0",
    "yargs": "~5.0.0"
  },
  "devDependencies": {
@@ -47,7 +47,7 @@
    "jshint": "~2.6.0",
    "mocha": "~1.21.4",
    "nock": "~2.11.0",
-    "redis": "~0.8.6",
+    "redis": "~0.12.1",
    "semver": "~1.1.4",
    "strftime": "~0.8.2"
  },
@@ -56,7 +56,7 @@
    "test": "make test-all"
  },
  "engines": {
-    "node": ">=0.8 <0.11",
-    "npm": ">=2.14.16"
+    "node": ">=6.9",
+    "npm": ">=3.10"
  }
 }
--- a/test/acceptance/dataviews/aggregation.js
+++ b/test/acceptance/dataviews/aggregation.js
@@ -1,9 +1,8 @@
 require('../../support/test_helper');
-
 var assert = require('../../support/assert');
 var TestClient = require('../../support/test-client');

-describe('aggregations', function() {
+describe('aggregations happy cases', function() {

    afterEach(function(done) {
        if (this.testClient) {
@@ -13,30 +12,36 @@ describe('aggregations', function() {
        }
    });

-    function aggregationOperationMapConfig(operation) {
-        return {
+    function aggregationOperationMapConfig(operation, query, column, aggregationColumn) {
+        column = column || 'adm0name';
+        aggregationColumn = aggregationColumn || 'pop_max';
+        query = query || 'select * from populated_places_simple_reduced';
+
+        var mapConfig = {
            version: '1.5.0',
            layers: [
                {
                    type: 'mapnik',
                    options: {
-                        sql: 'select * from populated_places_simple_reduced',
+                        sql: query,
                        cartocss: '#layer0 { marker-fill: red; marker-width: 10; }',
                        cartocss_version: '2.0.1',
-                        widgets: {
-                            adm0name: {
-                                type: 'aggregation',
-                                options: {
-                                    column: 'adm0name',
-                                    aggregation: operation,
-                                    aggregationColumn: 'pop_max'
-                                }
-                            }
-                        }
+                        widgets: {}
                    }
                }
            ]
        };
+
+        mapConfig.layers[0].options.widgets[column] = {
+            type: 'aggregation',
+            options: {
+                column: column,
+                aggregation: operation,
+                aggregationColumn: aggregationColumn
+            }
+        };
+
+        return mapConfig;
    }

    var operations = ['count', 'sum', 'avg', 'max', 'min'];
@@ -56,4 +61,88 @@ describe('aggregations', function() {
            });
        });
    });
+
+    var query = [
+        'select 1 as val, \'a\' as cat, ST_Transform(ST_SetSRID(ST_MakePoint(0,0),4326),3857) as the_geom_webmercator',
+        'select null, \'b\', ST_Transform(ST_SetSRID(ST_MakePoint(0,1),4326),3857)',
+        'select null, \'b\', ST_Transform(ST_SetSRID(ST_MakePoint(1,0),4326),3857)',
+        'select null, null, ST_Transform(ST_SetSRID(ST_MakePoint(1,1),4326),3857)'
+    ].join(' UNION ALL ');
+
+    operations.forEach(function (operation) {
+        var not = operation === 'count' ? ' not ' : ' ';
+        var description = 'should' +
+            not +
+            'handle NULL values in category and aggregation columns using "' +
+            operation +
+            '" as aggregation operation';
+
+        it(description, function (done) {
+            this.testClient = new TestClient(aggregationOperationMapConfig(operation, query, 'cat', 'val'));
+            this.testClient.getDataview('cat', { own_filter: 0 }, function (err, aggregation) {
+                assert.ifError(err);
+
+                assert.ok(aggregation);
+                assert.equal(aggregation.type, 'aggregation');
+                assert.ok(aggregation.categories);
+                assert.equal(aggregation.categoriesCount, 3);
+                assert.equal(aggregation.count, 4);
+                assert.equal(aggregation.nulls, 1);
+
+                var hasNullCategory = false;
+                aggregation.categories.forEach(function (category) {
+                    if (category.category === null) {
+                        hasNullCategory = true;
+                    }
+                });
+
+                if (operation === 'count') {
+                    assert.ok(hasNullCategory, 'aggregation has not a category NULL');
+                } else {
+                    assert.ok(!hasNullCategory, 'aggregation has category NULL');
+                }
+
+                done();
+            });
+        });
+    });
+
+    var operations_and_values = {'count': 9, 'sum': 45, 'avg': 5, 'max': 9, 'min': 1};
+
+    var query_other = [
+        'select generate_series(1,3) as val, \'other_a\' as cat, NULL as the_geom_webmercator',
+        'select generate_series(4,6) as val, \'other_b\' as cat, NULL as the_geom_webmercator',
+        'select generate_series(7,9) as val, \'other_c\' as cat, NULL as the_geom_webmercator',
+        'select generate_series(10,12) as val, \'category_1\' as cat, NULL as the_geom_webmercator',
+        'select generate_series(10,12) as val, \'category_2\' as cat, NULL as the_geom_webmercator',
+        'select generate_series(10,12) as val, \'category_3\' as cat, NULL as the_geom_webmercator',
+        'select generate_series(10,12) as val, \'category_4\' as cat, NULL as the_geom_webmercator',
+        'select generate_series(10,12) as val, \'category_5\' as cat, NULL as the_geom_webmercator'
+    ].join(' UNION ALL ');
+
+    Object.keys(operations_and_values).forEach(function (operation) {
+        var description = 'should aggregate OTHER category using "' + operation + '"';
+
+        it(description, function (done) {
+            this.testClient = new TestClient(aggregationOperationMapConfig(operation, query_other, 'cat', 'val'));
+            this.testClient.getDataview('cat', { own_filter: 0 }, function (err, aggregation) {
+                assert.ifError(err);
+
+                assert.ok(aggregation);
+                assert.equal(aggregation.type, 'aggregation');
+                assert.ok(aggregation.categories);
+                assert.equal(aggregation.categoriesCount, 8);
+                assert.equal(aggregation.count, 24);
+                assert.equal(aggregation.nulls, 0);
+
+                var aggregated_categories = aggregation.categories.filter( function(category) {
+                    return category.agg === true;
+                });
+                assert.equal(aggregated_categories.length, 1);
+                assert.equal(aggregated_categories[0].value, operations_and_values[operation]);
+
+                done();
+            });
+        });
+    });
 });
--- a/test/acceptance/dataviews/histogram.js
+++ b/test/acceptance/dataviews/histogram.js
@@ -77,4 +77,24 @@ describe('histogram-dataview', function() {
            done();
        });
    });
+
+    it('should cast all overridable params to numbers', function(done) {
+        var params = {
+            bins: '256 AS other, (select 256 * 2) AS bins_number--',
+            start: 1e3,
+            end: 0,
+            response: TestClient.RESPONSE.ERROR
+        };
+
+        this.testClient = new TestClient(mapConfig, 1234);
+        this.testClient.getDataview('pop_max_histogram', params, function(err, res) {
+            assert.ok(!err, err);
+
+            assert.ok(res.errors);
+            assert.equal(res.errors.length, 1);
+            assert.ok(res.errors[0].match(/Invalid number format for parameter 'bins'/));
+
+            done();
+        });
+    });
 });
--- a/test/acceptance/dataviews/overviews.js
+++ b/test/acceptance/dataviews/overviews.js
@@ -144,6 +144,22 @@ describe('dataviews using tables with overviews', function() {
                    aggregationColumn: 'name',
                }
            },
+            test_histogram: {
+                type: 'histogram',
+                source: {id: 'data-source'},
+                options: {
+                    column: 'value',
+                    bins: 2
+                }
+            },
+            test_histogram_date: {
+                type: 'histogram',
+                source: {id: 'data-source'},
+                options: {
+                    column: 'updated_at',
+                    bins: 2
+                }
+            },
            test_avg: {
                type: 'formula',
                source: {id: 'data-source'},
@@ -265,8 +281,83 @@ describe('dataviews using tables with overviews', function() {
        });
    });

+    it("should expose a histogram", function (done) {
+        var testClient = new TestClient(overviewsMapConfig);
+        testClient.getDataview('test_histogram', function (err, histogram) {
+            if (err) {
+                return done(err);
+            }
+            assert.ok(histogram);
+            assert.equal(histogram.type, 'histogram');
+            assert.ok(Array.isArray(histogram.bins));
+            testClient.drain(done);
+        });
+    });
+
    describe('filters', function() {

+        describe('histogram', function () {
+
+            it("should expose a filtered histogram", function (done) {
+                var params = {
+                    filters: {
+                        dataviews: { test_histogram: { min: 2 } }
+                    }
+                };
+                var testClient = new TestClient(overviewsMapConfig);
+                testClient.getDataview('test_histogram', params, function (err, histogram) {
+                    if (err) {
+                        return done(err);
+                    }
+                    assert.ok(histogram);
+                    assert.equal(histogram.type, 'histogram');
+                    assert.ok(Array.isArray(histogram.bins));
+                    assert.equal(histogram.bins.length, 4);
+                    testClient.drain(done);
+                });
+            });
+
+            it("should expose a filtered histogram with no results", function (done) {
+                var params = {
+                    filters: {
+                        dataviews: { test_histogram: { max: -1 } }
+                    }
+                };
+                var testClient = new TestClient(overviewsMapConfig);
+                testClient.getDataview('test_histogram', params, function (err, histogram) {
+                    if (err) {
+                        return done(err);
+                    }
+                    assert.ok(histogram);
+                    assert.equal(histogram.type, 'histogram');
+                    assert.ok(Array.isArray(histogram.bins));
+                    assert.equal(histogram.bins.length, 0);
+                    testClient.drain(done);
+                });
+            });
+
+            it("should expose a filtered date histogram with no results", function (done) {
+                // This most likely works because the overviews will pass
+                // the responsibility to the normal dataviews.
+                var params = {
+                    filters: {
+                        dataviews: { test_histogram_date: { max: -1 } }
+                    }
+                };
+                var testClient = new TestClient(overviewsMapConfig);
+                testClient.getDataview('test_histogram_date', params, function (err, histogram) {
+                    if (err) {
+                        return done(err);
+                    }
+                    assert.ok(histogram);
+                    assert.equal(histogram.type, 'histogram');
+                    assert.ok(Array.isArray(histogram.bins));
+                    assert.equal(histogram.bins.length, 0);
+                    testClient.drain(done);
+                });
+            });
+        });
+
        describe('category', function () {

            var params = {
--- a/test/acceptance/multilayer.js
+++ b/test/acceptance/multilayer.js
@@ -5,6 +5,9 @@ var step        = require('step');
 var strftime    = require('strftime');
 var redis_stats_db = 5;

+var mapnik = require('windshaft').mapnik;
+var semver = require('semver');
+
 var helper = require(__dirname + '/../support/test_helper');
 var LayergroupToken = require('../support/layergroup-token');

@@ -574,7 +577,7 @@ describe(suiteName, function() {
            if ( err ) {
              return done(err);
            }
-            // trip epoch
+            // strip epoch
            expected_token = expected_token.split(':')[0];
            keysToDelete['map_cfg|' + expected_token] = 0;
            keysToDelete['user:localhost:mapviews:global'] = 5;
@@ -973,70 +976,72 @@ describe(suiteName, function() {
    });

    // See https://github.com/CartoDB/Windshaft-cartodb/issues/93
-    it("accepts unused directives", function(done) {
-      var layergroup =  {
-        version: '1.0.0',
-        layers: [
-           { options: {
-               sql: "select 'SRID=3857;POINT(0 0)'::geometry as the_geom_webmercator",
-               cartocss: '#layer { point-transform:"scale(20)"; }',
-               cartocss_version: '2.0.1'
-             } }
-        ]
-      };
-      var expected_token; // = "e34dd7e235138a062f8ba7ad051aa3a7";
-      step(
-        function do_post()
-        {
-          var next = this;
-          assert.response(server, {
-              url: layergroup_url,
-              method: 'POST',
-              headers: {host: 'localhost', 'Content-Type': 'application/json' },
-              data: JSON.stringify(layergroup)
-          }, {}, function(res) {
-              assert.equal(res.statusCode, 200, res.body);
-              var parsedBody = JSON.parse(res.body);
-              if ( expected_token ) {
-                assert.equal(parsedBody.layergroupid, expected_token + ':' + expected_last_updated_epoch);
-                assert.equal(res.headers['x-layergroup-id'], parsedBody.layergroupid);
-              }
-              else {
-                var token_components = parsedBody.layergroupid.split(':');
-                expected_token = token_components[0];
-                expected_last_updated_epoch = token_components[1];
-              }
-              next(null, res);
-          });
-        },
-        function do_get_tile(err)
-        {
-            assert.ifError(err);
-          var next = this;
-          assert.response(server, {
-              url: layergroup_url + "/" + expected_token + ':cb0/0/0/0.png',
-              method: 'GET',
-              headers: {host: 'localhost' },
-              encoding: 'binary'
-          }, {}, function(res) {
-              assert.equal(res.statusCode, 200, res.body);
-              assert.equal(res.headers['content-type'], "image/png");
-              assert.imageBufferIsSimilarToFile(res.body, windshaft_fixtures + '/test_default_mapnik_point.png',
-                  IMAGE_EQUALS_TOLERANCE_PER_MIL, function(err/*, similarity*/) {
-                      next(err);
+    if (semver.satisfies(mapnik.versions.mapnik, '2.3.x')) {
+        it("accepts unused directives", function(done) {
+          var layergroup =  {
+            version: '1.0.0',
+            layers: [
+               { options: {
+                   sql: "select 'SRID=3857;POINT(0 0)'::geometry as the_geom_webmercator",
+                   cartocss: '#layer { point-transform:"scale(20)"; }',
+                   cartocss_version: '2.0.1'
+                 } }
+            ]
+          };
+          var expected_token; // = "e34dd7e235138a062f8ba7ad051aa3a7";
+          step(
+            function do_post()
+            {
+              var next = this;
+              assert.response(server, {
+                  url: layergroup_url,
+                  method: 'POST',
+                  headers: {host: 'localhost', 'Content-Type': 'application/json' },
+                  data: JSON.stringify(layergroup)
+              }, {}, function(res) {
+                  assert.equal(res.statusCode, 200, res.body);
+                  var parsedBody = JSON.parse(res.body);
+                  if ( expected_token ) {
+                    assert.equal(parsedBody.layergroupid, expected_token + ':' + expected_last_updated_epoch);
+                    assert.equal(res.headers['x-layergroup-id'], parsedBody.layergroupid);
                  }
-              );
-          });
-        },
-        function finish(err) {
-            keysToDelete['user:localhost:mapviews:global'] = 5;
-            keysToDelete['map_cfg|' + expected_token] = 0;
-
-            done(err);
-        }
-      );
-    });
+                  else {
+                    var token_components = parsedBody.layergroupid.split(':');
+                    expected_token = token_components[0];
+                    expected_last_updated_epoch = token_components[1];
+                  }
+                  next(null, res);
+              });
+            },
+            function do_get_tile(err)
+            {
+                assert.ifError(err);
+              var next = this;
+              assert.response(server, {
+                  url: layergroup_url + "/" + expected_token + ':cb0/0/0/0.png',
+                  method: 'GET',
+                  headers: {host: 'localhost' },
+                  encoding: 'binary'
+              }, {}, function(res) {
+                  assert.equal(res.statusCode, 200, res.body);
+                  assert.equal(res.headers['content-type'], "image/png");
+                  assert.imageBufferIsSimilarToFile(res.body, windshaft_fixtures + '/test_default_mapnik_point.png',
+                      IMAGE_EQUALS_TOLERANCE_PER_MIL, function(err/*, similarity*/) {
+                          next(err);
+                      }
+                  );
+              });
+            },
+            function finish(err) {
+                keysToDelete['user:localhost:mapviews:global'] = 5;
+                keysToDelete['map_cfg|' + expected_token] = 0;

+                done(err);
+            }
+          );
+        });
+    }
+    
    // See https://github.com/CartoDB/Windshaft-cartodb/issues/91
    // and https://github.com/CartoDB/Windshaft-cartodb/issues/38
    it("tiles for private tables can be fetched with api_key", function(done) {
--- a/test/acceptance/multilayer_server.js
+++ b/test/acceptance/multilayer_server.js
@@ -228,7 +228,9 @@ describe('tests from old api translated to multilayer', function() {
                },
                function(res) {
                    var parsed = JSON.parse(res.body);
-                    assert.deepEqual(parsed.errors, [ 'Unexpected token W' ]);
+                    assert.ok(parsed.errors);
+                    assert.equal(parsed.errors.length, 1);
+                    assert.ok(parsed.errors[0].match(/^Unexpected token W/));

                    done();
                }
--- a/test/acceptance/ported/multilayer_error_cases.js
+++ b/test/acceptance/ported/multilayer_error_cases.js
@@ -419,7 +419,9 @@ describe('multilayer error cases', function() {
            },
            function(res) {
                var parsedBody = JSON.parse(res.body);
-                assert.deepEqual(parsedBody, { errors: ['SyntaxError: Unexpected token {'] });
+                assert.ok(parsedBody.errors);
+                assert.equal(parsedBody.errors.length, 1);
+                assert.ok(parsedBody.errors[0].match(/^SyntaxError: Unexpected token {/));
                done();
            }
        );
--- a/test/acceptance/ported/server_gettile.js
+++ b/test/acceptance/ported/server_gettile.js
@@ -139,13 +139,15 @@ describe('server_gettile', function() {
            13, 4011, 3088, imageCompareFn('test_table_13_4011_3088_styled_black.png', done));
    });

-    // See http://github.com/CartoDB/Windshaft/issues/99
-    it("unused directives are tolerated",  function(done){
-        var style = "#test_table{point-transform: 'scale(100)';}";
-        var sql = "SELECT 1 as cartodb_id, 'SRID=4326;POINT(0 0)'::geometry as the_geom";
-        testClient.getTile(testClient.singleLayerMapConfig(sql, style), 0, 0, 0,
-            imageCompareFn('test_default_mapnik_point.png', done));
-    });
+    if ( semver.satisfies(mapnik.versions.mapnik, '2.3.x') ) {
+        // See http://github.com/CartoDB/Windshaft/issues/99
+        it("unused directives are tolerated",  function(done){
+            var style = "#test_table{point-transform: 'scale(100)';}";
+            var sql = "SELECT 1 as cartodb_id, 'SRID=4326;POINT(0 0)'::geometry as the_geom";
+            testClient.getTile(testClient.singleLayerMapConfig(sql, style), 0, 0, 0,
+                imageCompareFn('test_default_mapnik_point.png', done));
+        });
+    }

    // See http://github.com/CartoDB/Windshaft/issues/100
    var test_strictness = function(done) {
@@ -168,51 +170,53 @@ describe('server_gettile', function() {
      // Strictness handling changed in 2.3.x, possibly a bug: see http://github.com/mapnik/mapnik/issues/2301
      it.skip('[skipped due to http://github.com/mapnik/mapnik/issues/2301]' + test_strict_lbl,  test_strictness);
    }
-    else {
+    else  if (!semver.satisfies(mapnik.versions.mapnik, '3.0.x')) {
      it(test_strict_lbl,  test_strictness);
    }

-    it('high cpu regression with mapnik <2.3.x', function(done) {
-        var sql = [
-            "SELECT 'my polygon name here' AS name,",
-            "st_envelope(st_buffer(st_transform(",
-            "st_setsrid(st_makepoint(-26.6592894004,49.7990296995),4326),3857),10000000)) AS the_geom",
-            "FROM generate_series(-6,6) x",
-            "UNION ALL",
-            "SELECT 'my marker name here' AS name,",
-            "       st_transform(st_setsrid(st_makepoint(49.6042060319,-49.0522997372),4326),3857) AS the_geom",
-            "FROM generate_series(-6,6) x"
-        ].join(' ');
+    if ( semver.satisfies(mapnik.versions.mapnik, '2.3.x') ) {

-        var style = [
-            '#test_table {marker-fill:#ff7;',
-            '    marker-max-error:0.447492761618;',
-            '    marker-line-opacity:0.659371340628;',
-            '    marker-allow-overlap:true;',
-            '    polygon-fill:green;',
-            '    marker-spacing:0.0;',
-            '    marker-width:4.0;',
-            '    marker-height:18.0;',
-            '    marker-opacity:0.942312062822;',
-            '    line-color:green;',
-            '    line-gamma:0.945973211092;',
-            '    line-cap:square;',
-            '    polygon-opacity:0.12576055992;',
-            '    marker-type:arrow;',
-            '    polygon-gamma:0.46354913107;',
-            '    line-dasharray:33,23;',
-            '    line-join:bevel;',
-            '    marker-placement:line;',
-            '    line-width:1.0;',
-            '    marker-line-color:#ff7;',
-            '    line-opacity:0.39403752154;',
-            '    marker-line-width:3.0;',
-            '}'
-        ].join('');
+        it('high cpu regression with mapnik <2.3.x', function(done) {
+            var sql = [
+                "SELECT 'my polygon name here' AS name,",
+                "st_envelope(st_buffer(st_transform(",
+                "st_setsrid(st_makepoint(-26.6592894004,49.7990296995),4326),3857),10000000)) AS the_geom",
+                "FROM generate_series(-6,6) x",
+                "UNION ALL",
+                "SELECT 'my marker name here' AS name,",
+                "       st_transform(st_setsrid(st_makepoint(49.6042060319,-49.0522997372),4326),3857) AS the_geom",
+                "FROM generate_series(-6,6) x"
+            ].join(' ');

-        testClient.getTile(testClient.singleLayerMapConfig(sql, style), 13, 4011, 3088, done);
-    });
+            var style = [
+                '#test_table {marker-fill:#ff7;',
+                '    marker-max-error:0.447492761618;',
+                '    marker-line-opacity:0.659371340628;',
+                '    marker-allow-overlap:true;',
+                '    polygon-fill:green;',
+                '    marker-spacing:0.0;',
+                '    marker-width:4.0;',
+                '    marker-height:18.0;',
+                '    marker-opacity:0.942312062822;',
+                '    line-color:green;',
+                '    line-gamma:0.945973211092;',
+                '    line-cap:square;',
+                '    polygon-opacity:0.12576055992;',
+                '    marker-type:arrow;',
+                '    polygon-gamma:0.46354913107;',
+                '    line-dasharray:33,23;',
+                '    line-join:bevel;',
+                '    marker-placement:line;',
+                '    line-width:1.0;',
+                '    marker-line-color:#ff7;',
+                '    line-opacity:0.39403752154;',
+                '    marker-line-width:3.0;',
+                '}'
+            ].join('');

+            testClient.getTile(testClient.singleLayerMapConfig(sql, style), 13, 4011, 3088, done);
+        });
+    }
    // https://github.com/CartoDB/Windshaft-cartodb/issues/316
    it('should return errors with better formatting', function(done) {
        var mapConfig = {
--- a/test/acceptance/ported/torque.js
+++ b/test/acceptance/ported/torque.js
@@ -370,7 +370,7 @@ describe('torque', function() {
        {
          var next = this;
          assert.response(server, {
-              url: '/database/windshaft_test/layergroup?dbport=1234567',
+              url: '/database/windshaft_test/layergroup?dbport=54777',
              method: 'POST',
              headers: {'Content-Type': 'application/json' },
              data: JSON.stringify(mapconfig)
--- a/test/acceptance/widgets/ported/histogram.js
+++ b/test/acceptance/widgets/ported/histogram.js
@@ -304,6 +304,37 @@ describe('widgets', function() {
                });
            });

+            it('can use a datetime filtered column with no results', function(done) {
+                this.testClient = new TestClient(histogramsMapConfig({
+                    updated_at: {
+                        type: 'histogram',
+                        options: {
+                            column: 'updated_at'
+                        }
+                    }
+                }));
+                var params = {
+                    own_filter: 1,
+                    filters: {
+                        layers: [{
+                            updated_at: {
+                                // this will remove all results
+                                max: -1
+                            }
+                        }]
+                    }
+                };
+                this.testClient.getWidget('updated_at', params, function (err, res, histogram) {
+                    assert.ok(!err, err);
+                    assert.ok(histogram);
+                    assert.equal(histogram.type, 'histogram');
+
+                    assert.equal(histogram.bins.length, 0);
+
+                    done();
+                });
+            });
+
            it('can getTile with datetime filtered column', function(done) {
                this.testClient = new TestClient(histogramsMapConfig({
                    updated_at: {
--- a/test/integration/analysis-backend-limits.js
+++ b/test/integration/analysis-backend-limits.js
@@ -44,7 +44,12 @@ describe('analysis-backend limits', function() {
    }

    it("should use limits from configuration", function(done) {
-        var analysisBackend = new AnalysisBackend(this.metadataBackend, { limits: { moran: 5000, kmeans: 5000 } });
+        var analysisBackend = new AnalysisBackend(this.metadataBackend, {
+            limits: {
+                moran: { timeout: 5000 },
+                kmeans: { timeout: 5000 }
+            }
+        });
        analysisBackend.getAnalysesLimits(user, function(err, result) {
            assert.ok(!err, err);

@@ -88,7 +93,11 @@ describe('analysis-backend limits', function() {
                return done(err);
            }

-            var analysisBackend = new AnalysisBackend(self.metadataBackend, { limits: { moran: 1000 } });
+            var analysisBackend = new AnalysisBackend(self.metadataBackend, {
+                limits: {
+                    moran: { timeout: 1000 }
+                }
+            });
            analysisBackend.getAnalysesLimits(user, function(err, result) {
                assert.ok(!err, err);

@@ -109,7 +118,12 @@ describe('analysis-backend limits', function() {
                return done(err);
            }

-            var analysisBackend = new AnalysisBackend(self.metadataBackend, { limits: { moran: 1000, kmeans: 1000 } });
+            var analysisBackend = new AnalysisBackend(self.metadataBackend, {
+                limits: {
+                    moran: { timeout: 1000 },
+                    kmeans: { timeout: 1000 }
+                }
+            });
            analysisBackend.getAnalysesLimits(user, function(err, result) {
                assert.ok(!err, err);

@@ -124,4 +138,30 @@ describe('analysis-backend limits', function() {
        });
    });

+    it("should allow to set other limits per analysis via configuration, and keep timeout from redis", function(done) {
+        var self = this;
+        var limits = ['aggregate-intersection', 5000];
+
+        withAnalysesLimits(limits, function(err) {
+            if (err) {
+                return done(err);
+            }
+
+            var analysisBackend = new AnalysisBackend(self.metadataBackend, {
+                limits: {
+                    'aggregate-intersection': { timeout: 10000, maxNumberOfRows: 1e5 }
+                }
+            });
+            analysisBackend.getAnalysesLimits(user, function(err, result) {
+                assert.ok(!err, err);
+
+                assert.ok(result.analyses['aggregate-intersection']);
+                assert.equal(result.analyses['aggregate-intersection'].timeout, 5000);
+                assert.equal(result.analyses['aggregate-intersection'].maxNumberOfRows, 1e5);
+
+                done();
+            });
+        });
+    });
+
 });
--- a/test/integration/mapconfig_named_layers_datasource.js
+++ b/test/integration/mapconfig_named_layers_datasource.js
@@ -145,7 +145,7 @@ describe('named_layers datasources', function() {

                assert.equal(layers[0].type, 'cartodb');
                assert.equal(layers[0].options.sql, wadusSql);
-                assert.equal(datasource.getLayerDatasource(0), undefined);
+                assert.deepEqual(datasource.getLayerDatasource(0), {});

                done();
            }
@@ -160,7 +160,7 @@ describe('named_layers datasources', function() {

                assert.equal(layers[0].type, 'cartodb');
                assert.equal(layers[0].options.sql, wadusSql);
-                assert.equal(datasource.getLayerDatasource(0), undefined);
+                assert.deepEqual(datasource.getLayerDatasource(0), {});

                assert.equal(layers[1].type, 'cartodb');
                assert.equal(layers[1].options.sql, wadusTemplateSql);
@@ -181,7 +181,7 @@ describe('named_layers datasources', function() {

                assert.equal(layers[0].type, 'cartodb');
                assert.equal(layers[0].options.sql, wadusSql);
-                assert.equal(datasource.getLayerDatasource(0), undefined);
+                assert.deepEqual(datasource.getLayerDatasource(0), {});

                assert.equal(layers[1].type, 'mapnik');
                assert.equal(layers[1].options.sql, wadusMapnikSql);
@@ -263,7 +263,7 @@ describe('named_layers datasources', function() {

                assert.equal(layers[3].type, 'cartodb');
                assert.equal(layers[3].options.sql, wadusSql);
-                assert.equal(datasource.getLayerDatasource(3), undefined);
+                assert.deepEqual(datasource.getLayerDatasource(3), {});

                assert.equal(layers[4].type, 'cartodb');
                assert.equal(layers[4].options.sql, wadusTemplateSql);
@@ -273,7 +273,7 @@ describe('named_layers datasources', function() {

                assert.equal(layers[5].type, 'cartodb');
                assert.equal(layers[5].options.sql, wadusSql);
-                assert.equal(datasource.getLayerDatasource(5), undefined);
+                assert.deepEqual(datasource.getLayerDatasource(5), {});

                assert.equal(layers[6].type, 'mapnik');
                assert.equal(layers[6].options.sql, wadusMapnikSql);
@@ -298,6 +298,7 @@ describe('named_layers datasources', function() {
            var context = {};
            mapConfigNamedLayersAdapter.getMapConfig(username, testScenario.config, params, context,
                function(err, mapConfig) {
+                    assert.ifError(err);
                    testScenario.test(err, mapConfig.layers, context.datasource, done);
                }
            );
--- a/test/support/test-client.js
+++ b/test/support/test-client.js
@@ -307,6 +307,13 @@ TestClient.prototype.getDataview = function(dataviewName, params, callback) {
        url += '?' + qs.stringify(extraParams);
    }

+    var expectedResponse = params.response || {
+        status: 200,
+        headers: {
+            'Content-Type': 'application/json; charset=utf-8'
+        }
+    };
+
    var layergroupId;
    step(
        function createLayergroup() {
@@ -372,12 +379,7 @@ TestClient.prototype.getDataview = function(dataviewName, params, callback) {
                        host: 'localhost'
                    }
                },
-                {
-                    status: 200,
-                    headers: {
-                        'Content-Type': 'application/json; charset=utf-8'
-                    }
-                },
+                expectedResponse,
                function(res, err) {
                    if (err) {
                        return next(err);
--- a/test/unit/cartodb/ported/windshaft_server.test.js
+++ b/test/unit/cartodb/ported/windshaft_server.test.js
@@ -19,7 +19,7 @@ describe('windshaft', function() {

    it('can spawn a new server on the global listen port', function(done){
        var ws = cartodbServer(serverOptions);
-        var server = ws.listen(global.environment.windshaft_port, function() {
+        var server = ws.listen(global.environment.port, function() {
            assert.ok(ws);
            server.close(done); /* allow proper tear down */
        });
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Daniel García Aubert	59f6217c4f	Release 3.0.0	2017-03-21 15:34:47 +01:00
Daniel	0e43fbbb34	Merge pull request #635 from CartoDB/node-v6 Support Node v6 LTS and upgrade to Mapnik v3.x	2017-03-21 15:30:59 +01:00
Daniel García Aubert	1720f22247	Improve doc: 'yarn install' command is deprecated, use 'yarn' instead	2017-03-21 14:58:09 +01:00
Daniel García Aubert	3f791d25b5	Add a note about moving from npm to yarn	2017-03-17 17:58:33 +01:00
Daniel García Aubert	acd3047500	Update NEWS	2017-03-17 17:49:19 +01:00
Daniel García Aubert	7b3a4aa2a8	Update README.md	2017-03-17 17:41:20 +01:00
Daniel García Aubert	4bfaeeb44b	Update INSTALL.md	2017-03-17 17:37:35 +01:00
Daniel García Aubert	a094ae7197	Update NEWS	2017-03-17 17:30:58 +01:00
Daniel García Aubert	ef0362d118	Fix windshaft version to 3.0.0 to avoid warning message while starting the service	2017-03-17 17:21:09 +01:00
Daniel García Aubert	5a5763684d	Don't provide a npm's shrinkwrap anymore	2017-03-17 17:17:17 +01:00
Daniel García Aubert	6e575300e3	Update yarn.lock	2017-03-17 17:13:49 +01:00
Daniel García Aubert	8109fc4d46	Merge branch 'master' into node-v6	2017-03-17 17:06:58 +01:00
Daniel García Aubert	e0519e7851	Stubs next version	2017-03-17 17:06:39 +01:00
Daniel García Aubert	6334df5f5f	Merge branch 'master' into node-v6	2017-03-17 17:03:53 +01:00
Daniel García Aubert	38294d29f5	Release 2.89.0	2017-03-17 16:45:18 +01:00
Daniel	5b131cc8a7	Merge pull request #639 from CartoDB/upgrade-windshaft-to-2.8.0 Upgrade windshaft to 2.8.0	2017-03-17 16:37:07 +01:00
Daniel García Aubert	5dee654132	Upgrade windshaft to 2.8.0	2017-03-17 16:26:26 +01:00
Daniel García Aubert	d902476780	Fix assertions, now MapCofig.getLayer() return {} if layer not found	2017-03-17 11:06:40 +00:00
Ubuntu	bc5dabef3c	Revert "Fix assertions, now MapCofig.getLayer() return {} if layer not found" This reverts commit `c839a0b0a3`.	2017-03-17 11:04:50 +00:00
Daniel García Aubert	024f1e4851	Fix assertions, now MapCofig.getLayer() return {} if layer not found	2017-03-17 10:45:59 +00:00
Raul Ochoa	5f87417d9e	Merge pull request #637 from CartoDB/histogram-type-discovery Histogram column type discovery query uses non-filtered query	2017-03-17 11:03:15 +01:00
Raul Ochoa	fa94550261	Include changes for overviews implementation	2017-03-16 19:15:34 +01:00
Daniel García Aubert	11efbf034e	Drop support for Node 0.10	2017-03-16 17:18:44 +01:00
Daniel García Aubert	c839a0b0a3	Fix assertions, now MapCofig.getLayer() return {} if layer not found	2017-03-16 16:44:41 +01:00
Daniel García Aubert	420b657db8	Upgrade windshaft to 3.0.0	2017-03-16 16:42:43 +01:00
Raul Ochoa	2656a26272	Merge pull request #622 from strk/typo Trip epoch is over...	2017-03-16 16:26:53 +01:00
Raul Ochoa	992b2b6ba7	Histogram column type discovery query uses non-filtered query Pass all queries to the dataview and use the no filters one for discovering what is the column type associated to the histogram dataview.	2017-03-13 18:40:29 +01:00
Raul Ochoa	924f009390	Test for #606 : function avg(timestamp with time zone) does not exist	2017-03-13 18:36:43 +01:00
Raul Ochoa	48a1244fa0	Stubs next version	2017-03-10 11:06:47 +01:00
Raul Ochoa	8789a959e5	Release 2.88.4	2017-03-10 11:06:06 +01:00
Raul Ochoa	5765ac59cc	Merge pull request #636 from CartoDB/upgrade-camshaft Upgrades camshaft to 0.50.3	2017-03-10 11:05:30 +01:00
Raul Ochoa	3b9bf96431	Upgrades camshaft to 0.50.3	2017-03-10 10:58:07 +01:00
Daniel García Aubert	a5fe5e7052	Update shrinkwrap	2017-03-08 10:56:01 +01:00
Daniel García Aubert	0f96b5a4a5	Update yarn.lock	2017-03-08 10:24:04 +01:00
Daniel García Aubert	25babeae56	Merge branch 'node-v6-yarn' into node-v6	2017-03-07 18:01:16 +01:00
Raul Ochoa	1951e79962	Make assertions compatible	2017-03-07 13:27:13 +01:00
Daniel García Aubert	1e0e31cc1c	Merge branch 'node-v6' of github.com:CartoDB/Windshaft-cartodb into node-v6	2017-03-07 13:02:18 +01:00
Daniel García Aubert	8d35f72fcb	Back to use current assertions as grainstore implements a fallback mechanism when translates styles	2017-03-07 12:59:52 +01:00
Daniel García Aubert	5f3e515131	Back test to use '=~' operator which is now supported by carto@0.15.1-cdb-3 in windshaft	2017-03-07 12:58:06 +01:00
Raul Ochoa	49236fce86	Upgrade locked deps	2017-03-02 11:38:09 +01:00
Raul Ochoa	9d2dde7a5a	Merge branch 'node-v6' into node-v6-yarn	2017-03-02 11:07:52 +01:00
Raul Ochoa	c3e703237c	Merge remote-tracking branch 'origin/master' into node-v6	2017-03-02 11:07:43 +01:00
Mario de Frutos	8868066445	Stubs next version	2017-03-02 11:00:53 +01:00
Mario de Frutos	b446c31cbc	Other category now uses the selected aggregated function (#633 ) * Other category in category widget uses selected aggregation function Fixes https://github.com/CartoDB/Windshaft-cartodb/issues/628	2017-03-02 10:48:20 +01:00
Raul Ochoa	2d6e7070a6	Stubs next version	2017-02-23 18:12:54 +01:00
Raul Ochoa	473e0cb902	Release 2.88.2	2017-02-23 18:12:14 +01:00
Raul Ochoa	1a8fca0534	Formatting	2017-02-23 18:11:39 +01:00
Raul Ochoa	e24bc12fc9	Merge pull request #632 from CartoDB/upgrade-camshaft Upgrades camshaft to 0.50.2	2017-02-23 18:10:22 +01:00
Raul Ochoa	e77c9141ed	Upgrades camshaft to 0.50.2	2017-02-23 18:00:55 +01:00
Raul Ochoa	321157b17b	Make target to generate shrinkwrap file applying prune It removes dev dependencies from the local node_modules and avoid getting those into shrinkwrap file.	2017-02-23 17:57:52 +01:00
Raul Ochoa	6ac6574b4c	clean target to completely delete node_modules dir	2017-02-23 17:57:44 +01:00
Raul Ochoa	70ff0a9b8f	Update freezed deps	2017-02-22 19:17:00 +01:00
Raul Ochoa	15bdb57a22	Merge remote-tracking branch 'origin/node-v6' into node-v6-yarn	2017-02-22 19:02:55 +01:00
Raul Ochoa	bb54e5520c	Merge remote-tracking branch 'origin/master' into node-v6	2017-02-22 19:02:27 +01:00
Raul Ochoa	933d486a57	Merge pull request #630 from CartoDB/close-response-timer Close timer for response preparation	2017-02-22 18:46:56 +01:00
Raul Ochoa	8a1c7f5b52	Close timer for response preparation Timer for affectedTables is taking everything from response timing, adding a tag to represent all the response preparation. That way affectedTables only represents the time for retrieving the affected tables themselves.	2017-02-22 18:38:25 +01:00
Rafa de la Torre	822954be5d	Stub next version	2017-02-21 11:06:54 +01:00
Rafa de la Torre	57dc17518c	Release 2.88.1	2017-02-21 11:01:15 +01:00
Mario de Frutos	3df8d4844e	Stubs next version	2017-02-21 08:17:09 +01:00
Mario de Frutos	5a0443618f	Merge pull request #626 from CartoDB/camshaft_v050 Camshaft 0.50.0	2017-02-21 08:08:34 +01:00
Raul Ochoa	8a76cd506f	Fix issue with global Promise object	2017-02-20 18:46:48 +01:00
Mario de Frutos	50d05eae47	Version 2.88.0 Update camshaft version to 0.50.0	2017-02-20 18:46:47 +01:00
Raul Ochoa	ca41b3b600	Merge pull request #627 from CartoDB/change_release We don't announce release deploy in google groups anymore	2017-02-20 10:31:39 +01:00
Mario de Frutos	43a17ddc7d	We don't announce release deploy in google groups anymore	2017-02-17 18:01:59 +01:00
Mario de Frutos	dfa347f860	Update camshaft dependency to 0.50	2017-02-17 16:29:34 +01:00
Raul Ochoa	6033027812	Merge branch 'node-v6-shrinkwrap' into node-v6-yarn	2017-02-17 13:42:32 +01:00
Raul Ochoa	9ee6f7fbb8	Regenerate npm-shrinkwrap.json with npm@2.x	2017-02-17 13:41:58 +01:00
Raul Ochoa	60c0754800	Make assertions compatible	2017-02-17 13:36:15 +01:00
Raul Ochoa	a9251c5e71	Fix issue with global Promise object	2017-02-17 13:35:41 +01:00
Raul Ochoa	7daeddc946	Use yarn	2017-02-17 11:27:01 +01:00
Raul Ochoa	dbdb00070e	Remove artificial node-zipfile dep	2017-02-17 11:26:46 +01:00
Raul Ochoa	e5c3c282ef	Log Node.js version on startup	2017-02-10 10:03:06 +01:00
Raul Ochoa	caba79b5e2	Make target to generate shrinkwrap file applying prune It removes dev dependencies from the local node_modules and avoid getting those into shrinkwrap file.	2017-02-07 20:03:47 +01:00
Raul Ochoa	d359ea7fa6	clean target to completely delete node_modules dir	2017-02-07 19:55:37 +01:00
Raul Ochoa	c0abbe570f	Add npm-shrinkwrap.json file	2017-02-07 18:56:45 +01:00
Raul Ochoa	229a2c0c3c	Remove npm-shrinkwrap.json until we solve the issue associated to it	2017-02-07 18:50:57 +01:00
Daniel García Aubert	3f185c9c69	revert: disable cache for ci builds	2017-02-07 15:28:21 +01:00
Daniel García Aubert	f86f72ab27	disable cache for ci builds	2017-02-07 15:19:05 +01:00
Daniel García Aubert	74af17cc65	Add ubuntu toolchain for builds	2017-02-07 12:12:17 +01:00
Daniel García Aubert	aaa3e34c7f	Use gcc 4.9 for build in travis	2017-02-07 11:55:21 +01:00
Daniel García Aubert	a053f198f5	Generate shrinkwrap	2017-02-07 11:45:48 +01:00
Daniel García Aubert	852ba68895	Upgrade redis in dev-dependency	2017-02-07 11:44:53 +01:00
Daniel García Aubert	1b22d176d6	Merge branch 'master' into node-v6	2017-02-06 19:03:16 +01:00
Daniel García Aubert	0ccbedf551	Use updated branch of windshaft	2017-02-06 18:25:32 +01:00
Raul Ochoa	28f1179336	Stubs next version	2017-02-02 16:44:41 +01:00
Raul Ochoa	de4d9e285e	Release 2.87.5	2017-02-02 16:43:43 +01:00
Raul Ochoa	e0faaac822	Update news	2017-02-02 16:43:04 +01:00
Raul Ochoa	c84f27dd3f	Merge pull request #623 from CartoDB/fix-dataviews-override-params-casting Cast all dataview overrides values to Number	2017-02-02 16:42:48 +01:00
Raul Ochoa	12279d5c00	Cast dataview override values to Number or throw error We were letting params expected as Numbers to be passed as any type when they were not Numbers.	2017-02-02 16:20:16 +01:00
Raul Ochoa	281588abd2	Add test to validate `bins` param is casted as Number	2017-02-02 16:12:49 +01:00
Sandro Santilli	7e206b84aa	Fix typo	2017-01-31 13:16:36 +01:00
Mario de Frutos	f69f999694	Fixed contributing link	2017-01-25 10:43:24 +01:00
Daniel García Aubert	c0c062592f	Stubs next version	2017-01-20 11:40:00 +01:00
Daniel García Aubert	06885e2ba3	Release 2.87.4	2017-01-20 11:32:11 +01:00
Daniel	89a268d087	Merge pull request #617 from CartoDB/497-null-category Be able to not compute NULL categories and null values	2017-01-20 11:26:12 +01:00
Daniel García Aubert	34424e713c	Test on Node v6	2017-01-19 12:42:53 +01:00
Daniel García Aubert	89f381439f	Pass test	2017-01-19 12:24:04 +01:00
Daniel García Aubert	6a80be9df3	Update windshaft dependency	2017-01-19 12:23:43 +01:00
Daniel García Aubert	fde1923acb	Removed invalid selector	2017-01-19 11:31:55 +01:00
Daniel García Aubert	d486e1d34f	Use released version of camshaft that supports node v6	2017-01-18 14:43:02 +01:00
csobier	3648b8b0b1	removed "default" from descriptions As per a customer Support inquiry, I removed "default" from the Static Maps Limits section, as it was confusing to the user that it implied	2017-01-17 11:21:23 -05:00
Daniel García Aubert	83301238d2	Port changes to overviews	2017-01-17 17:10:08 +01:00
Daniel García Aubert	a4a1fb930a	Be able to not compute NULL categories and null values wheter aggregation operation is not 'count'	2017-01-17 17:09:17 +01:00
Daniel García Aubert	6555353e0e	Improve test to handle NULL values in category and aggregation columns using any operation	2017-01-16 19:23:08 +01:00
Daniel García Aubert	f5f0601e53	Add test to check if NULL category count values properly	2017-01-16 17:00:28 +01:00
Raul Ochoa	2598595e42	Merge pull request #614 from CartoDB/zipfile-cartodb Use zipfile from cartodb	2016-12-23 14:47:40 +01:00
Raul Ochoa	49b78a85c9	Use zipfile from cartodb Adding it as dependency in combination with loose definition in millstone makes it to use the top level defined dependency.	2016-12-22 19:12:30 +01:00
Daniel García Aubert	35b12ebd6c	Test unused directive just for mapnik 2.3.x	2016-12-19 17:29:24 +01:00
Javier Goizueta	0918c8e68c	Stub next version	2016-12-19 17:20:18 +01:00
Javier Goizueta	1603a07de1	Release 2.87.3	2016-12-19 17:13:12 +01:00
Javier Goizueta	0a37aa4ba1	Merge pull request #604 from CartoDB/fix-overviews-dataviews Fixes for dataviews using overviews	2016-12-19 16:55:13 +01:00
Javier Goizueta	b721a80fcc	Merge branch 'master' into fix-overviews-dataviews	2016-12-19 16:45:28 +01:00
Rafa de la Torre	01365d035e	Stub version 2.87.3	2016-12-19 16:38:27 +01:00
Rafa de la Torre	a4f059e20f	Merge pull request #605 from CartoDB/update-camshaft-0.48.5 Update camshaft to 0.48.5	2016-12-19 16:33:27 +01:00
Daniel García Aubert	eb758bbf36	Use a valid port from env	2016-12-19 16:19:41 +01:00
Daniel García Aubert	bc2441e66a	Use a valid port	2016-12-19 16:17:41 +01:00
Daniel García Aubert	7c1792bbd2	Test regression and unused directives only for mapnik ~2.3.x	2016-12-19 16:16:50 +01:00
Daniel García Aubert	2fdbc3e61c	Fix error message in assertion	2016-12-19 16:15:07 +01:00
Daniel García Aubert	2ace705122	Fix error message in assertion	2016-12-19 16:13:55 +01:00
Daniel García Aubert	4b817062d8	Bump version of dependencies to be Node v6 compatible	2016-12-19 16:12:57 +01:00
Rafa de la Torre	79c35118d7	Update camshaft to 0.48.5 Use exception safe Dataservices API functions. See https://github.com/CartoDB/dataservices-api/issues/314 and https://github.com/CartoDB/camshaft/issues/242	2016-12-19 15:52:25 +01:00
Javier Goizueta	6a4f5d52ec	Don't use overviews for date histograms	2016-12-16 17:51:36 +01:00
Javier Goizueta	ccaae2dd66	Remove spurious parameter from overviews dataviews functions In the overviews-specialized dataview classes the sql-generating functions had an unneeded parameter filters. In some cases, since this parameter was not being paaased from the base dataviews class it was masking the override parameter.	2016-12-16 17:37:05 +01:00
Raul Ochoa	d335e64f88	Stubs next version	2016-12-13 14:16:49 +01:00
Raul Ochoa	177d7ed07a	Release 2.87.1	2016-12-13 14:15:50 +01:00
Raul Ochoa	85a1e15b58	Merge pull request #603 from CartoDB/upgrade-deps Upgrade windshaft and request deps	2016-12-13 14:15:04 +01:00
Raul Ochoa	432b58a078	Upgrade windshaft and request deps	2016-12-13 14:10:42 +01:00
xavijam	75e3c5daef	Ready for next release	2016-12-13 10:43:16 +01:00
Raul Ochoa	deb71c27b0	Merge pull request #601 from CartoDB/update-turbocarto Update turbocarto package version	2016-12-12 18:56:54 +01:00
Raul Ochoa	8f5e1de6d8	Merge branch 'master' into update-turbocarto	2016-12-12 18:51:04 +01:00
Raul Ochoa	4836d62d7a	Merge pull request #602 from CartoDB/travis-improvements Travis improvements	2016-12-12 18:50:39 +01:00
Raul Ochoa	d27b0617b2	Remove comments	2016-12-12 18:44:25 +01:00
Raul Ochoa	28a2c29a39	Attempt to use postgis 2.3	2016-12-12 18:39:57 +01:00
Raul Ochoa	fcb6478407	Attempt to use postgis 2.2	2016-12-12 18:33:19 +01:00
Raul Ochoa	6d72afe40e	Test sudoless travis	2016-12-12 17:30:14 +01:00
Raul Ochoa	e775266c64	Remove notifications	2016-12-12 17:29:32 +01:00
xavijam	12f25b38c0	Updated news	2016-12-12 17:03:56 +01:00
xavijam	c67a1107cb	Package version updated with turbo-carto cahnges	2016-12-12 17:02:31 +01:00
xavijam	34bfb0d62c	Updated news	2016-12-12 17:02:15 +01:00
Javier Goizueta	ede45cad1f	Stub next version	2016-12-02 15:25:52 +01:00
Javier Goizueta	75fe4c8aed	Release 2.86.1	2016-12-02 15:19:29 +01:00
Javier Goizueta	12e272a7e5	Merge pull request #599 from CartoDB/597-overviews-sql_wrap Queries with sql_wrap should not be rewritten	2016-12-02 15:07:59 +01:00
Javier Goizueta	cfcba4e578	Wueries with sql_wrap should not be rewritten	2016-12-02 14:00:21 +01:00
Raul Ochoa	37ab898426	Stubs next version	2016-12-02 10:43:00 +01:00
Raul Ochoa	68865ea929	Release 2.86.0	2016-12-02 10:41:23 +01:00
Raul Ochoa	86674faa22	Update news and bump version	2016-12-02 10:41:02 +01:00
Raul Ochoa	f07947ce45	Merge pull request #597 from CartoDB/upgrade-windshaft Upgrade windshaft	2016-12-02 10:32:44 +01:00
Raul Ochoa	6a50f59e25	Regenerate npm-shrinkwrap.json	2016-12-01 17:13:32 +01:00
Raul Ochoa	bfacd56800	Allow to use workers for transforming cartocss into mapnik XML	2016-12-01 17:02:40 +01:00
Raul Ochoa	45dea8b0c1	Stubs next version	2016-11-30 11:09:18 +01:00
Raul Ochoa	2f7f8cf2d8	Release 2.85.1	2016-11-30 11:07:29 +01:00
Raul Ochoa	31611b6a28	Upgrades camshaft to 0.48.4	2016-11-30 10:59:44 +01:00
Raul Ochoa	d1cd4b0c2b	Stubs next version	2016-11-24 16:15:47 +01:00
Raul Ochoa	c8ba1c3e7c	Release 2.85.0	2016-11-24 16:14:48 +01:00
Raul Ochoa	fbc8fe4c2d	Update news and bump version	2016-11-24 16:11:08 +01:00
Raul Ochoa	54ec9b48db	Ignore vscode settings dir	2016-11-24 15:41:09 +01:00
Raul Ochoa	488698d5e2	Merge pull request #594 from CartoDB/resources-url-templates Allow to set resource URL templates with substitution tokens	2016-11-24 15:37:23 +01:00
Raul Ochoa	58c407aabb	Alternative development example configuration for user in path instead of host	2016-11-24 12:57:45 +01:00
Raul Ochoa	fe750f23bc	Closer to reality production example configuration	2016-11-24 12:56:38 +01:00
Raul Ochoa	87a01a5cfd	Example configuration with just HTTP	2016-11-24 12:56:02 +01:00
Javier Goizueta	74dd669bb0	Stub next version	2016-11-23 15:29:50 +01:00
Javier Goizueta	36a50389f5	Release 2.84.2	2016-11-23 15:09:24 +01:00
Javier Goizueta	4f2d7434c7	Merge pull request #596 from CartoDB/upgrade-camshaft-to-0.48.3 Upgrade Camshaft version to 0.48.3	2016-11-23 15:05:43 +01:00
Javier Goizueta	b0a0848476	Upgrade Camshaft version to 0.48.3	2016-11-23 13:17:16 +01:00
Javier Goizueta	9fcd897e54	Stub next version	2016-11-23 11:57:05 +01:00
Javier Goizueta	daa8fff21e	Release 2.84.1	2016-11-23 11:53:37 +01:00
Javier Goizueta	785229ddea	Merge pull request #595 from CartoDB/upgrade-camshaft-to-0.48.2 Upgrade camshaft version to 0.48.2	2016-11-23 11:50:45 +01:00
Javier Goizueta	8bb11bf1d4	Upgrade camshaft version to 0.48.2	2016-11-23 11:36:38 +01:00
Raul Ochoa	1f975e15c1	Default to empty object for cdn URLs	2016-11-22 17:01:34 +01:00
Raul Ochoa	6c69ba54db	Use actual CDN url for HTTP and HTTPS	2016-11-22 16:44:06 +01:00
Raul Ochoa	49f9904d00	Allow to set resource URL templates with substitution tokens	2016-11-22 16:41:31 +01:00
Raul Ochoa	7afd0dfa4e	Remove prototype reference	2016-11-22 13:38:56 +01:00
Raul Ochoa	b1b6a437a7	Merge pull request #593 from CartoDB/592-doc-preview-layers Fix DOC for named map and preview layers	2016-11-22 12:52:24 +01:00
Daniel García Aubert	e4d5006591	Merge branch 'master' into 592-doc-preview-layers	2016-11-22 11:06:18 +01:00
Daniel García Aubert	627b3771d3	Fix doc for layer preview	2016-11-22 11:04:38 +01:00
Raul Ochoa	f4758e84e8	Stubs next version	2016-11-11 16:17:20 +01:00
Raul Ochoa	8dfe2098ed	Release 2.84.0	2016-11-11 16:16:21 +01:00
Raul Ochoa	c56a4ee036	Update news and bump version	2016-11-11 16:15:59 +01:00
Raul Ochoa	c32623b821	Stubs next version	2016-11-11 16:15:08 +01:00
Raul Ochoa	3cd0a947f7	Merge pull request #586 from CartoDB/docs-switch-to-builder switched gui tool from editor to builder	2016-11-11 12:52:38 +01:00
Raul Ochoa	8eea1cf4e7	Merge pull request #590 from CartoDB/analyses-limits-configuration Analyses limit configuration allows to set other limits than timeout	2016-11-11 12:52:21 +01:00
Javier Goizueta	b5fccd5bbe	Merge pull request #589 from CartoDB/upgrade-camshaft-to-0.48.1 Release 2.83.1	2016-11-10 18:48:14 +01:00
Raul Ochoa	e74ce9dfd8	Analyses limit configuration allows to set other limits than timeout Configuration is now defined as a dictionary instead of just timeouts per analysis type	2016-11-10 18:41:59 +01:00
Javier Goizueta	3743365a83	Release 2.83.1 Upgrade camshaft to 0.48.1	2016-11-10 18:16:42 +01:00
csobier	94f420ca3f	switched gui tool from editor to builder	2016-11-02 09:34:55 -04:00