Daniel García Aubert
777df6337b
Style typo
2017-12-18 19:47:11 +01:00
Daniel García Aubert
2dda0a80da
Improve error context
2017-12-18 19:35:12 +01:00
Daniel García Aubert
e2bd97eea6
Move validation to the constructor
2017-12-18 19:19:02 +01:00
Daniel García Aubert
fb03cd3424
Move aggregation validation to its own module
2017-12-18 19:17:43 +01:00
Daniel García Aubert
8a48b96c53
Rename file
2017-12-18 19:06:01 +01:00
Daniel García Aubert
76b0c94835
Rename file
2017-12-18 19:05:49 +01:00
Daniel García Aubert
6a36aa1f13
Order checks to validate if a layer should be adapted
2017-12-18 18:56:53 +01:00
Daniel García Aubert
800870e783
Remove local variable
2017-12-18 18:55:32 +01:00
Daniel García Aubert
6638ba91c3
Refactor supported geometry types
2017-12-18 18:53:44 +01:00
Daniel García Aubert
47e4b9da0d
Encapsulate threshold layer validation in aggregation-mapconfig
2017-12-18 18:43:14 +01:00
Daniel García Aubert
81e0c3a098
Add RESOLUTION default getter
2017-12-18 18:26:08 +01:00
Daniel García Aubert
2068861988
Add PLACEMENT default getter
2017-12-18 18:24:09 +01:00
Daniel García Aubert
878f3bd627
Move .sql() to aggregation-mapconfig
2017-12-18 18:17:01 +01:00
Daniel García Aubert
170fcc1973
Move static methods
2017-12-18 17:42:12 +01:00
Daniel García Aubert
d0c88ce21d
Improve naming
2017-12-18 17:26:41 +01:00
Daniel García Aubert
e81a16ce0d
Improve validation by applying refactor
2017-12-18 14:31:53 +01:00
Daniel García Aubert
153a792fcb
Improve validation by applying refactor
2017-12-18 14:25:44 +01:00
Daniel García Aubert
5c1b1e3214
Improve validation by applying refactor
2017-12-18 14:21:03 +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
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
Javier Goizueta
81e54660bb
Fix point-grid aggregation bug
2017-12-15 10:52:41 +01:00
Raul Ochoa
a0c24d132e
Use source query as attribute instead of function
2017-12-14 18:43:59 +00:00
Daniel García Aubert
07b4cb78b1
Merge branch 'master' into mapconfig-aggregation
2017-12-14 18:19:54 +01:00
Javier Goizueta
6b472c0b20
Experimental aggregation dimensions
...
This is not meant por public consumption (exposing SQL expressions is undesiderable)
2017-12-14 17:51:49 +01:00
Ivan Malagon
97f8c361ed
Merge branch 'master' into analyses-filters-params
2017-12-14 17:40:14 +01:00
Javier Goizueta
0c044636ef
Fix mode aggregation
2017-12-14 17:22:50 +01:00
Javier Goizueta
f95c310462
Redefine aggregation torque to match Torque
...
Now the resolution aggregation parameter has the same meaning as in Torque (-torque-resolution in CartoCSS)
2017-12-14 17:04:23 +01:00
Javier Goizueta
9d8ce6bc44
Refactor aggregation resolution
2017-12-14 17:04:23 +01:00
Javier Goizueta
507d105ab2
Add mode aggregation
2017-12-14 16:37:40 +01:00
Javier Goizueta
ba6cca46a1
Fix aggregation queries
2017-12-14 16:37:15 +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
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
Ivan Malagon
02ac25181e
Return error if no_filters and own_filter are present
2017-12-13 09:45:35 +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
Daniel García Aubert