Simon Martín
90418b204e
getLowerRateLimit tests
2018-02-26 10:51:51 +01:00
Simon Martín
918674e01a
changing endpoint groups names
2018-02-23 21:09:27 +01:00
Simon Martín
9b01a05727
rate limit supporting multiple limits
2018-02-23 17:42:24 +01:00
Simon Martín
2937b6a804
updating redis keys
2018-02-21 17:25:26 +01:00
Simon Martín
08a5e57180
new config params and using them in middleware
2018-02-20 18:18:15 +01:00
Simon Martín
faab174a79
redis keys in easier way
2018-02-20 17:19:50 +01:00
Eneko Lakasta
521b441da5
default apikey is returned by metadata module if no apikey found, remove this code because is never going to be run
2018-02-20 12:53:33 +01:00
Eneko Lakasta
59ca00b33b
move apikey credentials getter to middleware file
2018-02-20 12:31:36 +01:00
Simon Martín
80918f5b9b
adding rate limit middlewware to named maps controller
2018-02-20 11:26:24 +01:00
Simon Martín
e061b3e631
adding rate limit middlewware to maps controller
2018-02-20 11:26:09 +01:00
Simon Martín
06ec3f80b9
adding rate limit middlewware to named maps admin controller
2018-02-20 11:25:56 +01:00
Simon Martín
e6011287f4
adding middleware to layergroup controller
2018-02-20 11:25:16 +01:00
Daniel García Aubert
7c7d606aa7
Remove trailing spaces
2018-02-19 19:05:13 +01:00
Daniel García Aubert
603ef4044c
Reduce cyclomatic complexity
2018-02-19 18:48:02 +01:00
Daniel García Aubert
2e3abfb2cd
Catch "name not found" errors from metadata backend and set http code status 404
2018-02-19 18:28:58 +01:00
Simon Martín
98907a886c
using a real endpoint in test
2018-02-19 17:08:26 +01:00
Eneko Lakasta
7e14247ea9
remove cause of unreachable code/dead code. Not necessary because carto redis assures at least the default api key
2018-02-19 17:06:59 +01:00
Simon Martín
e519984790
changing const names and exporting them
2018-02-19 17:01:41 +01:00
Eneko Lakasta
7b21bd26d0
Merge branch 'project-auth-api' into project-auth-api-fallback
2018-02-16 11:29:36 +01:00
Eneko Lakasta
4ac224688c
in fallback mode, use default api key if api key token doesnt exist
2018-02-16 11:20:04 +01:00
Eneko Lakasta
cda2616a8a
get and check api key credentials from api key: username and token
2018-02-15 17:49:47 +01:00
Eneko Lakasta
18dbeea003
get apikey token from request in named maps admin middleware
2018-02-15 15:20:52 +01:00
Eneko Lakasta
3e916c6054
check if req.query exist before getting req.query.api_key/map_key
2018-02-15 15:20:05 +01:00
Eneko Lakasta
fc420c2c0f
use for compatibility res.locals.api_key instead of res.locals.apikeyToken
2018-02-15 15:19:09 +01:00
Eneko Lakasta
5db0e9c8d8
add middleware for apikeyToken
2018-02-15 12:50:42 +01:00
Simon Martín
63d1c19263
validation in lua script
2018-02-15 12:44:27 +01:00
Eneko Lakasta
963737d3fb
create lib for getting api key token from request
2018-02-15 11:36:42 +01:00
Simon Martín
c059f44bf1
lua script and rate limit process
2018-02-14 18:39:57 +01:00
Eneko Lakasta
890f0d1ef6
add fallback for using metadata fallback
2018-02-14 17:31:05 +01:00
Simon Martín
5fca005a3f
Merge branch 'master' into rateLimits
2018-02-14 15:40:50 +01:00
Simon Martín
86d4f8e219
lua script v1
2018-02-14 15:40:12 +01:00
Rafa de la Torre
251fe96509
Cosmetic fix, as suggested in PR
2018-02-12 19:24:53 +01:00
Simon Martín
15bf74f770
starting rate limit middleware
2018-02-12 17:19:08 +01:00
Eneko Lakasta
e1a2ee2381
control API access grants
2018-02-08 13:07:25 +01:00
Eneko Lakasta
b82d26527a
remove comment
2018-02-08 12:35:44 +01:00
Eneko Lakasta
b0e9df1400
add pgConnection.getDatabaseParams
2018-02-08 12:04:03 +01:00
Eneko Lakasta
6ebf51ce45
let select apikey type in setDBAuth: regular, default, master
2018-02-08 11:29:17 +01:00
Eneko Lakasta
41f3606572
return unauthorized error when api key not found
2018-02-07 19:12:14 +01:00
Eneko Lakasta
ea0542dcb1
remove use of step
2018-02-07 18:48:59 +01:00
Eneko Lakasta
a4dbc1bac2
remove step and check existance of proper api key
2018-02-07 18:20:56 +01:00
Rafa de la Torre
065f56e161
Improve the speed of the aggregation dataview
...
Improve the performance of the aggregation dataview.
Instead of using a CTE (WITH) for filtered_source, which is only used in
one place to calculate ranks, inject it as a subquery.
This way the planner has a chance to ignore uneeded columns as well as
to parallelize the exectution of the window function (WindowAgg in the
query plan).
That is the part that takes most of the time of the query.
The improvement is about 20-40% in speed on PG10 with 4 cores.
2018-02-07 18:10:13 +01:00
Eneko Lakasta
95538707c9
add parameter asMaster to setDBAuth
2018-02-07 17:14:13 +01:00
Eneko Lakasta
4c76a921b1
use res.locals instead of req.params
2018-02-07 16:02:13 +01:00
Eneko Lakasta
85c1c987af
refactor setDBConn to not use step
2018-02-07 15:49:32 +01:00
Eneko Lakasta
bde86323fd
use master api key in setDBAuth
2018-02-07 15:36:24 +01:00
Eneko Lakasta
880e3f388d
remove use of _.extend calls
2018-02-07 12:46:10 +01:00
Eneko Lakasta
c1535b1a12
refactor setDBAuth to not use step
2018-02-07 12:40:36 +01:00
Raul Marin
f9fe3ace37
Add mapnik metrics option
2018-02-06 16:07:22 +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
27b5420358
Merge pull request #856 from CartoDB/841-the_geom_webmercator-type
...
Check the type of the_geom_webmercator for aggregation
2018-01-29 16:13:19 +01:00
Javier Goizueta
7641542e67
Check the type of the_geom_webmercator for aggregation
...
Fixes #841
2018-01-29 15:48:35 +01:00
Eneko Lakasta
2bd4c9e814
Merge pull request #851 from CartoDB/1259-category-widget-error-group-by-missing
...
use original column name in group by instead of alias
2018-01-29 15:38:07 +01:00
Eneko Lakasta
941ebf7d80
Merge branch 'master' into 1259-category-widget-error-group-by-missing
2018-01-29 14:51:59 +01:00
Simon Martín
c38bf6ade8
Merge branch 'master' into respect-types-aggreagation
2018-01-29 14:51:20 +01:00
Javier Goizueta
f644b3a226
Add cartodb_id to point-grid aggregation
...
Fixes #846
2018-01-29 12:49:27 +01:00
Simon Martín
8c839e214d
changing the value of string
2018-01-26 15:44:21 +01:00
Simon Martín
99421b613c
moving 'other' outside of the query allowing queries of different types
2018-01-26 15:24:21 +01:00
Simon Martín
bc7a556297
removing category cast to string in aggregation
2018-01-26 12:37:10 +01:00
Eneko Lakasta
220f1d6a73
use original column name in group by instead of alias
2018-01-18 15:27:54 +01:00
Daniel García Aubert
da32d96607
Fix regression: default to all layers if layer filter is not provided
2018-01-16 17:57:22 +01:00
Daniel García Aubert
76da828168
Use error label as middleware argument
2018-01-16 17:55:09 +01:00
Daniel García Aubert
ce4050e3e3
Extrac method to get only user params
2018-01-15 18:09:54 +01:00
Daniel García Aubert
b82767c60d
Pass a copy of res.locals w/o new data boud to named-map-provider-cache
2018-01-15 17:40:34 +01:00
Eneko Lakasta
0236935212
please jshint
2018-01-11 12:22:51 +01:00
Eneko Lakasta
ae48a01e26
extract setICUEnvVariable() to it's own module
2018-01-11 11:57:11 +01:00
Daniel
fc82ca7490
Merge pull request #834 from CartoDB/middlewarify-named-maps-controller
...
Middlewarify named maps controller
2018-01-09 11:40:59 +01:00
Daniel García Aubert
183c8291bc
Use arrow functions when it applies
2018-01-09 11:20:20 +01:00
Daniel García Aubert
d908ffdbca
Don't use arrow functions when there is no needed
2018-01-09 11:17:07 +01:00
Raul Ochoa
d5b5ef584d
Be explicit about requesting urlTemplate+subdomains format
2018-01-03 23:33:59 +00:00
Raul Ochoa
2cda43dc8d
Promote https urls over http
2018-01-03 22:18:59 +00:00
Raul Ochoa
f7f513a61a
Add urlTemplate URLs to metadata
...
This is useful when using client libraries like leaflet.
2018-01-03 20:53:03 +00:00
Raul Ochoa
f297374449
Merge pull request #837 from CartoDB/tilejson
...
Return tilejson in metadata
2018-01-03 20:13:44 +01:00
Raul Ochoa
060b93c314
Rename middleware fn name
2018-01-03 18:44:10 +00:00
Raul Ochoa
bf40b240d3
Return tilejson in metadata
...
It returns tilejson for each individual layer and also for all vector and raster layers.
2018-01-03 16:54:45 +01:00
Raul Ochoa
5d4d2bddd6
Implementation for getTilesUrls
...
This will be useful for generating the tilejson in the metadata
2018-01-03 16:05:19 +01:00
Daniel
788bc302a0
Merge pull request #833 from CartoDB/middlewarify-named-map-admin-controller
...
Middlewarify named map admin controller
2018-01-03 13:20:14 +01:00
Daniel García Aubert
1ba240d099
Rename middleware function
2018-01-03 13:15:11 +01:00
Daniel García Aubert
1c7da2c4b3
Going green: do not fail when map-config is vector-only and a layer doesn't have points
2018-01-03 12:00:25 +01:00
Daniel García Aubert
49c97e2cf2
Use default argument
2018-01-02 10:56:45 +01:00
Daniel García Aubert
41e65a9633
Remove max cyclomatic complexity
2018-01-01 18:06:56 +01:00
Daniel García Aubert
feae766e62
Create middleware to fetch named map template
2018-01-01 16:54:35 +01:00
Daniel García Aubert
e3bdeec8ca
Simplify middleware
2018-01-01 16:21:22 +01:00
Daniel García Aubert
80c4207c74
Remove underscore dependencie
2017-12-30 18:18:37 +01:00
Daniel García Aubert
80e4306fbc
Remove step and assert dependencies
2017-12-30 18:03:26 +01:00
Daniel García Aubert
543d257a20
Move sendResponse to a middleware
2017-12-30 17:18:12 +01:00
Daniel García Aubert
8a023e3d2f
Keep error label
2017-12-30 16:08:46 +01:00
Daniel García Aubert
f13b45862d
Move incrementMapViews to a middlewares
2017-12-30 16:04:24 +01:00
Daniel García Aubert
731fe4c00f
Move getStaticImageOptions and getImage to a middlewares
2017-12-30 15:21:20 +01:00
Daniel García Aubert
500cbb959f
Move method to a middleware
2017-12-30 14:13:23 +01:00
Daniel García Aubert
108a319143
Do not use step
2017-12-29 19:33:49 +01:00
Daniel García Aubert
ef5ea5b4cb
Create and use getNamedMapProvider middleware
2017-12-29 19:31:02 +01:00
Raul Ochoa
10d1381e51
Merge remote-tracking branch 'origin/master' into pg-mvt-do-not-filter-columns
2017-12-29 17:50:09 +00:00
Daniel García Aubert
dfef7ff3c0
Use spread assignment
2017-12-29 18:45:45 +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
adb9e55fb2
Avoid snake_case notation
2017-12-29 16:30:42 +01:00
Daniel García Aubert
5d3726de44
Use original variable name
2017-12-29 16:24:38 +01:00
Daniel García Aubert
f186e4736b
Use template string
2017-12-29 16:19:00 +01:00
Daniel García Aubert
a00c2b1eef
Now main middlewares return a named function with the right context bound
2017-12-29 16:15:48 +01:00
Daniel García Aubert
64d601179d
Use const instead of var
2017-12-29 15:22:17 +01:00
Daniel García Aubert
cf2b73e473
Move to up intermediate middlewares
2017-12-29 15:19:52 +01:00
Daniel García Aubert
70932c23df
Remove step and assert dependencies
2017-12-29 15:17:29 +01:00
Daniel García Aubert
519d49bd10
Remove finish function and respond in the main middleware
2017-12-29 15:04:44 +01:00
Daniel García Aubert
bf814c4442
keep error label
2017-12-29 13:05:01 +01:00
Daniel García Aubert
f136993c50
Use checkContentType middleware
2017-12-29 12:44:56 +01:00
Daniel García Aubert
ba008ab518
Remove unused function
2017-12-29 12:36:56 +01:00
Daniel García Aubert
e4ed6ee1cc
Use authorizedByAPIKey middleware
2017-12-29 12:34:50 +01:00
Daniel García Aubert
fda7661dad
Create authorizedByAPIKey middleware
2017-12-29 12:23:52 +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
9a1bc51fdb
Use aggregation-mapconfig's method to discover columns to be exposed used to aggregate
2017-12-28 13:12:41 +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
Raul Marin
031e1253ca
Numeric histograms: Avoid conflicts with 'bin' named columns
2017-12-22 17:12:57 +01:00
Raul Marin
8012d76b68
Timeseries: Avoid collisions with columns named 'timestamp'
2017-12-22 15:58:40 +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
f22216e6d2
Catch error threw from constructor and follow node callback pattern
2017-12-19 12:23:54 +01:00
Raul Marin
418f5faa11
Date histogram: Reduce the threshold to change in auto mode to 100
2017-12-19 12:09:14 +01:00
Raul Marin
bba6db9dbf
Date histogram: Add second, decade, century and millenium aggregations
2017-12-19 12:09:14 +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
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
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
Javier Goizueta
e97147ddb4
Fix grid-point aggregation placement
2017-12-18 15:48:51 +01:00
Simon Martín
77f64bee8c
stringifyForLogs more usual case first
2017-12-18 14:54:36 +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
Simon Martín
14e90a6c76
add line at EOF
2017-12-18 12:59:44 +01:00
Simon Martín
a46f7b3099
nested options and using it
2017-12-18 12:34:56 +01:00
Simon Martín
cb7fb97a13
escape chars function
2017-12-18 11:14: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
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
Simon Martín
1bb716ef33
Merge branch 'master' into errorLogs
2017-12-12 16:15:30 +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
Mario de Frutos
8d16bf566d
Force png tile generation for static maps ( #808 )
...
* Force png tile generation for static maps
If the user tries to generate a static map requesting JPG it will fail
because is going to try to generate the tiles using JPG as format which
is not supported by now, this bug was introduced in the version 4.0.1
So we now force, again, the tiles to be generated as PNG but we pass
the requested format, JPG, to windshaft to generate the final image as
the user reqests
* Added support to define image format in the image assertions
* Added test for JPEG static image generation
Also I've added support for:
- JPEG images
- Different tolerance based on the file type, it seems that due to
different compression we need different tolerance for JPG images
2017-12-12 13:20:22 +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
Ivan Malagon
245d24ea29
Merge branch 'master' into analyses-filters-params
2017-12-12 11:54:32 +01:00
Ivan Malagon
605be77a04
Add nofilters query param
2017-12-12 11:54:09 +01:00
Daniel García Aubert
acd0610517
Merge branch 'mapconfig-aggregation' of github.com:CartoDB/Windshaft-cartodb into mapconfig-aggregation
2017-12-12 11:31:56 +01:00
Javier Goizueta
b2fcbdd8a3
Implement aggregation columns
2017-12-12 11:22:09 +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
Simon Martín
b3d7909849
removing default error log value
2017-12-12 11:03:52 +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
006dd86614
Merge branch 'master' into mapconfig-aggregation
2017-12-11 17:36:58 +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
Simon Martín
1c6c3962db
Merge branch 'master' into errorLogs
2017-12-11 12:59:42 +01:00
Raul Marin
7c5b7641d8
Date histogram: Add missing GROUP BY column
2017-12-11 11:27:13 +01:00
Raul Marin
1b405e42c2
Date histogram optimizations
2017-12-11 11:27:13 +01:00
Raul Marin
088a8b81a6
Timeseries tests: Set timestamps to the start of the aggregations
...
Also, increase the end of the range check so it includes some data
2017-12-11 11:27:13 +01:00
Raul Marin
243e982bd6
Optimize formulae queries
2017-12-11 11:27:13 +01:00
Raul Marin
dfe01c836c
Escape getQueryRowCount with $$
2017-12-11 11:27:13 +01:00
Raul Marin
fcbf5ffcc5
Move sql helper functions to query-utils.js
2017-12-11 11:27:13 +01:00
Raul Marin
90c9ad18e0
Optimize histogram queries
2017-12-11 11:27:13 +01:00
Daniel García Aubert
214d684fcc
Adapt layer when is vector only map-caonfig
2017-12-05 20:39:30 +01:00
