Update Windshaft to 4.5.2

Release 5.3.0
Merge pull request #866 from CartoDB/update-camshaft-to-0.61.2
2018-02-12 12:19:36 +01:00 · 2018-02-12 12:03:02 +01:00 · 2018-02-12 11:56:31 +01:00 · 2018-02-12 11:35:46 +01:00 · 2018-02-08 17:00:13 +01:00 · 2018-02-06 16:48:22 +01:00
11 changed files with 224 additions and 150 deletions
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,7 +1,36 @@
 # Changelog

+## 5.3.0
+Released 2018-02-12
+ - Upgrades redis-mpool to 0.5.0
+ - Upgrades windshaft to 4.5.2
+ - Upgrades cartodb-redis to 0.15.0
+ - Adds metrics option to the Mapnik renderer
+ - Upgrades camshadft to 0.61.2
+
+## 5.2.1
+Released 2018-02-01
+
+Bug Fixes:
+- Allow use of aggregation with attributes #861
+
+## 5.2.0
+Released 2018-02-01
+
+Announcements:
+ - Upgrade windshaft to [4.3.3](https://github.com/CartoDB/windshaft/releases/tag/4.3.2) adding support for cache-features' in Mapnik/CartoDB layers.
+
+## 5.1.0
+Released 2018-01-30
+New features:
+ - Now mapnik has support for fine-grained metrics.
+ - Variables can be passed for later substitution in postgis datasource.
+
+Announcements:
+ - Upgrade windshaft to [4.3.1](https://github.com/CartoDB/windshaft/releases/tag/4.3.1). Underneath it upgrades mapnik and all the related dependencies.
+
 ## 5.0.1
-Released 2018-01-20
+Released 2018-01-29

 Bug Fixes:
 - Allow aggregation for queries with no the_geom (only the_geom_webmercator) #856
--- a/config/environments/development.js.example
+++ b/config/environments/development.js.example
@@ -204,8 +204,13 @@ var config = {
              // which cost is no more expensive than snapping and results are
              // much closer to the original geometry
              removeRepeatedPoints: false // this requires postgis >=2.2
-          }
+          },
+          // If enabled Mapnik will reuse the features retrieved from the database
+          // instead of requesting them once per style inside a layer
+          'cache-features': true,

+          // Require metrics to the renderer
+          metrics: false
      },
      http: {
          timeout: 2000, // the timeout in ms for a http tile request
--- a/config/environments/production.js.example
+++ b/config/environments/production.js.example
@@ -198,7 +198,14 @@ var config = {
              // which cost is no more expensive than snapping and results are
              // much closer to the original geometry
              removeRepeatedPoints: false // this requires postgis >=2.2
-          }
+          },
+
+          // If enabled Mapnik will reuse the features retrieved from the database
+          // instead of requesting them once per style inside a layer
+          'cache-features': true,
+
+          // Require metrics to the renderer
+          metrics: false

      },
      http: {
--- a/config/environments/staging.js.example
+++ b/config/environments/staging.js.example
@@ -198,7 +198,14 @@ var config = {
              // which cost is no more expensive than snapping and results are
              // much closer to the original geometry
              removeRepeatedPoints: false // this requires postgis >=2.2
-          }
+          },
+
+          // If enabled Mapnik will reuse the features retrieved from the database
+          // instead of requesting them once per style inside a layer
+          'cache-features': true,
+
+          // Require metrics to the renderer
+          metrics: false

      },
      http: {
--- a/config/environments/test.js.example
+++ b/config/environments/test.js.example
@@ -197,7 +197,14 @@ var config = {
              // which cost is no more expensive than snapping and results are
              // much closer to the original geometry
              removeRepeatedPoints: false // this requires postgis >=2.2
-          }
+          },
+
+          // If enabled Mapnik will reuse the features retrieved from the database
+          // instead of requesting them once per style inside a layer
+          'cache-features': true,
+
+          // Require metrics to the renderer
+          metrics: false
      },
      http: {
          timeout: 2000, // the timeout in ms for a http tile request
--- a/lib/cartodb/models/aggregation/aggregation-query.js
+++ b/lib/cartodb/models/aggregation/aggregation-query.js
@@ -131,7 +131,12 @@ const dimensionDefs = ctx => {
 // This is equivalent to `${256/ctx.res}*CDB_XYZ_Resolution(CDB_ZoomFromScale(!scale_denominator!))`
 // This is defined by the ctx.res parameter, which is the number of grid cells per tile linear dimension
 // (i.e. each tile is divided into ctx.res*ctx.res cells).
-const gridResolution = ctx => `(${256*0.00028/ctx.res}*!scale_denominator!)::double precision`;
+// We limit the the minimum resolution to avoid division by zero problems. The limit used is
+// the pixel size of zoom level 30 (i.e. 1/2*(30+8) of the full earth web-mercator extent), which is about 0.15 mm.
+const gridResolution = ctx => {
+    const minimumResolution = 2*Math.PI*6378137/Math.pow(2,38);
+    return `GREATEST(${256*0.00028/ctx.res}*!scale_denominator!, ${minimumResolution})::double precision`;
+};

 // Notes:
 // * We need to filter spatially using !bbox! to make the queries efficient because
--- a/lib/cartodb/server_options.js
+++ b/lib/cartodb/server_options.js
@@ -15,6 +15,7 @@ var rendererConfig = _.defaults(global.environment.renderer || {}, {
        bufferSize: 64,
        snapToGrid: false,
        clipByBox2d: false,
+        metrics: false,
        limits: {}
    },
    http: {}
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "windshaft-cartodb",
-  "version": "5.0.1",
+  "version": "5.3.0",
  "description": "A map tile server for CartoDB",
  "keywords": [
    "cartodb"
@@ -25,10 +25,10 @@
  ],
  "dependencies": {
    "body-parser": "^1.18.2",
-    "camshaft": "0.60.0",
+    "camshaft": "0.61.2",
    "cartodb-psql": "0.10.2",
    "cartodb-query-tables": "0.3.0",
-    "cartodb-redis": "0.14.0",
+    "cartodb-redis": "0.15.0",
    "debug": "^3.1.0",
    "dot": "~1.0.2",
    "express": "~4.16.0",
@@ -40,14 +40,14 @@
    "node-statsd": "~0.0.7",
    "on-headers": "^1.0.1",
    "queue-async": "~1.0.7",
-    "redis-mpool": "0.4.1",
+    "redis-mpool": "0.5.0",
    "request": "^2.83.0",
    "semver": "~5.3.0",
    "step": "~0.0.6",
    "step-profiler": "~0.3.0",
    "turbo-carto": "0.20.2",
    "underscore": "~1.6.0",
-    "windshaft": "4.2.0",
+    "windshaft": "4.5.2",
    "yargs": "~5.0.0"
  },
  "devDependencies": {
@@ -56,7 +56,7 @@
    "mocha": "~3.4.1",
    "moment": "~2.18.1",
    "nock": "~2.11.0",
-    "redis": "~0.12.1",
+    "redis": "2.8.0",
    "strftime": "~0.8.2"
  },
  "scripts": {
--- a/test/acceptance/aggregation.js
+++ b/test/acceptance/aggregation.js
@@ -1438,6 +1438,43 @@ describe('aggregation', function () {
                    done();
                });
            });
+
+            it('aggregation should work with attributes', function (done) {
+                this.mapConfig = createVectorMapConfig([
+                    {
+                        type: 'cartodb',
+                        options: {
+                            sql: POINTS_SQL_1,
+                            cartocss: '#layer { marker-width: 7; }',
+                            cartocss_version: '2.3.0',
+                            aggregation: {
+                                threshold: 1
+                            },
+                            attributes: {
+                                id: 'cartodb_id',
+                                columns: [
+                                    'value'
+                                ]
+                            }
+                        }
+                    }
+                ]);
+                this.testClient = new TestClient(this.mapConfig);
+
+                this.testClient.getLayergroup((err, body) => {
+                    if (err) {
+                        return done(err);
+                    }
+
+                    assert.equal(typeof body.metadata, 'object');
+                    assert.ok(Array.isArray(body.metadata.layers));
+
+                    body.metadata.layers.forEach(layer => assert.ok(layer.meta.aggregation.mvt));
+                    body.metadata.layers.forEach(layer => assert.ok(layer.meta.aggregation.png));
+
+                    done();
+                });
+            });
        });
    });
 });
--- a/test/acceptance/ported/support/ported_server_options.js
+++ b/test/acceptance/ported/support/ported_server_options.js
@@ -27,6 +27,7 @@ module.exports = _.extend({}, serverOptions, {
            snapToGrid: false,
            clipByBox2d: false, // this requires postgis >=2.2 and geos >=3.5
            scale_factors: [1, 2],
+            metrics: false,
            limits: {
                render: 0,
                cacheOnTimeout: true
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,19 +2,36 @@
 # yarn lockfile v1


-abaculus@cartodb/abaculus#2.0.3-cdb1:
-  version "2.0.3-cdb1"
-  resolved "https://codeload.github.com/cartodb/abaculus/tar.gz/f5f34e1c80cdd8d49edd1d6fe3b2220ab2e23aaf"
+"@carto/mapnik@3.6.2-carto.2", "@carto/mapnik@~3.6.2-carto.0":
+  version "3.6.2-carto.2"
+  resolved "https://registry.yarnpkg.com/@carto/mapnik/-/mapnik-3.6.2-carto.2.tgz#45a055fd2d39530a873ef9ce5a325baacc81c196"
  dependencies:
+    mapnik-vector-tile "1.5.0"
+    nan "~2.7.0"
+    node-pre-gyp "~0.6.30"
+    protozero "1.5.1"
+
+"@carto/tilelive-bridge@cartodb/tilelive-bridge#2.5.1-cdb1":
+  version "2.5.1-cdb1"
+  resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/b0b5559f948e77b337bc9a9ae0bf6ec4249fba21"
+  dependencies:
+    "@carto/mapnik" "~3.6.2-carto.0"
+    "@mapbox/sphericalmercator" "~1.0.1"
+    mapnik-pool "~0.1.3"
+
+"@mapbox/sphericalmercator@~1.0.1":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@mapbox/sphericalmercator/-/sphericalmercator-1.0.5.tgz#70237b9774095ed1cfdbcea7a8fd1fc82b2691f2"
+
+abaculus@cartodb/abaculus#2.0.3-cdb2:
+  version "2.0.3-cdb2"
+  resolved "https://codeload.github.com/cartodb/abaculus/tar.gz/6468e0e3fddb2b23f60b9a3156117cff0307f6dc"
+  dependencies:
+    "@carto/mapnik" "~3.6.2-carto.0"
    d3-queue "^2.0.2"
-    mapnik "~3.5.0"
    sphericalmercator "1.0.x"

-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-
-abbrev@1.0.x:
+abbrev@1, abbrev@1.0.x:
  version "1.0.9"
  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"

@@ -95,8 +112,8 @@ assert-plus@^0.2.0:
  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"

 assertion-error@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"

 async@1.x, async@^1.4.0, async@^1.5.2:
  version "1.5.2"
@@ -215,9 +232,9 @@ camelcase@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"

-camshaft@0.60.0:
-  version "0.60.0"
-  resolved "https://registry.yarnpkg.com/camshaft/-/camshaft-0.60.0.tgz#0433b5a576e08cabbc9bae1e1b22305274b8b7b6"
+camshaft@0.61.2:
+  version "0.61.2"
+  resolved "https://registry.yarnpkg.com/camshaft/-/camshaft-0.61.2.tgz#5c0d43ca769377c6cfb9808f1023d20ea3df55b3"
  dependencies:
    async "^1.5.2"
    bunyan "1.8.1"
@@ -244,9 +261,9 @@ carto@0.16.3:
    semver "^5.1.0"
    yargs "^4.2.0"

-"carto@github:cartodb/carto#0.15.1-cdb1":
+carto@CartoDB/carto#0.15.1-cdb1:
  version "0.15.1-cdb1"
-  resolved "https://codeload.github.com/cartodb/carto/tar.gz/8050ec843f1f32a6469e5d1cf49602773015d398"
+  resolved "https://codeload.github.com/CartoDB/carto/tar.gz/8050ec843f1f32a6469e5d1cf49602773015d398"
  dependencies:
    mapnik-reference "~6.0.2"
    optimist "~0.6.0"
@@ -278,12 +295,12 @@ cartodb-query-tables@0.3.0:
  version "0.3.0"
  resolved "https://registry.yarnpkg.com/cartodb-query-tables/-/cartodb-query-tables-0.3.0.tgz#56e18d869666eb2e8e2cb57d0baf3acc923f8756"

-cartodb-redis@0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/cartodb-redis/-/cartodb-redis-0.14.0.tgz#6f82fdb3e5b7c8005dbaccd6172c1706c4378df2"
+cartodb-redis@0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/cartodb-redis/-/cartodb-redis-0.15.0.tgz#509ab9f62b8cae0838bcb8db1cb9d6355704ace3"
  dependencies:
    dot "~1.0.2"
-    redis-mpool "~0.4.1"
+    redis-mpool "^0.5.0"
    underscore "~1.6.0"

 caseless@~0.12.0:
@@ -480,10 +497,14 @@ delegates@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"

-depd@1.1.1, depd@~1.1.1:
+depd@1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"

+depd@~1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+
 destroy@~1.0.4:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
@@ -524,14 +545,14 @@ domutils@1.5:
    dom-serializer "0"
    domelementtype "1"

-dot@^1.0.3:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/dot/-/dot-1.1.2.tgz#c7377019fc4e550798928b2b9afeb66abfa1f2f9"
-
-dot@~1.0.2:
+dot@^1.0.3, dot@~1.0.2:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/dot/-/dot-1.0.3.tgz#f8750bfb6b03c7664eb0e6cb1eb4c66419af9427"

+double-ended-queue@^2.1.0-0:
+  version "2.1.0-0"
+  resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
+
 dtrace-provider@~0.6:
  version "0.6.0"
  resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.6.0.tgz#0b078d5517937d873101452d9146737557b75e51"
@@ -549,8 +570,8 @@ ee-first@1.1.1:
  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"

 encodeurl@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"

 entities@1.0:
  version "1.0.0"
@@ -652,14 +673,10 @@ extend@~3.0.0, extend@~3.0.1:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"

-extsprintf@1.3.0:
+extsprintf@1.3.0, extsprintf@^1.2.0:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"

-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-
 fast-deep-equal@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
@@ -766,7 +783,7 @@ gdal@~0.9.2:
    nan "~2.6.2"
    node-pre-gyp "~0.6.36"

-generic-pool@2.4.3:
+generic-pool@2.4.3, generic-pool@~2.4.0, generic-pool@~2.4.1:
  version "2.4.3"
  resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.3.tgz#780c36f69dfad05a5a045dd37be7adca11a4f6ff"

@@ -778,10 +795,6 @@ generic-pool@~2.2.0, generic-pool@~2.2.1:
  version "2.2.2"
  resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.2.2.tgz#7a89f491d575b42f9f069a0e8e2c6dbaa3c241be"

-generic-pool@~2.4.0, generic-pool@~2.4.1:
-  version "2.4.6"
-  resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.6.tgz#f1b55e572167dba2fe75d5aa91ebb1e9f72642d7"
-
 get-caller-file@^1.0.1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
@@ -823,7 +836,7 @@ glob@^6.0.1:
    once "^1.3.0"
    path-is-absolute "^1.0.0"

-glob@^7.0.5, glob@^7.1.1:
+glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
  version "7.1.2"
  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
  dependencies:
@@ -842,9 +855,9 @@ graceful-fs@^4.1.2:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"

-grainstore@~1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/grainstore/-/grainstore-1.8.0.tgz#9398729df88f3aecb55ffbb415d541dcca4420af"
+grainstore@1.8.2:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/grainstore/-/grainstore-1.8.2.tgz#79dd7a91a098bf8b0ea3189961775c8cc7474319"
  dependencies:
    carto "0.16.3"
    debug "~3.1.0"
@@ -1073,8 +1086,8 @@ istanbul@~0.4.3:
    wordwrap "^1.0.0"

 js-base64@^2.1.9:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.0.tgz#9e566fee624751a1d720c966cd6226d29d4025aa"
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582"

 js-string-escape@1.0.1:
  version "1.0.1"
@@ -1232,8 +1245,8 @@ lodash@3.7.x:
  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.7.0.tgz#3678bd8ab995057c07ade836ed2ef087da811d45"

 lodash@^4.5.1:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+  version "4.17.5"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"

 log4js@cartodb/log4js-node#cdb:
  version "0.6.25"
@@ -1273,18 +1286,9 @@ mapnik-reference@~8.5.3:
  dependencies:
    semver "^5.1.0"

-mapnik-vector-tile@~1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/mapnik-vector-tile/-/mapnik-vector-tile-1.2.2.tgz#42795ca211dd274a9a4af5bf6cfe3b0bfe0ba243"
-
-mapnik@3.5.14, mapnik@~3.5.0:
-  version "3.5.14"
-  resolved "https://registry.yarnpkg.com/mapnik/-/mapnik-3.5.14.tgz#632bd6635c72c0214a707549309ba416594afff7"
-  dependencies:
-    mapnik-vector-tile "~1.2.2"
-    nan "~2.4.0"
-    node-pre-gyp "~0.6.30"
-    protozero "~1.4.2"
+mapnik-vector-tile@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/mapnik-vector-tile/-/mapnik-vector-tile-1.5.0.tgz#c647bfb8027e9dc40db583505a436f35e2101407"

 media-typer@0.3.0:
  version "0.3.0"
@@ -1331,9 +1335,9 @@ mime@~1.2.11:
  version "1.2.11"
  resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"

-mime@~1.3.4:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
+mime@~1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"

 "minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
  version "3.0.4"
@@ -1341,7 +1345,7 @@ mime@~1.3.4:
  dependencies:
    brace-expansion "^1.1.7"

-minimist@0.0.8:
+minimist@0.0.8, minimist@~0.0.1:
  version "0.0.8"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"

@@ -1349,10 +1353,6 @@ minimist@^1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"

-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-
 minimist@~0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.0.tgz#4dffe525dae2b864c66c2e23c6271d7afdecefce"
@@ -1379,11 +1379,7 @@ mocha@~3.4.1:
    mkdirp "0.5.1"
    supports-color "3.1.2"

-moment@^2.10.6:
-  version "2.20.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"
-
-moment@~2.18.1:
+moment@^2.10.6, moment@~2.18.1:
  version "2.18.1"
  resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"

@@ -1497,14 +1493,10 @@ oauth-sign@~0.8.1, oauth-sign@~0.8.2:
  version "0.8.2"
  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"

-object-assign@4.1.0:
+object-assign@4.1.0, object-assign@^4.1.0:
  version "4.1.0"
  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"

-object-assign@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-
 object-keys@~0.4.0:
  version "0.4.0"
  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336"
@@ -1737,9 +1729,9 @@ propagate@0.3.x:
  version "0.3.1"
  resolved "https://registry.yarnpkg.com/propagate/-/propagate-0.3.1.tgz#e3a84404a7ece820dd6bbea9f6d924e3135ae09c"

-protozero@~1.4.2:
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/protozero/-/protozero-1.4.5.tgz#80eaa80a4f9c751465c4cb2620d8233b50ec1aff"
+protozero@1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/protozero/-/protozero-1.5.1.tgz#5a27df6fb6e1ed743f510812ae76c082f5b16638"

 proxy-addr@~2.0.2:
  version "2.0.2"
@@ -1778,8 +1770,8 @@ raw-body@2.3.2:
    unpipe "1.0.0"

 rc@^1.1.7:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.2.tgz#d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077"
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.5.tgz#275cd687f6e3b36cc756baa26dfee80a790301fd"
  dependencies:
    deep-extend "~0.4.0"
    ini "~1.3.0"
@@ -1801,7 +1793,7 @@ read-pkg@^1.0.0:
    normalize-package-data "^2.3.2"
    path-type "^1.0.0"

-readable-stream@1.1:
+readable-stream@1.1, readable-stream@~1.1.9:
  version "1.1.13"
  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.13.tgz#f6eef764f514c89e2b9e23146a75ba106756d23e"
  dependencies:
@@ -1831,27 +1823,30 @@ readable-stream@~1.0.2:
    isarray "0.0.1"
    string_decoder "~0.10.x"

-readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
+redis-commands@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.3.1.tgz#81d826f45fa9c8b2011f4cd7a0fe597d241d442b"

-redis-mpool@0.4.1, redis-mpool@~0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/redis-mpool/-/redis-mpool-0.4.1.tgz#d917c0a4ed57a1291a9c6eb35434e6c0b7046f80"
+redis-mpool@0.5.0, redis-mpool@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/redis-mpool/-/redis-mpool-0.5.0.tgz#9a22dcffb4ad796ec88ce3038b991deae9d1fda7"
  dependencies:
    generic-pool "~2.1.1"
    hiredis "~0.5.0"
-    redis "~0.12.1"
+    redis "^2.8.0"
    underscore "~1.6.0"

-redis@~0.12.1:
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/redis/-/redis-0.12.1.tgz#64df76ad0fc8acebaebd2a0645e8a48fac49185e"
+redis-parser@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-2.6.0.tgz#52ed09dacac108f1a631c07e9b69941e7a19504b"
+
+redis@2.8.0, redis@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/redis/-/redis-2.8.0.tgz#202288e3f58c49f6079d97af7a10e1303ae14b02"
+  dependencies:
+    double-ended-queue "^2.1.0-0"
+    redis-commands "^1.2.0"
+    redis-parser "^2.6.0"

 repeat-string@^1.5.2:
  version "1.6.1"
@@ -1949,9 +1944,9 @@ safe-json-stringify@~1:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz#81a098f447e4bbc3ff3312a243521bc060ef5911"

-"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
+"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0, semver@~5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"

 semver@4.3.2:
  version "4.3.2"
@@ -1965,10 +1960,6 @@ semver@~5.0.3:
  version "5.0.3"
  resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a"

-semver@~5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-
 send@0.16.1:
  version "0.16.1"
  resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3"
@@ -2066,14 +2057,10 @@ speedometer@~0.1.2:
  version "0.1.4"
  resolved "https://registry.yarnpkg.com/speedometer/-/speedometer-0.1.4.tgz#9876dbd2a169d3115402d48e6ea6329c8816a50d"

-sphericalmercator@1.0.4:
+sphericalmercator@1.0.4, sphericalmercator@1.0.x, sphericalmercator@~1.0.1, sphericalmercator@~1.0.4:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/sphericalmercator/-/sphericalmercator-1.0.4.tgz#baad4e34187f06e87f2e92fc1280199fa1b01d4e"

-sphericalmercator@1.0.x, sphericalmercator@~1.0.1, sphericalmercator@~1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/sphericalmercator/-/sphericalmercator-1.0.5.tgz#ddc5a049e360e000d0fad9fc22c4071882584980"
-
 split@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
@@ -2111,11 +2098,7 @@ sshpk@^1.7.0:
    jsbn "~0.1.0"
    tweetnacl "~0.14.0"

-"statuses@>= 1.3.1 < 2":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
-
-statuses@~1.3.1:
+"statuses@>= 1.3.1 < 2", statuses@~1.3.1:
  version "1.3.1"
  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"

@@ -2223,21 +2206,13 @@ through@2:
  version "2.3.8"
  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"

-tilelive-bridge@cartodb/tilelive-bridge#2.3.1-cdb4:
-  version "2.3.1-cdb4"
-  resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/faa2b638da2d119b78281575d40255cb523f6ca6"
-  dependencies:
-    mapnik "~3.5.0"
-    mapnik-pool "~0.1.3"
-    sphericalmercator "1.0.x"
-
-tilelive-mapnik@cartodb/tilelive-mapnik#0.6.18-cdb3:
-  version "0.6.18-cdb3"
-  resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/23bd1c31dd57d0b76c86b9f1eaf62462b3c17d01"
+tilelive-mapnik@cartodb/tilelive-mapnik#0.6.18-cdb5:
+  version "0.6.18-cdb5"
+  resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/cec846025e60837c60af193d600d972917ea8d35"
  dependencies:
+    "@carto/mapnik" "~3.6.2-carto.0"
    generic-pool "~2.4.0"
-    mapnik "3.5.14"
-    mime "~1.3.4"
+    mime "~1.6.0"
    sphericalmercator "~1.0.4"
    step "~0.0.5"

@@ -2346,8 +2321,8 @@ utils-merge@1.0.1:
  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"

 uuid@^3.0.0, uuid@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"

 validate-npm-package-license@^3.0.1:
  version "3.0.1"
@@ -2392,27 +2367,27 @@ window-size@^0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"

-windshaft@4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.2.0.tgz#6a0409832a0d3bccfa09a88a8ab8288686b6762d"
+windshaft@4.5.2:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/windshaft/-/windshaft-4.5.2.tgz#d371af414fc4fbf98bd0f1aaabed91aa43224567"
  dependencies:
-    abaculus cartodb/abaculus#2.0.3-cdb1
+    "@carto/mapnik" "3.6.2-carto.2"
+    "@carto/tilelive-bridge" cartodb/tilelive-bridge#2.5.1-cdb1
+    abaculus cartodb/abaculus#2.0.3-cdb2
    canvas cartodb/node-canvas#1.6.2-cdb2
    carto cartodb/carto#0.15.1-cdb3
    cartodb-psql "^0.10.1"
    debug "^3.1.0"
    dot "~1.0.2"
-    grainstore "~1.8.0"
-    mapnik "3.5.14"
+    grainstore "1.8.2"
    queue-async "~1.0.7"
-    redis-mpool "0.4.1"
+    redis-mpool "^0.5.0"
    request "^2.83.0"
    semver "~5.0.3"
    sphericalmercator "1.0.4"
    step "~0.0.6"
    tilelive "5.12.2"
-    tilelive-bridge cartodb/tilelive-bridge#2.3.1-cdb4
-    tilelive-mapnik cartodb/tilelive-mapnik#0.6.18-cdb3
+    tilelive-mapnik cartodb/tilelive-mapnik#0.6.18-cdb5
    torque.js "~2.11.0"
    underscore "~1.6.0"
Author	SHA1	Message	Date
Raul Marin	3539b658fb	Update Windshaft to 4.5.2	2018-02-12 12:19:36 +01:00
Javier Goizueta	abf33a1c68	Release 5.3.0	2018-02-12 12:03:02 +01:00
Javier Goizueta	fc6790ea1e	Merge pull request #866 from CartoDB/update-camshaft-to-0.61.2 Update camshaft to 0.61.2	2018-02-12 11:56:31 +01:00
Raul Marin	ac6f0e1c67	Update Windshaft to 4.5.1	2018-02-12 11:35:46 +01:00
Javier Goizueta	ee7917676b	Update camshaft to 0.61.2 This is to fixe a bug in the line-sequential analyses (length was incorrect)	2018-02-08 17:00:13 +01:00
Raúl Marín	b32a0a6547	Merge pull request #864 from Algunenano/master_metrics Add metrics option to Mapnik renderer (off by default)	2018-02-06 16:48:22 +01:00
Raul Marin	d634be0c30	Update NEWs and Windshaft to 4.5.0	2018-02-06 16:10:44 +01:00
Raul Marin	f9fe3ace37	Add mapnik metrics option	2018-02-06 16:07:22 +01:00
Simon Martín	6cd8131888	updating NEWS	2018-02-06 11:30:34 +01:00
Simon Martín	0ea76f7d15	Merge pull request #849 from CartoDB/redis4 Redis4 support	2018-02-06 11:24:02 +01:00
Simon Martín	51e5b5c255	upgrading cartodb-redis, redis-mpool and windshaft versions	2018-02-05 18:09:14 +01:00
Simon Martín	cedcc094e6	Merge branch 'master' into redis4	2018-02-05 12:42:59 +01:00
Javier Goizueta	bbe8d4e820	Stub next version	2018-02-01 16:39:43 +01:00
Javier Goizueta	5aa98c4ab2	Release 5.2.1	2018-02-01 16:37:05 +01:00
Javier Goizueta	d6a9103779	Merge pull request #861 from CartoDB/860-aggregation-min-res Limit the minimum size of the the aggregation grid	2018-02-01 16:32:35 +01:00
Javier Goizueta	2e7784ddf2	Add comment to clafify aggregation resolution limit	2018-02-01 10:26:52 +01:00
Raul Marin	086be461b2	Stub next version	2018-02-01 09:33:18 +01:00
Raul Marin	a7157532f1	Release 5.2.0	2018-02-01 09:31:46 +01:00
Raúl Marín	55fd660d69	Merge pull request #859 from Algunenano/master_cache_features Add Mapnik 'cache-features' option	2018-02-01 09:27:07 +01:00
Javier Goizueta	80604b739a	Add test for aggregation with attributes This reveals #860	2018-01-31 18:56:24 +01:00
Javier Goizueta	d88fbbaa87	Use camelCase	2018-01-31 18:55:28 +01:00
Javier Goizueta	7db0744f67	Simplify expression	2018-01-31 17:54:40 +01:00
Javier Goizueta	d1fcd797a3	Limit the minimum size of the the aggregation grid Fixes #860	2018-01-31 17:46:13 +01:00
Raul Marin	150c6ee4be	Update to Windshaft 5.3.3	2018-01-31 17:24:15 +01:00
Raul Marin	d0df8b1533	Update yarn.lock	2018-01-31 15:40:23 +01:00
Raul Marin	43e1de31fa	Add Mapnik 'cache-features' option	2018-01-31 12:18:28 +01:00
Rafa de la Torre	33ed9ab47d	Stub next version	2018-01-30 10:16:08 +01:00
Rafa de la Torre	749a08336a	Merge pull request #857 from CartoDB/upgrade-to-mapnik-3.6.2-carto.2 Upgrade to node mapnik 3.6.2-carto.2	2018-01-30 10:13:15 +01:00
Rafa de la Torre	467097b3cc	Merge remote-tracking branch 'origin/master' into upgrade-to-mapnik-3.6.2-carto.2	2018-01-30 10:07:01 +01:00
Javier Goizueta	487aca52d0	Stub next version	2018-01-29 18:25:14 +01:00
Rafa de la Torre	781d2d3a28	Update NEWS.md	2018-01-29 17:41:46 +01:00
Rafa de la Torre	2a767cdb83	Update yarn.lock	2018-01-29 17:40:49 +01:00
Rafa de la Torre	e3cf69ac1a	Bump windshaft version That version contains our flavor of mapnik 3.0.15 with a bunch of patches. See https://github.com/CartoDB/Windshaft/blob/master/NEWS.md#version-431	2018-01-29 17:40:17 +01:00
Simon Martín	2c703e5c16	updating node-redis-mpool dev version	2018-01-19 14:40:27 +01:00
Simon Martín	e68ba95fed	adding cartodb-redis with redis4 support	2018-01-18 15:16:40 +01:00
Simon Martín	83d00a8aca	Merge branch 'master' into redis4	2018-01-17 10:29:32 +01:00
Simon Martín	479e8970a1	Merge branch 'master' into redis4	2018-01-16 15:10:08 +01:00
Simon Martín	cf5e797f90	supporting redis4	2018-01-16 11:59:23 +01:00