Raul Ochoa
fb7f79594d
Merge remote-tracking branch 'origin/master' into mapconfig-aggregation
2017-12-12 17:15:22 +00:00
Daniel García Aubert
f390a10830
Remove methods that check map-config aggregation and use the ones that MapConfig model provides
2017-12-12 17:58:42 +01:00
Javier Goizueta
4193f96c03
Fix point-grid aggregation query
2017-12-12 17:38:39 +01:00
Raul Ochoa
afa1e2881f
Stubs next version
2017-12-12 16:24:12 +00:00
Raul Ochoa
3fa6750f9a
Release 4.4.0
2017-12-12 16:23:37 +00:00
Raul Ochoa
1c842c1592
Merge pull request #810 from CartoDB/upgrade-camshaft
...
Upgrades camshaft to 0.60.0
2017-12-12 17:22:06 +01:00
Raul Ochoa
3c88634d09
Upgrades camshaft to 0.60.0
2017-12-12 16:14:49 +00:00
Simon Martín
19bb11adc5
line at EOF
2017-12-12 16:59:07 +01:00
Javier Goizueta
4405d61845
Remove support for arbitrary aggregation SQL expressions.
...
Only the supported aggregate functions can be used now, currently count, sum, avg, min & max.
2017-12-12 16:17:42 +01:00
Simon Martín
1bb716ef33
Merge branch 'master' into errorLogs
2017-12-12 16:15:30 +01:00
Javier Goizueta
eb2825eea8
Merge branch 'mapconfig-aggregation' of github.com:CartoDB/Windshaft-cartodb into mapconfig-aggregation
...
# Conflicts:
# lib/cartodb/models/aggregation/aggregation-templates.js
2017-12-12 16:08:58 +01:00
Ivan Malagon
811f2bdae3
Fix linter problem
2017-12-12 16:04:25 +01:00
Ivan Malagon
53bc14bc9e
Add missing contributors
2017-12-12 16:02:39 +01:00
Ivan Malagon
50ddfaa968
Fix broken spec
2017-12-12 15:56:16 +01:00
Daniel García Aubert
ae35acd21d
typo
2017-12-12 15:54:36 +01:00
Daniel García Aubert
d4d32bdfa3
Make jshint more happy
2017-12-12 15:53:35 +01:00
Javier Goizueta
3b7db0b08f
Fix typo
2017-12-12 15:48:25 +01:00
Ivan Malagon
43fec74372
Modify params specs
2017-12-12 15:12:33 +01:00
Mario de Frutos
c7f5f310f0
Stubs next version
2017-12-12 13:46:54 +01:00
Daniel García Aubert
e26cfb2efb
Remove magic number
2017-12-12 13:32:01 +01:00
Mario de Frutos
b32d056efe
Updated NEWS.md
2017-12-12 13:22:57 +01:00
Mario de Frutos
65308ea2eb
Updated NEWS.md
2017-12-12 13:21:27 +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
0b27d174ef
Check if query retrieves results
2017-12-12 12:53:29 +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
Daniel García Aubert
faaebaa07d
Remove console.log
2017-12-12 12:02:10 +01:00
Daniel García Aubert
eceffda87f
Do not use control flag
2017-12-12 12:01:25 +01:00
Daniel García Aubert
e93fe13b41
Get the right columns from aggregation
2017-12-12 11:57:38 +01:00
Ivan Malagon
245d24ea29
Merge branch 'master' into analyses-filters-params
2017-12-12 11:54:32 +01:00
Ivan Malagon
605be77a04
Add nofilters query param
2017-12-12 11:54:09 +01:00
Daniel García Aubert
acd0610517
Merge branch 'mapconfig-aggregation' of github.com:CartoDB/Windshaft-cartodb into mapconfig-aggregation
2017-12-12 11:31:56 +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
Javier Goizueta
b2fcbdd8a3
Implement aggregation columns
2017-12-12 11:22:09 +01:00
Daniel García Aubert
2f68d658f0
Remove local variable
2017-12-12 11:10:12 +01:00
Daniel García Aubert
85e7245a33
Remove control flag
2017-12-12 11:07:04 +01:00
Simon Martín
2db2546cca
changing error log format
2017-12-12 11:04:06 +01:00
Simon Martín
b3d7909849
removing default error log value
2017-12-12 11:03:52 +01:00
Simon Martín
b035b5d384
Merge branch 'master' into errorLogs
2017-12-12 10:59:07 +01:00
Daniel García Aubert
f52cc276be
Remove control flag
2017-12-12 10:57:50 +01:00
Daniel García Aubert
c637caf9c9
Replace nested conditional with guard clause
2017-12-12 10:56:23 +01:00
Daniel García Aubert
d405987a96
Replace nested conditional with guard clause
2017-12-12 10:49:05 +01:00
Daniel García Aubert
06efe410ef
Replace nested conditional with guard clause (early return)
2017-12-12 10:43:49 +01:00
Daniel García Aubert
5bf4eba215
Remove unused thenable
2017-12-11 19:35:59 +01:00
Daniel García Aubert
87c4848e19
Improve namig
2017-12-11 19:22:15 +01:00
Daniel García Aubert
3f075ca432
Remove unused argument
2017-12-11 19:18:29 +01:00
Daniel García Aubert
6725025e1a
Improve naming for a method
2017-12-11 19:17:32 +01:00
Daniel García Aubert
8d42909eab
Change argument order to be more consistent
2017-12-11 19:14:16 +01:00
Daniel García Aubert
d947700646
Get connection at the begining of adapt layers functionality
2017-12-11 19:12:10 +01:00
Daniel García Aubert
cc68b84212
Extract checkLayerAggregationMetadata method
2017-12-11 19:06:53 +01:00
