Release 3.12.2

725 fix polygon count

NEWS.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 3.12.2
+Released 2017-08-16
+
+Bug fixes:
+ - Polygon count problems #725.
+
+
 ## 3.12.1
 Released 2017-08-13
  - Upgrades cartodb-psql to [0.10.1](https://github.com/CartoDB/node-cartodb-psql/releases/tag/0.10.1).

lib/cartodb/models/filter/bbox.js

@@ -8,7 +8,7 @@ var filterQueryTpl = dot.template([
 ].join('\n'));
 
 var bboxFilterTpl = dot.template(
-    '{{=it._column}} && ST_Transform(ST_MakeEnvelope({{=it._bbox}}, 4326), {{=it._srid}})'
+    'ST_Intersects({{=it._column}}, ST_Transform(ST_MakeEnvelope({{=it._bbox}}, 4326), {{=it._srid}}))'
 );
 
 var LATITUDE_MAX_VALUE = 85.0511287798066;

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "windshaft-cartodb",
-  "version": "3.12.1",
+  "version": "3.12.2",
   "description": "A map tile server for CartoDB",
   "keywords": [
     "cartodb"

test/acceptance/widgets/regressions.js

@@ -218,6 +218,114 @@ describe('widgets-regressions', function() {
             });
         });
 
+
+        it('should not count the polygons outside the bounding box', function(done) {
+
+            // $               %        $ = not intersecting left triangle
+            // $$  **VVVVV**  %%        % = not intersecting right triangle
+            // $$$  *VVVVV*  %%%        * = intersecting triangle
+            // $$$$  *****  %%%%        V = bounding box
+            // $$$$$  ***  %%%%%
+            // $$$$$$  *  %%%%%%
+            // $$$$$$$   %%%%%%%
+            // $$$$$$$$ %%%%%%%%
+
+            const notIntersectingLeftTriangle = {
+                type: "Polygon",
+                coordinates:[[
+                    [-161.015625,69.28725695167886],
+                    [-162.7734375,-7.710991655433217],
+                    [-40.78125,-8.059229627200192],
+                    [-161.015625,69.28725695167886]
+                ]]
+            };
+
+            const notIntersectingRightTriangle = {
+                type: "Polygon",
+                coordinates: [[
+                    [-29.179687499999996,-7.01366792756663],
+                    [103.71093749999999,-6.664607562172573],
+                    [105.46875,69.16255790810501],
+                    [-29.179687499999996,-7.01366792756663]
+                ]]
+            };
+
+            const intersectingTriangle = {
+                type: "Polygon",
+                coordinates:[[
+                    [-117.42187500000001,68.13885164925573],
+                    [-35.859375,20.96143961409684],
+                    [59.4140625,68.52823492039876],
+                    [-117.42187500000001,68.13885164925573]
+                ]]
+            };
+
+            const query = `  
+                SELECT
+                    ST_TRANSFORM(ST_SETSRID(ST_GeomFromGeoJSON(
+                        '${JSON.stringify(notIntersectingLeftTriangle)}'
+                    ), 4326), 3857) AS the_geom_webmercator, 1 AS cartodb_id, 'notIntersectingLeftTriangle' AS name
+                UNION
+                SELECT
+                    ST_TRANSFORM(ST_SETSRID(ST_GeomFromGeoJSON(
+                        '${JSON.stringify(notIntersectingRightTriangle)}'
+                    ), 4326), 3857), 2, 'notIntersectingRightTriangle'
+                UNION
+                SELECT
+                    ST_TRANSFORM(ST_SETSRID(ST_GeomFromGeoJSON(
+                        '${JSON.stringify(intersectingTriangle)}'
+                    ), 4326), 3857), 3, 'intersectingTriangle'
+            `;
+
+            const mapConfig = {
+                version: '1.5.0',
+                layers: [
+                    {
+                        "type": "cartodb",
+                        "options": {
+                            "source": {
+                                "id": "a0"
+                            },
+                            "cartocss": "#points { marker-width: 10; marker-fill: red; }",
+                            "cartocss_version": "2.3.0"
+                        }
+                    }
+                ],
+                dataviews: {
+                    val_formula: {
+                        source: {
+                            id: 'a0'
+                        },
+                        type: 'aggregation',
+                        options: {
+                            column: "name",
+                            aggregation: "count",
+                        }
+                    }
+                },
+                analyses: [
+                    {
+                        "id": "a0",
+                        "type": "source",
+                        "params": {
+                            "query": query
+                        }
+                    }
+                ]
+            };
+
+            this.testClient = new TestClient(mapConfig, 1234);
+            const params = {
+                bbox: '-77.34374999999999,45.82879925192134,17.578125,55.97379820507658'
+            };
+            this.testClient.getDataview('val_formula', params, function(err, dataview) {
+                assert.ifError(err);
+                assert.equal(dataview.categories.length, 1);
+                assert.equal(dataview.categories[0].category, 'intersectingTriangle');
+                done();
+            });
+        });
+
     });
 
 });

test/unit/cartodb/ported/tile_stats.test.js

@@ -6,10 +6,13 @@ var LayergroupController = require('../../../../lib/cartodb/controllers/layergro
 
 describe('tile stats', function() {
 
-    after(function() {
-        global.statsClient = null;
+    beforeEach(function () {
+        this.statsClient = global.statsClient;
     });
 
+    afterEach(function() {
+        global.statsClient  = this.statsClient;
+    });
 
     it('finalizeGetTileOrGrid does not call statsClient when format is not supported', function() {
         var expectedCalls = 2, // it will call increment once for the general error