cartodb/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,864 Commits 1 Branch 311 Tags 39 MiB
af31962b2d
Commit Graph

1140 Commits

Author SHA1 Message Date
Javier Goizueta
d706d0eb22 More travis debugging through commits 2018-05-09 11:44:49 +02:00
Javier Goizueta
9c9cfd015d Add test for optional layer metadata 2018-05-08 20:06:14 +02:00
Eneko Lakasta
f60993b042 re-organize no api key token provided tests - explain tests 2018-05-08 14:41:16 +02:00
Eneko Lakasta
1005126a5f re-organize no api key token provided tests 2018-05-08 14:32:44 +02:00
Eneko Lakasta
0536d0abcb add test to check that the fallback api key used if none is sent, is the default public 2018-05-08 11:32:45 +02:00
Eneko Lakasta
f111ddf449 use matching cartodb-redis branch and run all tests 2018-05-07 16:07:28 +02:00
Eneko Lakasta
534c827904 remove auth fallback 2018-05-07 15:44:44 +02:00
Daniel García Aubert
9d1d5c439b Merge branch 'separate-routers' into improve-folder-structure 2018-04-18 17:08:11 +02:00
Daniel García Aubert
be5e419288 Merge branch 'separate-app-and-controllers-creation' into separate-routers 2018-04-18 17:06:53 +02:00
Daniel García Aubert
8afe6c5228 Merge branch 'master' into separate-app-and-controllers-creation 2018-04-18 17:05:27 +02:00
Daniel G. Aubert
20b46a33cf
Merge pull request #944 from CartoDB/improve-test-suite 
Improve test suite
 2018-04-18 16:58:52 +02:00
Daniel García Aubert
1694b4b3a6 Merge branch 'separate-routers' into improve-folder-structure 2018-04-17 16:07:47 +02:00
Daniel García Aubert
5b1b78d386 Merge branch 'separate-app-and-controllers-creation' into separate-routers 2018-04-17 15:56:33 +02:00
Daniel García Aubert
9c249596c0 Merge branch 'master' into separate-app-and-controllers-creation 2018-04-17 15:55:38 +02:00
Simon Martín
adefbb3365 query with template string 2018-04-17 11:05:37 +02:00
Daniel García Aubert
7012c6e77a Test: Let the OS to choose a random free port to make the tiler listen at it 2018-04-17 10:44:44 +02:00
Raul Marin
ad4cd2067b JShint fix 2018-04-17 10:39:39 +02:00
Raul Marin
8d6a406779 Merge remote-tracking branch 'carto/master' into mvt-invalid-props 2018-04-17 10:25:05 +02:00
Daniel García Aubert
817afb13d1 Use mocha hooks to create server just before perform the test 2018-04-16 16:16:23 +02:00
Daniel García Aubert
98f29f945b Create application server inside of describes instead of at module level 2018-04-16 14:09:24 +02:00
Eneko Lakasta
35459b7332
Merge pull request #938 from CartoDB/named-map-auth-tests 
Named map auth tests
 2018-04-13 12:56:49 +02:00
Daniel García Aubert
89cc9ad27d Merge branch 'master' into regression-test-named-map-dataview-filter 2018-04-12 20:53:27 +02:00
Daniel García Aubert
d8a5dc586d Add test to check dataview filters when instantiating a named map 2018-04-12 19:58:33 +02:00
Daniel García Aubert
1df7df21d5 Revert removed line 2018-04-12 18:31:22 +02:00
Daniel García Aubert
53a40de2e7 Use another table 2018-04-12 18:24:00 +02:00
Eneko Lakasta
d1ba4a1759 remove unnecessary test 2018-04-12 17:41:07 +02:00
Daniel García Aubert
6437e2ec67 Add test to check regression when cache buster during instantiation is not updated 2018-04-12 16:32:44 +02:00
Eneko Lakasta
31e3b9953f add named maps GET auth tests 2018-04-12 16:22:56 +02:00
Eneko Lakasta
f5bdb8b15b add named maps Update auth tests 2018-04-12 16:03:02 +02:00
Eneko Lakasta
fbcf312071 add named maps Delete auth tests 2018-04-12 14:46:08 +02:00
Eneko Lakasta
9a7a8a3243 add named maps Create auth tests 2018-04-12 12:43:41 +02:00
Simon Martín
fc36950c1d fix errored value in test 2018-04-12 11:27:31 +02:00
Simon Martín
b4ca44f096 Merge branch 'mvt-invalid-props' of github.com:CartoDB/Windshaft-cartodb into mvt-invalid-props 2018-04-12 10:46:45 +02:00
Simon Martín
4978dd86ac simply cases of mvt property type changes 2018-04-12 10:46:21 +02:00
Raul Ochoa
4d631d1b6a Merge branch 'master' into mvt-invalid-props 2018-04-11 14:08:29 +00:00
Raul Ochoa
2d2629c088 improve description for suite and test 2018-04-11 14:08:18 +00:00
Raul Ochoa
67411e32ff Validate property with strict check and use full table 
It seems related to using the full table. The geometry column is a
simplified to reduce the file size, it uses the envelope of the original
geometries.
 2018-04-11 11:40:55 +00:00
Daniel García Aubert
e06d3200c3 Use a better API to define public routes 2018-04-11 12:33:07 +02:00
Eneko Lakasta
9a3eb3e0fd add named maps Listing auth tests 2018-04-11 12:26:09 +02:00
Raul Ochoa
a7c96acc81 Run all tests 2018-04-11 10:13:24 +00:00
Raul Ochoa
f2ab33b498 Add regression test for invalid MVT properties 2018-04-11 10:03:06 +00:00
Raul Ochoa
6c8b3d2f8f Merge branch 'master' into regression-mvt-postgis-agg-column-name 2018-04-11 08:34:28 +00:00
Daniel García Aubert
c0943a7c58 Use config to define base path for express routers 2018-04-10 20:26:36 +02:00
Daniel García Aubert
ac615b4a25 Merge branch 'separate-routers' into improve-folder-structure 2018-04-10 16:15:49 +02:00
Daniel García Aubert
bc45b50290 Merge branch 'separate-app-and-controllers-creation' into separate-routers 2018-04-10 15:59:05 +02:00
Daniel García Aubert
aa3fb4807b Merge branch 'master' into separate-app-and-controllers-creation 2018-04-10 15:25:36 +02:00
Daniel García Aubert
d1a4057a8d Rename user limits api by user limits backend 2018-04-10 10:16:07 +02:00
Daniel García Aubert
6167562758 Meet application logic and folder struture 2018-04-09 16:18:30 +02:00
Daniel García Aubert
7e68f5270d Move application middlewares to routers folder 2018-04-06 18:20:33 +02:00
Daniel García Aubert
25aa967146 Forbid access to named map admin resources for everyone but master 2018-04-06 15:26:11 +02:00
Daniel García Aubert
61fc15cec0 Add comment to indicate deprecated paths 2018-04-06 11:13:34 +02:00
Javier Goizueta
9818d8bb6c Merge branch 'master' into cartovl-cartodb_id 2018-04-05 16:02:03 +02:00
Javier Goizueta
f7fad736c3 Add test for uniqueness of aggregated cartodb_id 2018-04-05 16:01:29 +02:00
Javier Goizueta
3d36802686 Tests for columns present in aggregation MVTs 2018-04-04 16:58:11 +02:00
Javier Goizueta
dc706aeb43 Fix bug with dimension aliases 
The point-sample aggregation query failed if dimensions had alias different from the base columns
 2018-04-04 16:29:40 +02:00
Javier Goizueta
fefb0b23af Merge branch 'master' into cartogl 2018-04-04 12:21:43 +02:00
Daniel García Aubert
f1e421db05 Create an api router isolated from heath checks 2018-04-03 19:08:56 +02:00
Daniel García Aubert
b6989ac82a Create a controllers factory where all collaborators are created and controllers are mounted afterwards 2018-04-02 19:02:31 +02:00
Daniel
f2a7953d9d
Merge pull request #915 from CartoDB/unify-headers-middlewared 
Unify headers middlewares
 2018-03-27 12:38:23 +02:00
Raul Ochoa
489c0f3108 Going red: regression with aggregations and MVT Postgis backend 2018-03-26 16:44:31 +00:00
Simon Martín
d28c915635 jshint happy 2018-03-23 15:57:30 +01:00
Simon Martín
f19eeff899 returning error mvt on rate limit 2018-03-23 13:30:47 +01:00
Simon Martín
1ce908177e correct error message in rate limit tests 2018-03-23 11:47:28 +01:00
Simon Martín
fb784d6a91 removing retry after when no necessary 2018-03-23 10:23:57 +01:00
Daniel
771eaf97c8
Merge pull request #909 from CartoDB/spread-prepare-context-middleware 
Spread `prepareContext` middleware
 2018-03-22 10:48:37 +01:00
Javier Goizueta
6ada8ba6a2 Implement aggregation filters 2018-03-21 17:01:32 +01:00
Daniel García Aubert
72c4a7abd6 Extract cache control header middleware 2018-03-21 16:38:37 +01:00
Raul Marin
0906ae3c93 PG11: Modify regex match to accept pg11 errors 2018-03-20 11:34:30 +01:00
Daniel García Aubert
f8d1e159f4 Please jshint 2018-03-20 11:09:05 +01:00
Daniel García Aubert
df999e040c Merge branch 'spread-prepare-context-middleware' into unify-middlewares 2018-03-20 11:06:31 +01:00
Daniel García Aubert
2e13bc42a1 Merge branch 'master' into spread-prepare-context-middleware 2018-03-20 11:01:13 +01:00
Daniel García Aubert
bb170ee208 Please, jshint 2018-03-19 19:27:38 +01:00
Daniel García Aubert
d463d35906 Remove mocha filter 2018-03-19 14:56:20 +01:00
Daniel García Aubert
5cde325d9a Fix ported test related to cache_buster from layergroup token 2018-03-19 13:51:03 +01:00
Daniel García Aubert
b038763b7b Fix skipped test, port is configured via app configuration. It's no longer configurable via query-params 2018-03-19 12:48:52 +01:00
Daniel García Aubert
73397ab500 Typo 2018-03-16 20:04:39 +01:00
Daniel García Aubert
a7f6eafd5c Remove unused porperties from ported server options 2018-03-16 20:04:29 +01:00
Daniel García Aubert
ed9083de24 Remove req2params middleware from ported server options 2018-03-16 20:02:18 +01:00
Daniel García Aubert
a2fa92abf1 Fix ported test ny adding host header to the request 2018-03-16 19:58:29 +01:00
Daniel García Aubert
fa1e1fd779 Fix ported test by adding host header to the requests 2018-03-16 19:56:34 +01:00
Daniel García Aubert
adde66bc57 Fix more ported test 2018-03-16 18:59:07 +01:00
Daniel García Aubert
db08fc3da2 Remove meaningless test 2018-03-16 18:58:42 +01:00
Daniel García Aubert
97e603b215 Fix ported test 2018-03-16 18:33:47 +01:00
Daniel García Aubert
29936d76b1 Fix ported test by adding host header to request 2018-03-16 18:18:06 +01:00
Daniel García Aubert
3f88aaae64 Fix ported test by adding host header to requests 2018-03-16 18:15:37 +01:00
Daniel García Aubert
fccf46c67d Add host header to test-client (ported) 2018-03-16 18:06:31 +01:00
Daniel García Aubert
970aca1c9d Add host header to test_client (ported) 2018-03-16 17:55:04 +01:00
Daniel García Aubert
5e494f0982 Add host headers to attributes test (ported) 2018-03-16 17:51:48 +01:00
Simon Martín
cbfeb0158e adding type and subtype to rate limit error 2018-03-14 17:27:59 +01:00
Simon Martín
bbedc5f41b Updating headers on tests 2018-03-14 12:15:07 +01:00
Simon Martín
0e43c54214 Merge branch 'master' into rateLimits 2018-03-13 18:09:44 +01:00
Eneko Lakasta
5ad1e1b645 merge master 2018-03-12 11:52:38 +01:00
Eneko Lakasta
f9cbb3aac8 use assert.equal instead of assert.ok 2018-03-07 10:51:17 +01:00
Eneko Lakasta
0185cdf785 please jshint 2018-03-06 15:34:29 +01:00
Eneko Lakasta
b0eacb2a79 add vary header to honor authorization header when caching 2018-03-06 12:46:38 +01:00
Simon Martín
31a554d94f updating tests to use cartodb-redis 2018-03-03 14:46:58 +01:00
Simon Martín
a2bf235553 Merge branch 'master' into rateLimits 2018-03-02 21:21:10 +01:00
Simon Martín
9c27447b17 refactoring rate limit tests 2018-03-02 20:52:06 +01:00
Daniel García Aubert
f03d98cd0d Going green: fix test 2018-03-02 18:37:13 +01:00
Daniel García Aubert
fdd4c4aaa0 Going red: get default named map vector tile 2018-03-02 18:22:53 +01:00
Simon Martín
335d91b42d separate rate limit logic from middleware and EVALSHA 2018-02-28 13:11:18 +01:00
Simon Martín
254991c56c changing endpoint groups constant keys 2018-02-27 17:57:25 +01:00
Simon Martín
b0d63b2ec0 changing module exports and middleware name 2018-02-27 16:52:27 +01:00
Simon Martín
ae50dbd47c updating test to own redis-cell 2018-02-26 17:03:56 +01:00
Simon Martín
b48dcc1418 moving tests to right folder type 2018-02-26 16:23:42 +01:00
Simon Martín
f03ee4b836 removing hardcoded user 2018-02-26 11:20:31 +01:00
Simon Martín
b34f05690c updating rate limit tests supporting multiple limits 2018-02-23 17:42:54 +01:00
Simon Martín
d0024409df removing tests of redis-cell 2018-02-23 16:23:59 +01:00
Simon Martín
b76a8249fa fix overwritten environment params 2018-02-21 11:37:20 +01:00
Simon Martín
7464d827fe using the new config params 2018-02-20 18:17:25 +01:00
Simon Martín
2a1c08da65 ensuring configuration params in tests 2018-02-20 17:58:08 +01:00
Simon Martín
faab174a79 redis keys in easier way 2018-02-20 17:19:50 +01:00
Simon Martín
fadd9032c6 arrow functions clean 2018-02-20 11:38:44 +01:00
Simon Martín
a0f560ca1a rate limits acceptance tests 2018-02-20 10:57:29 +01:00
Eneko Lakasta
4ac224688c in fallback mode, use default api key if api key token doesnt exist 2018-02-16 11:20:04 +01:00
Eneko Lakasta
890f0d1ef6 add fallback for using metadata fallback 2018-02-14 17:31:05 +01:00
Eneko Lakasta
041cd40ec2 please jshint 2018-02-09 19:26:52 +01:00
Eneko Lakasta
8721f56269 add auth test for getting tiles 2018-02-09 19:19:18 +01:00
Eneko Lakasta
1d3045c799 add tests should create/fail creating named maps and regular api key 2018-02-09 12:33:33 +01:00
Eneko Lakasta
04f60baec5 Set the master role inheritance from regular roles as TBA 2018-02-08 19:01:58 +01:00
Eneko Lakasta
a8de436424 add test should create a layergroup with a buffer analysis using a regular apikey token AND grant privileges to master and regular roles in bootstraping sql 2018-02-08 18:54:14 +01:00
Eneko Lakasta
c7780e9f42 add tests should create a layergroup with a source analysis 2018-02-08 15:20:43 +01:00
Eneko Lakasta
3edd7b8b01 add test should create a layergroup with default apikey token 2018-02-08 14:50:17 +01:00
Eneko Lakasta
8bdb82c7be add test should fail creating a layergroup with default apikey token 2018-02-08 14:48:00 +01:00
Eneko Lakasta
fa503ee66a fix test typo 2018-02-08 14:43:12 +01:00
Eneko Lakasta
e1a2ee2381 control API access grants 2018-02-08 13:07:25 +01:00
Eneko Lakasta
1c50dd6b48 add first tests for auth 2018-02-08 12:34:24 +01:00
Eneko Lakasta
8136a1e136 fix test 2018-02-07 19:12:26 +01:00
Raul Marin
f9fe3ace37 Add mapnik metrics option 2018-02-06 16:07:22 +01:00
Javier Goizueta
80604b739a Add test for aggregation with attributes 
This reveals #860
 2018-01-31 18:56:24 +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
Javier Goizueta
7c9b4b7283 Add test to check that cartodb_id is preseent in aggregations 
See #846
This revealss that point-grid aggregation is missing cartodb_id
 2018-01-29 12:40:59 +01:00
Raul Marin
0fdab08600 Torque boundaries tests: Sort objects before comparison 
Order is not guaranteed by torque and changed behaviour from PG 9.5 to 10
 2018-01-15 16:44:10 +01:00
Eneko Lakasta
8e68e5395d remove .only from test 2018-01-11 12:23:16 +01:00
Eneko Lakasta
86d58fea7b use DejaVu Sans Book instead of Open Sans Italic in test 2018-01-11 12:09:04 +01:00
Eneko Lakasta
9934d69736 adjust test image tolerance 2018-01-11 11:57:36 +01:00
Eneko Lakasta
4d11403be2 console.log error in test. For testing purposes only. 2018-01-11 10:49:46 +01:00
Eneko Lakasta
bcd14e4f77 add test to check that labels are wrapped 2018-01-10 22:20:19 +01:00
Raul Ochoa
2cda43dc8d Promote https urls over http 2018-01-03 22:18:59 +00:00
Raul Ochoa
f7f513a61a Add urlTemplate URLs to metadata 
This is useful when using client libraries like leaflet.
 2018-01-03 20:53:03 +00:00
Raul Ochoa
f297374449
Merge pull request #837 from CartoDB/tilejson 
Return tilejson in metadata
 2018-01-03 20:13:44 +01:00
Raul Ochoa
bf40b240d3 Return tilejson in metadata 
It returns tilejson for each individual layer and also for all vector and raster layers.
 2018-01-03 16:54:45 +01:00
Daniel
ee0405da1e
Merge pull request #836 from CartoDB/disable-default-aggregation 
Add test to check layer aggregation disabling
 2018-01-03 13:09:31 +01:00
Daniel García Aubert
1f30367e59 Add test to check layer aggregation disabling 2018-01-03 12:40:00 +01:00
Daniel García Aubert
60005e2f7f Fix bad assertion 2018-01-03 12:24:07 +01:00
Daniel García Aubert
1c7da2c4b3 Going green: do not fail when map-config is vector-only and a layer doesn't have points 2018-01-03 12:00:25 +01:00
Daniel García Aubert
3799dd2574 Going red: fail when vector only map-config has a polygon layer 2018-01-03 11:14:20 +01:00
Raul Ochoa
10d1381e51 Merge remote-tracking branch 'origin/master' into pg-mvt-do-not-filter-columns 2017-12-29 17:50:09 +00:00
Raul Ochoa
e43ccf4f12 Going red: individual layer id filters fail 
Depends on https://github.com/CartoDB/Windshaft/pull/584.
 2017-12-28 18:19:52 +00:00
Daniel García Aubert
9fbc56b82c Remove FIXME notes to test against PostGIS vector renderer 2017-12-28 13:13:32 +01:00
Daniel García Aubert
418c8691d1 Support default full-sample aggregation for postgis vector renderer 2017-12-27 20:08:43 +01:00
Javier Goizueta
54f32113f3 Add some aggregation tests 2017-12-22 15:45:34 +01:00
Javier Goizueta
19bf079f2d Exclude test from PostGIS 2.4 2017-12-22 15:45:14 +01:00
Javier Goizueta
e9a4fc4b2c Use full-sample aggregation only as default 
Sampling is performed only when placement, columns or dimensions are specified;
otherwise the regular centroid/grid-point/grid-center is used without sampling.
 2017-12-22 11:31:33 +01:00
Daniel García Aubert
7f64d15944 Merge branch 'master' into full-sample 2017-12-20 15:58:58 +01:00
Daniel García Aubert
20366cedb4 Skip test for PostGis 2.4 2017-12-20 14:53:34 +01:00
Daniel García Aubert
a102d1d366 jshint, I hate you 2017-12-20 14:41:29 +01:00
Daniel García Aubert
4b97b4fd26 Fix typo 2017-12-20 14:35:47 +01:00
Daniel García Aubert
4946ca688c Add test to check full-sample query 2017-12-19 16:17:13 +01:00
Daniel García Aubert
d2828ecaff Update test 2017-12-19 13:07:57 +01:00
Daniel
1e08d946b1
Merge pull request #822 from CartoDB/aggregation-validation 
Validate aggregation input params
 2017-12-19 12:42:28 +01:00
Raul Marin
f946dfa65f Date histograms: Add tests for the new aggregation modes 2017-12-19 12:09:14 +01:00
Daniel García Aubert
bdce2f95f2 Add validations for columns 2017-12-18 20:42:26 +01:00
Daniel García Aubert
2dda0a80da Improve error context 2017-12-18 19:35:12 +01:00
Daniel García Aubert
0bca3d6f33 Validate placement, threshold and resolution 2017-12-18 13:42:27 +01:00
Javier Goizueta
423620b6c5
Merge pull request #813 from CartoDB/point-grid-bug 
Fix point-grid aggregation bug
 2017-12-15 11:27:56 +01:00
Javier Goizueta
877ed63090 Add tests for the different aggregation placement values 2017-12-15 11:14:17 +01:00
Ivan Malagon
8e9f61f9f1
Merge pull request #809 from CartoDB/analyses-filters-params 
Add `no_filters` param to dataviews
 2017-12-15 11:13:56 +01:00
Daniel García Aubert
434de7786c Fix test from merge 2017-12-14 18:26:15 +01:00
Daniel García Aubert
07b4cb78b1 Merge branch 'master' into mapconfig-aggregation 2017-12-14 18:19:54 +01:00
Ivan Malagon
97f8c361ed Merge branch 'master' into analyses-filters-params 2017-12-14 17:40:14 +01:00
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
Ivan Malagon
1664975dd1 Add spec 2017-12-13 10:43:43 +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
Simon Martín
19bb11adc5 line at EOF 2017-12-12 16:59:07 +01:00
Simon Martín
1bb716ef33 Merge branch 'master' into errorLogs 2017-12-12 16:15:30 +01:00
Ivan Malagon
50ddfaa968 Fix broken spec 2017-12-12 15:56:16 +01:00
Ivan Malagon
43fec74372 Modify params specs 2017-12-12 15:12:33 +01: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
Ivan Malagon
245d24ea29 Merge branch 'master' into analyses-filters-params 2017-12-12 11:54:32 +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
Simon Martín
1c6c3962db Merge branch 'master' into errorLogs 2017-12-11 12:59:42 +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