Commit Graph
155 Commits
Author SHA1 Message Date
Daniel García Aubert f22216e6d2 Catch error threw from constructor and follow node callback pattern 2017-12-19 12:23:54 +01:00
Daniel García Aubert 326cad2f2c Typo 2017-12-19 10:54:20 +01:00
Daniel García Aubert 34808d6147 Improve naming 2017-12-19 10:50:53 +01:00
Daniel García Aubert 2dda0a80da Improve error context 2017-12-18 19:35:12 +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 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
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
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 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
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
Daniel García Aubert e26cfb2efb Remove magic number 2017-12-12 13:32:01 +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 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 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
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
Daniel García Aubert 446449bbde Move variable declaration close to the place that it's used 2017-12-11 18:47:20 +01:00
Daniel García Aubert b1f788fb57 Remove unuseful callback 2017-12-11 18:42:03 +01:00
Daniel García Aubert f80e7112bc Merge branch 'mapconfig-aggregation' of github.com:CartoDB/Windshaft-cartodb into mapconfig-aggregation 2017-12-11 18:35:54 +01:00
Daniel García Aubert 68f967e582 Extract adaptLayer method 2017-12-11 18:34:22 +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 dab204ea71 Do not aggregate if rows cout is lower than threshold or the layer's sql has geometries distinct of points 2017-12-11 17:32:06 +01:00
Daniel García Aubert 214d684fcc Adapt layer when is vector only map-caonfig 2017-12-05 20:39:30 +01:00
Daniel García Aubert e7592ee570 Improve error message 2017-12-05 17:44:52 +01:00
Daniel García Aubert 7b35701fa8 Extract method 2017-12-05 16:50:18 +01:00