Javier Goizueta
ba6cca46a1
Fix aggregation queries
2017-12-14 16:37:15 +01:00
Javier Goizueta
753ada0e76
Add cartodb_id to test datasets
2017-12-14 16:36:24 +01:00
Javier Goizueta
b81cfe418a
Always add a _cdb_feature_count to aggregated queries
2017-12-14 15:02:03 +01:00
Daniel García Aubert
8ee4a2c049
Merge branch 'mapconfig-aggregation' of github.com:CartoDB/Windshaft-cartodb into mapconfig-aggregation
2017-12-14 14:15:20 +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
Javier Goizueta
b0e47ecc62
Fix aggregation resolution parameter
...
It was implemented as the inverse of the intended value
2017-12-14 12:23:02 +01:00
Javier Goizueta
daa3fdca11
Fix bug in point-grid aggregation
2017-12-14 12:14:31 +01:00
Daniel García Aubert
bcfc43a517
jshint, my old friend
2017-12-14 11:22:00 +01:00
Daniel García Aubert
b83351a504
Use last release of windshaft
2017-12-13 20:07:23 +01:00
Daniel García Aubert
1edf684475
Fix test
2017-12-13 20:04:06 +01:00
Daniel García Aubert
0bc68d7144
Do not override sql_raw
2017-12-13 19:46:25 +01:00
Daniel García Aubert
52d1cd47db
Do not validate aggregation missing columns. It will fail afterwards in map validation
2017-12-13 19:24:17 +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
Javier Goizueta
6d30903531
Merge branch 'mapconfig-aggregation' of github.com:CartoDB/Windshaft-cartodb into mapconfig-aggregation
...
# Conflicts:
# lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
2017-12-13 12:53:20 +01:00
Javier Goizueta
4a63fed943
Simplify Aggregation classes
...
We're using the same aggregation queries for the Raster and Vector cases, so we don't need the class hierarchies used to handled them differently.
AggregationProxy has been renamed to Aggregation
2017-12-13 12:35:17 +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
aa43eb8953
Remove aggregation validation and use MapConfig validation
2017-12-12 20:10:42 +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
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
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
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
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
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
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
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
