Commit Graph
66 Commits
Author SHA1 Message Date
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 4b97b4fd26 Fix typo 2017-12-20 14:35:47 +01:00
Daniel García Aubert 60030784c1 Export supported placements and create static methods to expose them in a fancy way 2017-12-20 12:42:29 +01:00
Daniel García Aubert cc9b190e5d Minor style formats 2017-12-19 16:17:37 +01:00
Daniel García Aubert 5a3dd6a914 Use supported placemets of aggregation-query 2017-12-19 13:00:18 +01:00
Daniel García Aubert bcd2fd8f88 Export supported placements 2017-12-19 12:59:33 +01:00
Daniel García Aubert 94a5e66881 Merge branch 'master' into full-sample 2017-12-19 12:47:36 +01:00
Daniel 1e08d946b1 Merge pull request #822 from CartoDB/aggregation-validation
Validate aggregation input params
2017-12-19 12:42:28 +01:00
Daniel García Aubert 326cad2f2c Typo 2017-12-19 10:54:20 +01:00
Daniel García Aubert 79b04bbdfd Rename param 2017-12-19 10:47:53 +01:00
Daniel García Aubert 45a663d5ae Split columns validator 2017-12-19 10:43:34 +01:00
Daniel García Aubert cace6169c0 Add function to create layer errors 2017-12-19 10:25:41 +01:00
Daniel García Aubert bdce2f95f2 Add validations for columns 2017-12-18 20:42:26 +01:00
Javier Goizueta 506e16fc87 Experimental full-sample aggregation 2017-12-18 20:18:37 +01:00
Daniel García Aubert c367743d76 Export SUPPORTED_AGGREGATE_FUNCTIONS 2017-12-18 20:06:16 +01:00
Daniel García Aubert fa7140e736 Rename argument 2017-12-18 19:52:50 +01:00
Daniel García Aubert c63226cd26 Improve function naming 2017-12-18 19:51:55 +01:00
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 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
Javier Goizueta e97147ddb4 Fix grid-point aggregation placement 2017-12-18 15:48:51 +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 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
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
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
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 52d1cd47db Do not validate aggregation missing columns. It will fail afterwards in map validation 2017-12-13 19:24:17 +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