Commit Graph
95 Commits
Author SHA1 Message Date
Javier Goizueta e0cd1aba29 Refactor: move common token substitutions to query-utils 2018-06-18 13:15:45 +02:00
Javier Goizueta ffa3a96f1a Use unique cartodb_id in aggregated results
See #889
FOr centroid and point-grid the cartodb_id wasn't unique across tiles.
2018-04-05 14:06:27 +00:00
Javier Goizueta 44424583f0 Revert "Use unique cartodb_id in aggregated results"
This reverts commit c1da1a8a16.
This is reverted for moving the change out of PR #913 into its own PR for clarity.
2018-04-05 12:12:58 +02:00
Javier Goizueta e8cd6856b5 Add missing aggregation columns to ST_AsMVT
Aggregation results always should have the cartodb_id and the feature count
2018-04-04 17:18:56 +02:00
Javier Goizueta dc706aeb43 Fix bug with dimension aliases
The point-sample aggregation query failed if dimensions had alias different from the base columns
2018-04-04 16:29:40 +02:00
Javier Goizueta 2132960d7c Fix non-default aggregation columns
The columns for non-default aggregations were the base columns not the resulting aggregated columns
In particular this could cause invalid wrapped SQL code to be passed to ST_AsMVT when the Windshaft pg-mvt renderer was used.
2018-04-04 15:25:08 +02:00
Javier Goizueta c1da1a8a16 Use unique cartodb_id in aggregated results
See #889
FOr centroid and point-grid the cartodb_id wasn't unique across tiles.
2018-04-04 11:05:03 +02:00
Javier Goizueta b9de49d5ab Remove superfluous aggregation filter condition
The default aggregation doesn't admit filters, so this wasn't necessary.
2018-03-21 17:36:26 +01:00
Javier Goizueta 6ada8ba6a2 Implement aggregation filters 2018-03-21 17:01:32 +01:00
Javier Goizueta 2e7784ddf2 Add comment to clafify aggregation resolution limit 2018-02-01 10:26:52 +01:00
Javier Goizueta d88fbbaa87 Use camelCase 2018-01-31 18:55:28 +01:00
Javier Goizueta 7db0744f67 Simplify expression 2018-01-31 17:54:40 +01:00
Javier Goizueta d1fcd797a3 Limit the minimum size of the the aggregation grid
Fixes #860
2018-01-31 17:46:13 +01:00
Javier Goizueta 7641542e67 Check the type of the_geom_webmercator for aggregation
Fixes #841
2018-01-29 15:48:35 +01:00
Javier Goizueta f644b3a226 Add cartodb_id to point-grid aggregation
Fixes #846
2018-01-29 12:49:27 +01:00
Daniel García Aubert 83d0ce4040 Rename method 2017-12-29 18:25:08 +01:00
Daniel García Aubert 75f72c4d07 Return empty aggregation configuration when the map-config is vector-only and the layer has no aggregation 2017-12-29 17:52:28 +01:00
Daniel García Aubert 99b95cf839 Move check of default-aggregation to mapconfig model 2017-12-28 13:50:59 +01:00
Daniel García Aubert d42257127b Add method to discover required columns or all of them if it's a default aggregation 2017-12-28 13:11:32 +01:00
Daniel García Aubert 418c8691d1 Support default full-sample aggregation for postgis vector renderer 2017-12-27 20:08:43 +01:00
Daniel García Aubert 9885045b41 Do not default to null 2017-12-27 12:48:06 +01:00
Daniel García Aubert 062e6f9594 Merge branch 'full-sample' of github.com:CartoDB/Windshaft-cartodb into pg-mvt-do-not-filter-columns 2017-12-27 12:45:43 +01:00
Daniel García Aubert a43779b050 Get columns from layer query a set them into layer opptions 2017-12-22 18:19:57 +01:00
Javier Goizueta d726c9ad01 Fix point-sample aggregation
it failed in  the case of aggregate columns with the name of base columns
2017-12-22 15:48:30 +01:00
Javier Goizueta 1ce8076699 Change default aggregation placement to point-sample
For consistency with the default aggregation.
2017-12-22 15:46:29 +01:00
Daniel García Aubert b7ecde5c9d Add function get columns for layer's query 2017-12-22 13:43:30 +01:00
Daniel García Aubert efdfabf3e9 Remove method 2017-12-22 12:14:34 +01:00
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 a1d536642e Merge branch 'full-sample' into pg-mvt-do-not-filter-columns 2017-12-21 20:01:07 +01:00
Daniel García Aubert 3c00266666 Add support for aggregated columns in mvt format 2017-12-21 20:00:17 +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