diff --git a/test/acceptance/dataviews/polygonCount.js b/test/acceptance/dataviews/polygonCount.js index 02ff075e..02ceef28 100644 --- a/test/acceptance/dataviews/polygonCount.js +++ b/test/acceptance/dataviews/polygonCount.js @@ -21,6 +21,36 @@ describe('boundingBox-polygon-counter', function() { } }); + var polygon1 = { + type: "Polygon", + coordinates:[[ + [-161.015625,69.28725695167886], + [-162.7734375,-7.710991655433217], + [-40.78125,-8.059229627200192], + [-161.015625,69.28725695167886] + ]] + }; + + var polygon2 = { + type: "Polygon", + coordinates: [[ + [-29.179687499999996,-7.01366792756663], + [103.71093749999999,-6.664607562172573], + [105.46875,69.16255790810501], + [-29.179687499999996,-7.01366792756663] + ]] + }; + + var polygon3 = { + type: "Polygon", + coordinates:[[ + [-117.42187500000001,68.13885164925573], + [-35.859375,20.96143961409684], + [59.4140625,68.52823492039876], + [-117.42187500000001,68.13885164925573] + ]] + }; + var mapConfig = createMapConfig( [ { @@ -53,13 +83,19 @@ describe('boundingBox-polygon-counter', function() { "params": { "query": ` SELECT - ST_TRANSFORM(ST_SETSRID(ST_GeomFromGeoJSON('{"type":"Polygon","coordinates":[[[-161.015625,69.28725695167886],[-162.7734375,-7.710991655433217],[-40.78125,-8.059229627200192],[-161.015625,69.28725695167886]]]}'), 4326), 3857) AS the_geom_webmercator, 1 AS cartodb_id + ST_TRANSFORM(ST_SETSRID(ST_GeomFromGeoJSON( + '${JSON.stringify(polygon1)}' + ), 4326), 3857) AS the_geom_webmercator, 1 AS cartodb_id UNION ALL SELECT - ST_TRANSFORM(ST_SETSRID(ST_GeomFromGeoJSON('{"type":"Polygon","coordinates":[[[-29.179687499999996,-7.01366792756663],[103.71093749999999,-6.664607562172573],[105.46875,69.16255790810501],[-29.179687499999996,-7.01366792756663]]]}'), 4326), 3857), 2 + ST_TRANSFORM(ST_SETSRID(ST_GeomFromGeoJSON( + '${JSON.stringify(polygon2)}' + ), 4326), 3857), 2 UNION ALL SELECT - ST_TRANSFORM(ST_SETSRID(ST_GeomFromGeoJSON('{"type":"Polygon","coordinates":[[[-117.42187500000001,68.13885164925573],[-35.859375,20.96143961409684],[59.4140625,68.52823492039876],[-117.42187500000001,68.13885164925573]]]}'), 4326), 3857), 3 + ST_TRANSFORM(ST_SETSRID(ST_GeomFromGeoJSON( + '${JSON.stringify(polygon3)}' + ), 4326), 3857), 3 ` } } @@ -68,9 +104,9 @@ describe('boundingBox-polygon-counter', function() { it('should not count the polygons outside the bounding box', function(done) { this.testClient = new TestClient(mapConfig, 1234); - params = { + var params = { bbox: '-77.34374999999999,45.82879925192134,17.578125,55.97379820507658' - } + }; this.testClient.getDataview('val_formula', params, function(err, dataview) { assert.equal(dataview.result, 1); done();