Commit Graph
25 Commits
Author SHA1 Message Date
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
Daniel García Aubert 6fe73862f3 Create a MapConfig's subclass to delegate aggregation 2017-12-13 11:42:51 +01:00
Javier Goizueta 4193f96c03 Fix point-grid aggregation query 2017-12-12 17:38:39 +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
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
Daniel García Aubert e26cfb2efb Remove magic number 2017-12-12 13:32:01 +01:00
Javier Goizueta b2fcbdd8a3 Implement aggregation columns 2017-12-12 11:22:09 +01:00
Javier Goizueta 2edcbb4724 Implement aggregation queries.
Implmented for placements: centroid, point-gird, point-sample.
Aggregated columns not yet implemented (only count).
Aggregation could be made more efficient by using quadkeys
2017-12-11 18:33:06 +01:00
Daniel García Aubert 4f8b541010 Mark aggregation queries 2017-12-05 13:12:25 +01:00
Daniel García Aubert 077f19d506 Integrate aggregation and get metadata for layergroup 2017-12-04 12:40:53 +01:00
Daniel García Aubert 6f04214f5d Simplify to pass test 2017-12-01 17:06:03 +01:00
Daniel García Aubert d937ed31d5 Add params to instantiate aggregation 2017-11-30 19:10:57 +01:00
Daniel García Aubert 73ae736603 Add aggregation proxy 2017-11-30 19:02:30 +01:00
Daniel García Aubert 1767b83d09 Aggregation query models: bootstrap hierarchy classes 2017-11-30 15:34:20 +01:00