Commit Graph
808 Commits
Author SHA1 Message Date
Daniel García Aubert e4407ece84 Merge branch 'mapconfig-aggregation' of github.com:CartoDB/Windshaft-cartodb into mapconfig-aggregation 2017-12-14 16:39:07 +01:00
Javier Goizueta 753ada0e76 Add cartodb_id to test datasets 2017-12-14 16:36:24 +01:00
Daniel García Aubert d311dccce8 Add test to check tangram compatibility 2017-12-14 16:35:09 +01:00
Daniel García Aubert a987f6ac05 Fix issue when the sql has single quotes defined and the aggregation metadata query was not able to estimate row count 2017-12-14 14:14:55 +01:00
Daniel García Aubert bcfc43a517 jshint, my old friend 2017-12-14 11:22:00 +01:00
Daniel García Aubert 1edf684475 Fix test 2017-12-13 20:04:06 +01:00
Daniel García Aubert 98e8d745b1 Support sql_wrap for aggregation 2017-12-13 17:01:43 +01:00
Daniel García Aubert e8740af6ef Fix issue when sql_wrap is provided and aggregation metadata query fails 2017-12-13 16:34:36 +01:00
Daniel García Aubert 6fe73862f3 Create a MapConfig's subclass to delegate aggregation 2017-12-13 11:42:51 +01:00
Daniel García Aubert 239aa12622 Merge branch 'mapconfig-aggregation' of github.com:CartoDB/Windshaft-cartodb into mapconfig-aggregation 2017-12-12 20:28:50 +01:00
Daniel García Aubert 6d46a21005 Validate aggregation query param 2017-12-12 19:23:21 +01:00
Raul Ochoa fb7f79594d Merge remote-tracking branch 'origin/master' into mapconfig-aggregation 2017-12-12 17:15:22 +00:00
Mario de Frutos 8d16bf566d Force png tile generation for static maps (#808)
* Force png tile generation for static maps

If the user tries to generate a static map requesting JPG it will fail
because is going to try to generate the tiles using JPG as format which
is not supported by now, this bug was introduced in the version 4.0.1

So we now force, again, the tiles to be generated as PNG but we pass
the requested format, JPG, to windshaft to generate the final image as
the user reqests

* Added support to define image format in the image assertions

* Added test for JPEG static image generation

Also I've added support for:

- JPEG images
- Different tolerance based on the file type, it seems that due to
  different compression we need different tolerance for JPG images
2017-12-12 13:20:22 +01:00
Daniel García Aubert 869f2ac322 Improve error message 2017-12-12 12:39:12 +01:00
Daniel García Aubert 5bc1903677 Add test to check if cartoccs and aggregation definition are fully compatible 2017-12-12 12:15:13 +01:00
Javier Goizueta e37682403c Fix test
Note that the CartoCSS should reference columns of the aggregated table
2017-12-12 11:22:10 +01:00
Daniel García Aubert 006dd86614 Merge branch 'master' into mapconfig-aggregation 2017-12-11 17:36:58 +01:00
Daniel García Aubert dab204ea71 Do not aggregate if rows cout is lower than threshold or the layer's sql has geometries distinct of points 2017-12-11 17:32:06 +01:00
Raul Marin 88f02458db Timeseries tests: Make jshint happy 2017-12-11 11:27:13 +01:00
Raul Marin bb5bfd10ee Timeseries tests: Make them work with any DB setup 2017-12-11 11:27:13 +01:00
Raul Marin 088a8b81a6 Timeseries tests: Set timestamps to the start of the aggregations
Also, increase the end of the range check so it includes some data
2017-12-11 11:27:13 +01:00
Daniel García Aubert 214d684fcc Adapt layer when is vector only map-caonfig 2017-12-05 20:39:30 +01:00
Daniel García Aubert 9118e2dc5e Add tests 2017-12-05 20:21:20 +01:00
Daniel García Aubert e7592ee570 Improve error message 2017-12-05 17:44:52 +01:00
Daniel García Aubert 81d99ca655 Make test to pass 2017-12-05 16:52:15 +01:00
Daniel García Aubert 55dd049812 Be able to skip aggregation to create a layergroup with aggregation defined already 2017-12-05 12:59:32 +01:00
Daniel García Aubert 66b41a6ae7 Now .getLayergroup() in test client accepts params to perform custom instantiations 2017-12-05 12:09:31 +01:00
Daniel García Aubert 855f47e446 Detect incompatible CartoCSS or interactivity for raster aggregation 2017-12-04 19:48:06 +01:00
Daniel García Aubert 91e0e0fd18 Merge branch 'master' into mapconfig-aggregation 2017-12-04 14:49:44 +01:00
Daniel García Aubert 0c8a31fad9 Remove duplicated code 2017-12-04 13:17:37 +01:00
Daniel García Aubert 077f19d506 Integrate aggregation and get metadata for layergroup 2017-12-04 12:40:53 +01:00
Daniel García Aubert 23c0cb757d Fix tests according to the last changes in windshaft 2017-12-01 13:52:28 +01:00
Daniel García Aubert e18e86f565 jshint, jshint, jshint 2017-11-29 18:28:42 +01:00
Daniel García Aubert 496778c276 Separate suites 2017-11-29 18:17:51 +01:00
Daniel García Aubert cded5afdcb Ahh! jshint.. my old friend 2017-11-29 16:56:28 +01:00
Daniel García Aubert 1b6de9961a Do not use polygons 2017-11-29 16:47:56 +01:00
Daniel García Aubert c9e0f330c0 Add test to check incompatible layers 2017-11-29 16:15:52 +01:00
Daniel García Aubert f9428682f9 Remove mocha filter 2017-11-29 14:38:06 +01:00
Daniel García Aubert 330f8f3cb5 Test invalid format for vector layergroup 2017-11-29 14:10:56 +01:00
Daniel García Aubert 8270699b8e Tests to fect mvt tiles without styles 2017-11-29 13:12:09 +01:00
Ubuntu 51c19c0b2e Skip test 2017-11-28 16:49:55 +00:00
Daniel García Aubert 1a78b8a75a Merge branch 'master' into middlewarify-analyses-controller 2017-11-23 11:47:57 +01:00
Daniel García Aubert 967d9b76e6 Fix EOF 2017-11-19 13:47:07 +01:00
Simon Martín 298882f410 remove with spaces and adding line as EOF 2017-11-15 15:07:30 +01:00
Simon Martín 22e3016cd3 Merge branch 'master' into timeoutVectorImage 2017-11-14 15:54:16 +01:00
Daniel García Aubert 520e84e46b Add acceptance test for analyses controller 2017-11-14 13:46:47 +01:00
Daniel 749b205944 Merge pull request #788 from CartoDB/786-number-categories-param
Add a "category" query param to define the number of categories to be ranked for aggregation dataviews
2017-11-07 17:11:25 +01:00
Daniel García Aubert 2aee357006 Improve test structure 2017-11-07 16:28:37 +01:00
Daniel García Aubert 743bb0723b Add query param to define the number of categories to be ranked 2017-11-07 16:14:47 +01:00
Daniel García Aubert 50ecdb5fee Add test to ensure that categories param is used to compose the aggregation dataview 2017-11-07 12:51:48 +01:00