Release 2.43.1

Fix dataview bbox bug when no query rewrite data exists

NEWS.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 2.43.1
+
+Released 2016-05-19
+
+Bug fixes:
+ - Dataview error when bbox present without query rewrite data #458
+
+
 ## 2.43.0
 
 Released 2016-05-18

lib/cartodb/backends/dataview.js

@@ -139,17 +139,19 @@ DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, param
             if (params.bbox) {
                 var bboxFilter = new BBoxFilter({column: 'the_geom', srid: 4326}, {bbox: params.bbox});
                 query = bboxFilter.sql(query);
-                var bbox_filter_definition = {
-                    type: 'bbox',
-                    options: {
-                        column: 'the_geom',
-                        srid: 4326,
-                    },
-                    params: {
-                        bbox: params.bbox
-                    }
-                };
-                queryRewriteData = _.extend(queryRewriteData, { bbox_filter: bbox_filter_definition });
+                if ( queryRewriteData ) {
+                    var bbox_filter_definition = {
+                        type: 'bbox',
+                        options: {
+                            column: 'the_geom',
+                            srid: 4326,
+                        },
+                        params: {
+                            bbox: params.bbox
+                        }
+                    };
+                    queryRewriteData = _.extend(queryRewriteData, { bbox_filter: bbox_filter_definition });
+                }
             }
 
             var dataviewFactory = DataviewFactoryWithOverviews.getFactory(

package.json

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

test/acceptance/dataviews/overviews.js

@@ -58,6 +58,21 @@ describe('dataviews using tables without overviews', function() {
         });
     });
 
+    it("should admit a bbox", function(done) {
+        var params = {
+            bbox: "-170,-80,170,80"
+        };
+        var testClient = new TestClient(nonOverviewsMapConfig);
+        testClient.getDataview('country_places_count', params, function(err, formula_result) {
+            if (err) {
+                return done(err);
+            }
+            assert.deepEqual(formula_result, { operation: 'count', result: 7253, nulls: 0, type: 'formula' });
+
+            testClient.drain(done);
+        });
+    });
+
     describe('filters', function() {
 
         describe('category', function () {
@@ -77,6 +92,23 @@ describe('dataviews using tables without overviews', function() {
                     testClient.drain(done);
                 });
             });
+
+            it("should expose a filtered formula and admit a bbox", function (done) {
+                var params = {
+                    filters: {
+                        dataviews: {country_categories: {accept: ['CAN']}}
+                    },
+                    bbox: "-170,-80,170,80"
+                };
+                var testClient = new TestClient(nonOverviewsMapConfig);
+                testClient.getDataview('country_places_count', params, function (err, formula_result) {
+                    if (err) {
+                        return done(err);
+                    }
+                    assert.deepEqual(formula_result, { operation: 'count', result: 254, nulls: 0, type: 'formula' });
+                    testClient.drain(done);
+                });
+            });
         });
 
     });
@@ -218,16 +250,32 @@ describe('dataviews using tables with overviews', function() {
         });
     });
 
+    it("should admit a bbox", function(done) {
+        var params = {
+            bbox: "-170,-80,170,80"
+        };
+        var testClient = new TestClient(overviewsMapConfig);
+        testClient.getDataview('test_sum', params, function(err, formula_result) {
+            if (err) {
+                return done(err);
+            }
+            assert.deepEqual(formula_result, {"operation":"sum","result":15,"nulls":0,"type":"formula"});
+
+            testClient.drain(done);
+        });
+    });
+
     describe('filters', function() {
 
         describe('category', function () {
 
-            it("should expose a filtered formula", function (done) {
-                var params = {
-                    filters: {
-                        dataviews: {test_categories: {accept: ['Hawai']}}
-                    }
-                };
+            var params = {
+                filters: {
+                    dataviews: {test_categories: {accept: ['Hawai']}}
+                }
+            };
+
+            it("should expose a filtered sum formula", function (done) {
                 var testClient = new TestClient(overviewsMapConfig);
                 testClient.getDataview('test_sum', params, function (err, formula_result) {
                     if (err) {
@@ -236,56 +284,74 @@ describe('dataviews using tables with overviews', function() {
                     assert.deepEqual(formula_result, {"operation":"sum","result":1,"nulls":0,"type":"formula"});
                     testClient.drain(done);
                 });
-
-                it("should expose an avg formula", function(done) {
-                    var testClient = new TestClient(overviewsMapConfig);
-                    testClient.getDataview('test_avg', { own_filter: 0 }, function(err, formula_result) {
-                        if (err) {
-                            return done(err);
-                        }
-                        assert.deepEqual(formula_result, {"operation":"avg","result":1,"nulls":0,"type":"formula"});
-
-                        testClient.drain(done);
-                    });
-                });
-
-                it("should expose a count formula", function(done) {
-                    var testClient = new TestClient(overviewsMapConfig);
-                    testClient.getDataview('test_count', { own_filter: 0 }, function(err, formula_result) {
-                        if (err) {
-                            return done(err);
-                        }
-                        assert.deepEqual(formula_result, {"operation":"count","result":1,"nulls":0,"type":"formula"});
-
-                        testClient.drain(done);
-                    });
-                });
-
-                it("should expose a max formula", function(done) {
-                    var testClient = new TestClient(overviewsMapConfig);
-                    testClient.getDataview('test_max', { own_filter: 0 }, function(err, formula_result) {
-                        if (err) {
-                            return done(err);
-                        }
-                        assert.deepEqual(formula_result, {"operation":"max","result":1,"nulls":0,"type":"formula"});
-
-                        testClient.drain(done);
-                    });
-                });
-
-                it("should expose a min formula", function(done) {
-                    var testClient = new TestClient(overviewsMapConfig);
-                    testClient.getDataview('test_min', { own_filter: 0 }, function(err, formula_result) {
-                        if (err) {
-                            return done(err);
-                        }
-                        assert.deepEqual(formula_result, {"operation":"min","result":1,"nulls":0,"type":"formula"});
-
-                        testClient.drain(done);
-                    });
-                });
-
             });
+
+            it("should expose a filtered  avg formula", function(done) {
+                var testClient = new TestClient(overviewsMapConfig);
+                testClient.getDataview('test_avg', params, function(err, formula_result) {
+                    if (err) {
+                        return done(err);
+                    }
+                    assert.deepEqual(formula_result, {"operation":"avg","result":1,"nulls":0,"type":"formula"});
+
+                    testClient.drain(done);
+                });
+            });
+
+            it("should expose a filtered count formula", function(done) {
+                var testClient = new TestClient(overviewsMapConfig);
+                testClient.getDataview('test_count', params, function(err, formula_result) {
+                    if (err) {
+                        return done(err);
+                    }
+                    assert.deepEqual(formula_result, {"operation":"count","result":1,"nulls":0,"type":"formula"});
+
+                    testClient.drain(done);
+                });
+            });
+
+            it("should expose a filterd max formula", function(done) {
+                var testClient = new TestClient(overviewsMapConfig);
+                testClient.getDataview('test_max', params, function(err, formula_result) {
+                    if (err) {
+                        return done(err);
+                    }
+                    assert.deepEqual(formula_result, {"operation":"max","result":1,"nulls":0,"type":"formula"});
+
+                    testClient.drain(done);
+                });
+            });
+
+            it("should expose a filterd min formula", function(done) {
+                var testClient = new TestClient(overviewsMapConfig);
+                testClient.getDataview('test_min', params, function(err, formula_result) {
+                    if (err) {
+                        return done(err);
+                    }
+                    assert.deepEqual(formula_result, {"operation":"min","result":1,"nulls":0,"type":"formula"});
+
+                    testClient.drain(done);
+                });
+            });
+
+            it("should expose a filtered sum formula with bbox", function (done) {
+                var bboxparams = {
+                    filters: {
+                        dataviews: {test_categories: {accept: ['Hawai']}}
+                    },
+                    bbox: "-170,-80,170,80"
+                };
+                var testClient = new TestClient(overviewsMapConfig);
+                testClient.getDataview('test_sum', bboxparams, function (err, formula_result) {
+                    if (err) {
+                        return done(err);
+                    }
+                    assert.deepEqual(formula_result, {"operation":"sum","result":1,"nulls":0,"type":"formula"});
+                    testClient.drain(done);
+                });
+            });
+
+
         });
 
     });