Release 5.0.2

Upgrades camshaft to version 0.62.1
Release 5.0.1
2018-07-27 19:36:55 +02:00 · 2018-07-27 19:15:48 +02:00 · 2018-01-29 18:16:30 +01:00 · 2018-01-29 16:13:19 +01:00 · 2018-01-29 15:48:35 +01:00 · 2018-01-29 15:44:24 +01:00
9 changed files with 133 additions and 21 deletions
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,18 @@
 # Changelog

+## 5.0.2
+Released 2018-07-27
+
+Announcements:
+- Upgrades camshaft to [0.62.1](https://github.com/CartoDB/camshaft/releases/tag/0.62.1):
+  - Add support for batch street-level geocoding analysis.
+
+## 5.0.1
+Released 2018-01-20
+
+Bug Fixes:
+- Allow aggregation for queries with no the_geom (only the_geom_webmercator) #856
+
 ## 5.0.0
 Released 2018-01-29

--- a/lib/cartodb/models/aggregation/aggregation-mapconfig.js
+++ b/lib/cartodb/models/aggregation/aggregation-mapconfig.js
@@ -47,6 +47,10 @@ module.exports = class AggregationMapConfig extends MapConfig {
        return AggregationMapConfig.SUPPORTED_GEOMETRY_TYPES.includes(geometryType);
    }

+    static  getAggregationGeometryColumn() {
+        return aggregationQuery.GEOMETRY_COLUMN;
+    }
+
    constructor (user, config, connection, datasource) {
        super(config, datasource);

--- a/lib/cartodb/models/aggregation/aggregation-query.js
+++ b/lib/cartodb/models/aggregation/aggregation-query.js
@@ -250,3 +250,4 @@ const aggregationQueryTemplates = {
 };

 module.exports.SUPPORTED_PLACEMENTS = Object.keys(aggregationQueryTemplates);
+module.exports.GEOMETRY_COLUMN = 'the_geom_webmercator';
--- a/lib/cartodb/models/dataview/aggregation.js
+++ b/lib/cartodb/models/dataview/aggregation.js
@@ -120,7 +120,7 @@ const aggregationQueryTpl = ctx => `
        ${ctx.isFloatColumn ? `${specialNumericValuesColumns(ctx)}` : '' }
    FROM (${ctx.query}) _cdb_aggregation_all, summary, categories_summary_min_max, categories_summary_count
    GROUP BY
-        category,
+        ${ctx.column},
        nulls_count,
        min_val,
        max_val,
--- a/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
@@ -122,7 +122,8 @@ module.exports = class AggregationMapConfigAdapter {
        }

        const aggregationMetadata = queryUtils.getAggregationMetadata({
-            query: layer.options.sql_raw ? layer.options.sql_raw : layer.options.sql
+            query: layer.options.sql_raw ? layer.options.sql_raw : layer.options.sql,
+            geometryColumn: AggregationMapConfig.getAggregationGeometryColumn()
        });

        connection.query(aggregationMetadata, (err, res) => {
--- a/lib/cartodb/utils/query-utils.js
+++ b/lib/cartodb/utils/query-utils.js
@@ -32,8 +32,8 @@ module.exports.getAggregationMetadata = ctx => `
        ${getQueryRowEstimation(ctx.query)}
    ),
    geometryType AS (
-        SELECT ST_GeometryType(the_geom) as geom_type
-        FROM (${ctx.query}) AS __cdb_query WHERE the_geom IS NOT NULL LIMIT 1
+        SELECT ST_GeometryType(${ctx.geometryColumn}) as geom_type
+        FROM (${ctx.query}) AS __cdb_query WHERE ${ctx.geometryColumn} IS NOT NULL LIMIT 1
    )
    SELECT
        rows AS count,
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "windshaft-cartodb",
-  "version": "5.0.0",
+  "version": "5.0.2",
  "description": "A map tile server for CartoDB",
  "keywords": [
    "cartodb"
@@ -25,7 +25,7 @@
  ],
  "dependencies": {
    "body-parser": "^1.18.2",
-    "camshaft": "0.60.0",
+    "camshaft": "0.62.1",
    "cartodb-psql": "0.10.2",
    "cartodb-query-tables": "0.3.0",
    "cartodb-redis": "0.14.0",
--- a/test/acceptance/aggregation.js
+++ b/test/acceptance/aggregation.js
@@ -92,6 +92,14 @@ describe('aggregation', function () {
        }
    `;

+    const POINTS_SQL_ONLY_WEBMERCATOR = `
+    select
+        x + 4 as cartodb_id,
+        st_transform(st_setsrid(st_makepoint(x*10, x*10), 4326), 3857) as the_geom_webmercator,
+        x as value
+    from generate_series(-3, 3) x
+    `;
+
    function createVectorMapConfig (layers = [
        {
            type: 'cartodb',
@@ -1401,6 +1409,35 @@ describe('aggregation', function () {
                    });
                });
            });
+
+            it('should only require the_geom_webmercator for aggregation', function (done) {
+                this.mapConfig = createVectorMapConfig([
+                    {
+                        type: 'cartodb',
+                        options: {
+                            sql: POINTS_SQL_ONLY_WEBMERCATOR,
+                            aggregation: {
+                                threshold: 1
+                            }
+                        }
+                    }
+                ]);
+                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/yarn.lock
+++ b/yarn.lock
@@ -215,16 +215,16 @@ 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.62.1:
+  version "0.62.1"
+  resolved "https://registry.yarnpkg.com/camshaft/-/camshaft-0.62.1.tgz#75f8734c4089aaeae3b9067eb94d3c669cebbcaf"
  dependencies:
    async "^1.5.2"
    bunyan "1.8.1"
-    cartodb-psql "^0.10.1"
+    cartodb-psql "0.11.0"
    debug "^3.1.0"
    dot "^1.0.3"
-    request "^2.69.0"
+    request "2.85.0"

 canvas@cartodb/node-canvas#1.6.2-cdb2:
  version "1.6.2-cdb2"
@@ -244,9 +244,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"
@@ -274,6 +274,14 @@ cartodb-psql@0.10.2, cartodb-psql@^0.10.1:
    pg cartodb/node-postgres#6.1.6-cdb1
    underscore "~1.6.0"

+cartodb-psql@0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/cartodb-psql/-/cartodb-psql-0.11.0.tgz#6b4eae0876ee56944a61fe5f4acc6a8b0b11233f"
+  dependencies:
+    debug "^3.1.0"
+    pg CartoDB/node-postgres#6.4.2-cdb1
+    underscore "~1.6.0"
+
 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"
@@ -823,7 +831,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:
@@ -1380,8 +1388,8 @@ mocha@~3.4.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"
+  version "2.22.2"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"

 moment@~2.18.1:
  version "2.18.1"
@@ -1403,7 +1411,11 @@ mv@~2:
    ncp "~2.0.0"
    rimraf "~2.4.0"

-nan@^2.0.8, nan@^2.3.4, nan@^2.4.0:
+nan@^2.0.8:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+
+nan@^2.3.4, nan@^2.4.0:
  version "2.8.0"
  resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"

@@ -1568,6 +1580,10 @@ packet-reader@0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-0.2.0.tgz#819df4d010b82d5ea5671f8a1a3acf039bcd7700"

+packet-reader@0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-0.3.1.tgz#cd62e60af8d7fea8a705ec4ff990871c46871f27"
+
 parse-json@^2.2.0:
  version "2.2.0"
  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
@@ -1646,7 +1662,20 @@ pg@cartodb/node-postgres#6.1.6-cdb1:
    pgpass "1.x"
    semver "4.3.2"

-pgpass@1.x:
+"pg@github:CartoDB/node-postgres#6.4.2-cdb1":
+  version "6.4.2"
+  resolved "https://codeload.github.com/CartoDB/node-postgres/tar.gz/449fac1d6da711ffcc6694ae3c89f85244f48bdc"
+  dependencies:
+    buffer-writer "1.0.1"
+    js-string-escape "1.0.1"
+    packet-reader "0.3.1"
+    pg-connection-string "0.1.3"
+    pg-pool "1.*"
+    pg-types "1.*"
+    pgpass "1.*"
+    semver "4.3.2"
+
+pgpass@1.*, pgpass@1.x:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.2.tgz#2a7bb41b6065b67907e91da1b07c1847c877b306"
  dependencies:
@@ -1884,7 +1913,34 @@ request@2.81.0:
    tunnel-agent "^0.6.0"
    uuid "^3.0.0"

-request@2.x, request@^2.55.0, request@^2.69.0, request@^2.83.0:
+request@2.85.0:
+  version "2.85.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.1"
+    forever-agent "~0.6.1"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    hawk "~6.0.2"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    stringstream "~0.0.5"
+    tough-cookie "~2.3.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.1.0"
+
+request@2.x, request@^2.55.0, request@^2.83.0:
  version "2.83.0"
  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
  dependencies:
@@ -1946,8 +2002,8 @@ safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, s
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"

 safe-json-stringify@~1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz#81a098f447e4bbc3ff3312a243521bc060ef5911"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd"

 "semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0:
  version "5.4.1"
Author	SHA1	Message	Date
Daniel García Aubert	ffd8731b92	Release 5.0.2	2018-07-27 19:36:55 +02:00
Daniel García Aubert	c15a48b870	Upgrades camshaft to version 0.62.1	2018-07-27 19:15:48 +02:00
Javier Goizueta	072956addd	Release 5.0.1	2018-01-29 18:16:30 +01:00
Javier Goizueta	27b5420358	Merge pull request #856 from CartoDB/841-the_geom_webmercator-type Check the type of the_geom_webmercator for aggregation	2018-01-29 16:13:19 +01:00
Javier Goizueta	7641542e67	Check the type of the_geom_webmercator for aggregation Fixes #841	2018-01-29 15:48:35 +01:00
Javier Goizueta	debb174af4	Add test for aggregation without the_geom Only the_geom_webmercator is required for aggregation See #841	2018-01-29 15:44:24 +01:00
Eneko Lakasta	2bd4c9e814	Merge pull request #851 from CartoDB/1259-category-widget-error-group-by-missing use original column name in group by instead of alias	2018-01-29 15:38:07 +01:00
Simon Martín	0dc7872256	stubs next version	2018-01-29 15:26:41 +01:00
Simon Martín	1e56ba1de9	Merge pull request #854 from CartoDB/respect-types-aggreagation Respect category type of aggregation dataview	2018-01-29 15:24:38 +01:00
Eneko Lakasta	941ebf7d80	Merge branch 'master' into 1259-category-widget-error-group-by-missing	2018-01-29 14:51:59 +01:00
Eneko Lakasta	220f1d6a73	use original column name in group by instead of alias	2018-01-18 15:27:54 +01:00