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
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
Daniel García Aubert
4f8b541010
Mark aggregation queries
2017-12-05 13:12:25 +01:00
Daniel García Aubert
55dd049812
Be able to skip aggregation to create a layergroup with aggregation defined already
2017-12-05 12:59:32 +01:00
Daniel García Aubert
855f47e446
Detect incompatible CartoCSS or interactivity for raster aggregation
2017-12-04 19:48:06 +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
52630b8084
Minor improvementes
2017-12-01 17:06:42 +01:00
Daniel García Aubert
6f04214f5d
Simplify to pass test
2017-12-01 17:06:03 +01:00
Daniel García Aubert
f376a7cdd5
Use aggregation adapter before the overviews one
2017-12-01 17:05:01 +01:00
Daniel García Aubert
0887e5d5f7
Extract method
2017-12-01 15:43:15 +01:00
Daniel García Aubert
d01857923e
Plug aggregation mapconfig adapter
2017-11-30 19:31:00 +01:00
Daniel García Aubert
deb29f2c77
Implement aggregation mapconfig adapter (happy case)
2017-11-30 19:20:59 +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
Simon Martín
e0d4a9e596
change funcion name
2017-11-30 15:04:07 +01:00
Simon Martín
555d3f558c
changing error log structure
2017-11-28 18:22:55 +01:00
Simon Martín
386d6bfea8
removing unneeded check
2017-11-28 18:19:28 +01:00
Simon Martín
a007fce913
ensuring vars
2017-11-28 16:02:12 +01:00
Simon Martín
605d7057c9
fix copying array of errors and adding error.label to logs
2017-11-27 18:12:44 +01:00
Simon Martín
60e4defa66
default value in errors header
2017-11-27 17:04:50 +01:00
Simon Martín
e7b8d9b223
moving logErrors to right position
2017-11-27 16:55:11 +01:00
Simon Martín
e041b5b8a9
removing ~lost space
2017-11-27 16:52:19 +01:00
Simon Martín
9a8f72b8db
format details
2017-11-27 16:47:45 +01:00
Simon Martín
667925c455
adding error name, ensuring data and moving errors copy
2017-11-27 16:43:04 +01:00
Simon Martín
f24217a400
cloning object and removing logs
2017-11-24 18:06:17 +01:00
Simon Martín
84fd01535c
adding errors to errors header
2017-11-24 17:53:07 +01:00
Daniel García Aubert
1a78b8a75a
Merge branch 'master' into middlewarify-analyses-controller
2017-11-23 11:47:57 +01:00
Daniel García Aubert
e131df601c
Use ES6 template string for route definition
2017-11-19 14:05:20 +01:00
Daniel García Aubert
bee04e2553
Usr ES6 string templates
2017-11-19 12:51:35 +01:00
Daniel García Aubert
37111f396d
Unify get catalog and tables middlewares
2017-11-19 12:37:09 +01:00
Daniel García Aubert
4df46fe5ea
Move creation of PG client to a middleware
2017-11-17 19:20:42 +01:00
Daniel García Aubert
b1b2054f0a
Split metadata function into two middlewares
2017-11-17 19:14:31 +01:00
Daniel García Aubert
c1f2b96bfc
Remove step from catalog middleware
2017-11-17 18:32:46 +01:00
Daniel García Aubert
804c6645fa
Make catalog method a regular middleware factory
2017-11-17 18:28:37 +01:00
Daniel García Aubert
5d6ccc07fd
Move functionality that prepares catalog to be used as response
2017-11-17 18:25:13 +01:00
Daniel García Aubert
a585ba5480
Use early retutn node pattern
2017-11-17 18:07:19 +01:00
Simon Martín
0aaafa2068
Merge branch 'master' into res-locals-user
2017-11-16 11:03:43 +01:00
Simon Martín
ccce598b04
Merge branch 'master' into res-locals-user
2017-11-15 18:37:49 +01:00
Simon Martín
667b2a9cb1
removing underscore dependency in locals middleware
2017-11-15 16:56:21 +01:00
Simon Martín
298882f410
remove with spaces and adding line as EOF
2017-11-15 15:07:30 +01:00
Simon Martín
22e3016cd3
Merge branch 'master' into timeoutVectorImage
2017-11-14 15:54:16 +01:00
Daniel García Aubert
d5c552a03a
Move functionality that sets cache control header to a middleware
2017-11-14 13:53:42 +01:00
Daniel García Aubert
a5347c27e3
Move sendResponse method to a middleware
2017-11-14 13:49:12 +01:00
Daniel García Aubert
27521964c7
Remove schema from analyses catalog query perfoming that query in the same way that we do for pooling the node status in analyses backend
2017-11-14 12:01:21 +01:00
Daniel García Aubert
bdf4827300
Fix bad call to next middleware callback
2017-11-14 11:28:06 +01:00
Daniel García Aubert
38ca5db51b
Inline method to set cache-cannel, rollback extract setCacheChannel method for named maps controller
2017-11-13 12:35:46 +01:00
Daniel García Aubert
590233e3ee
Inline method to set cache-cannel, rollback extract setCacheChannel method
2017-11-13 12:15:12 +01:00
Daniel García Aubert
6f59c61c8b
Add more steps while profiling
2017-11-08 14:27:35 +01:00
Daniel García Aubert
aff5fcda63
Add namespace for getMapConfig step while profiling
2017-11-08 14:08:27 +01:00
Daniel García Aubert
56d33b7f5b
Add profiling
2017-11-08 10:52:25 +01:00
Daniel
749b205944
Merge pull request #788 from CartoDB/786-number-categories-param
...
Add a "category" query param to define the number of categories to be ranked for aggregation dataviews
2017-11-07 17:11:25 +01:00
Daniel García Aubert
743bb0723b
Add query param to define the number of categories to be ranked
2017-11-07 16:14:47 +01:00
Simon Martín
0bf36fa058
remove unneeded encoding control
2017-11-07 16:02:37 +01:00
Simon Martín
970310bf7f
add vectorError middleware to named map endpoint
2017-11-07 16:01:08 +01:00
Simon Martín
1ea4fc50c9
make jshint happy
2017-11-07 11:17:32 +01:00
Simon Martín
216c877f4b
verctor error middleware
2017-11-07 11:07:38 +01:00
Daniel García Aubert
c48e89826d
Split middleware to follow SRP
2017-11-07 09:50:52 +01:00
Daniel García Aubert
693a2e7bee
Order middlewares
2017-11-05 19:13:56 +01:00
Daniel García Aubert
f9ba3c41d3
Create new middlewares to init profiling and another to check JSON content-type
2017-11-05 18:55:23 +01:00
Daniel García Aubert
46289f27df
Remove TODO
2017-11-03 15:26:25 +01:00
Daniel García Aubert
05ccf20634
Rename function
2017-11-03 15:12:18 +01:00
Daniel García Aubert
6acb873d95
Enforce all middlewares to follow the same constructor pattern
2017-11-03 15:06:15 +01:00
Daniel García Aubert
65e8609fec
Do not bind context if not needed
2017-11-03 09:47:46 +01:00
Daniel García Aubert
677f6caab8
remove funtion
2017-11-03 09:38:36 +01:00
Daniel García Aubert
cb167313d2
Unify middleware builder functions
2017-11-03 09:37:01 +01:00
Daniel García Aubert
2854d0252c
Fix typo
2017-11-03 08:48:13 +01:00
Daniel García Aubert
717332d941
Compose instantiate layergroup middleware
2017-11-02 19:24:33 +01:00
Daniel García Aubert
4607e4a12d
Compose create layergroup middleware
2017-11-02 19:03:20 +01:00
Daniel García Aubert
3e7106002d
Rename response middleware
2017-11-02 18:39:46 +01:00
Daniel García Aubert
08b91f935d
Rename error middleware
2017-11-02 18:38:34 +01:00
Daniel García Aubert
1d08734721
Rename middleware
2017-11-02 18:28:37 +01:00
Daniel García Aubert
b11b872b75
Remove step requirement
2017-11-02 11:29:43 +01:00
Daniel García Aubert
93bd2c9e50
Build afterLayergroupCreate middleware as an array of middlewares instead of preforming all them as one middleware
2017-11-02 10:43:22 +01:00
Daniel García Aubert
658763da8c
Build after layergroup create while registering routes
2017-11-02 10:33:39 +01:00
Daniel García Aubert
d2b5eaa8c3
Do not proxy create and intantiate middlewares
2017-11-02 10:28:33 +01:00
Daniel García Aubert
eb5bf52bd9
Move profiler start to the right place
2017-11-02 10:22:30 +01:00
Daniel García Aubert
c8000e5cf8
Make a middleware to respond layergroup
2017-11-01 20:06:32 +01:00
Daniel García Aubert
46c76d6a4c
Create middleware for layergroup creation (anonymous map)
2017-11-01 19:57:20 +01:00
Daniel García Aubert
e6bec5ccb0
Make style linter happy
2017-11-01 19:28:32 +01:00
Daniel García Aubert
125587522f
Create middleware for layergroup creation
2017-11-01 19:27:01 +01:00
Daniel García Aubert
aeb9585708
extract prepare mapconfig and get template to their respective middlewares
2017-11-01 19:02:07 +01:00
Daniel García Aubert
8ed5df0072
Move prepeareConfigFn to a middleware
2017-11-01 17:57:35 +01:00
Daniel García Aubert
6bbaeaa286
Create a custom error middleware to augment error info
2017-10-31 20:49:26 +01:00
Daniel García Aubert
3d15551cb5
Minor style umprovements
2017-10-31 20:10:37 +01:00
Daniel García Aubert
e0ffeb0adc
extract surrogate key functionality to its own middleware
2017-10-31 19:50:36 +01:00
Daniel García Aubert
e06f8fe25e
Set layergroup-id header in the right middleware
2017-10-31 18:54:32 +01:00
Daniel García Aubert
da2228088e
Extract context metadata (turbo-carto) functionallity to its own middleware
2017-10-31 18:42:11 +01:00
Daniel García Aubert
cdc39c8cae
Extract addAnalysesMetadata functionallity to its own middleware
2017-10-31 18:25:17 +01:00
Daniel García Aubert
99fa66c026
Extract hash template for layergroup id and dataviews/widgets to a middlewares
2017-10-31 18:06:14 +01:00
Daniel García Aubert
d85a5d83b7
Make afterLayergroupCreate function as a 'middleware' builder
2017-10-31 17:59:32 +01:00
Daniel García Aubert
bb02494e02
Do not perform "increment map view count" in parallel
2017-10-31 17:09:42 +01:00
Daniel García Aubert
39eb0f7bec
Avoid regression and update comment
2017-10-31 16:58:00 +01:00
Daniel García Aubert
5f7d5f6ec8
Get analyses results from res.locals
2017-10-31 16:01:18 +01:00
Daniel García Aubert
a4b2044e10
missing early return
2017-10-31 15:58:41 +01:00
Daniel García Aubert
d1093686a3
Avoid to hold info in local variables
2017-10-31 15:51:42 +01:00
Daniel García Aubert
12822c4341
Follow node.js convention regarding early returns
2017-10-31 15:49:10 +01:00
Daniel García Aubert
fab87e2168
Get layergroup from locals. It's not provided by previous middleware anymore
2017-10-31 15:47:59 +01:00
Daniel García Aubert
34e219353c
do not pass layergroup since it's already available in res.locals
2017-10-31 14:47:29 +01:00
Daniel García Aubert
3cf4a8f70b
Extract layergroup data augmentation to its own "middleware"
2017-10-31 13:46:03 +01:00
Daniel García Aubert
48172d4dc1
make afterLayergroupCreate to follow the middleware signature
2017-10-31 13:36:17 +01:00
Daniel García Aubert
467bee4c91
Split afterLayergroupCreate method in multiple "pre-middlewares"
2017-10-31 13:13:20 +01:00
Daniel García Aubert
3f2ef63976
Extract cache channel to its own method
2017-10-31 11:38:54 +01:00
Daniel García Aubert
235f5e4566
Extract cache channel to its own method
2017-10-31 11:38:18 +01:00
Daniel García Aubert
fb3afaa6ab
Fix jshint max-complexity issue by using extract method
2017-10-30 19:29:19 +01:00
Daniel García Aubert
b6c405bf68
Remove send method in base controller and remove BaseController class
2017-10-30 19:28:40 +01:00
Simon Martín
c0df0d12c6
ensure dont overwrite data in copy from req.params to res.locals
2017-10-20 17:21:55 +02:00
Daniel García Aubert
00f81db57e
Fixed default value for own_filter
2017-10-20 16:47:56 +02:00
Daniel García Aubert
0c9d60b573
Add support for no_filters params in dataviews
2017-10-20 16:19:24 +02:00
Daniel García Aubert
9ad6d0cbcc
Merge branch 'master' into stats-middleware
2017-10-16 15:06:20 +02:00
Raul Ochoa
ad227a5240
Merge remote-tracking branch 'origin/master' into analyses-filters
2017-10-10 16:35:11 +00:00
David Manzanares
d30f710534
Merge remote-tracking branch 'origin/master' into mvt-path-conf
2017-10-10 17:53:28 +02:00
Daniel García Aubert
02304dc450
Merge branch 'master' into stats-middleware
2017-10-10 16:56:35 +02:00
Simon Martín
8380d291d0
Merge branch 'master' into middlewarify
2017-10-10 14:59:50 +02:00
Daniel García Aubert
251e636ad2
Fix bad argument list while calling to staticMap function
2017-10-10 11:58:24 +02:00
Daniel García Aubert
a81e98995a
Merge branch 'middlewarify' into stats-middleware
2017-10-09 17:54:32 +02:00
Simon Martín
484e0fda2f
undo changing services params
2017-10-09 16:29:35 +02:00
Simon Martín
e3405ea2fc
doing changes after merge with middlewarify
2017-10-09 12:27:58 +02:00
Simon Martín
5c0f597cbb
Merge branch 'middlewarify' into res-locals
2017-10-09 10:55:43 +02:00
Daniel García Aubert
7289394f6a
Missing EOL
2017-10-07 19:16:15 +02:00
Daniel García Aubert
1ba1c488fa
Do not decorate response methods to set header and send stats
2017-10-07 19:02:26 +02:00
David Manzanares
43885f130b
Fix HTTP status code distinction between 200 and 204
2017-10-06 16:19:00 +02:00
David Manzanares
4e6253b717
Return HTTP 204 for empty tiles
2017-10-06 16:02:16 +02:00
Daniel García Aubert
242e63716f
Merge branch 'middlewarify' into stats-middleware
2017-10-05 18:21:02 +02:00
Daniel García Aubert
c70b8cb5bf
Set X-Served-By-DB-Host header in db-conn-setup middleware
2017-10-05 18:05:46 +02:00
Simon Martín
06138a82a8
Merge branch 'middlewarify' into res-locals
2017-10-05 17:53:15 +02:00
Daniel García Aubert
678fbb1c8f
Remove bad argument to middleware callback
2017-10-05 17:28:41 +02:00
Simon Martín
2f310a15bd
do not overwrite creation of res.locals
2017-10-05 17:23:07 +02:00
Daniel García Aubert
bf637ccd5b
Implement stats middleware removing some duplicated code
2017-10-05 17:06:42 +02:00
Simon Martín
9083fc2e20
fix forgotten comment
2017-10-05 12:44:03 +02:00
David Manzanares
102228c55b
Merge remote-tracking branch 'origin/master' into mvt-path-conf
2017-10-05 12:19:24 +02:00
David Manzanares
148e6e6ae5
Merge branch 'master' into mvt-path-conf
2017-10-05 12:18:08 +02:00
Daniel García Aubert
b93c09959c
Back to use just one router
2017-10-05 12:12:21 +02:00
Simon Martín
5abe25c316
undo style/format changes
2017-10-05 11:35:49 +02:00
Simon Martín
1f03a6b181
using res.locals instead of params in AuthApi
2017-10-05 11:28:41 +02:00
Simon Martín
ec8fcc7302
change param name and comments updated
2017-10-04 12:50:27 +02:00
Simon Martín
19e2515a8e
Merge pull request #749 from CartoDB/dataview-factory-refactor
...
Dataview factory refactor
2017-10-04 12:18:55 +02:00
Simon Martín
0a507d02bc
Merge branch 'master' into remove-list-dataview
2017-10-04 11:36:45 +02:00
Simon Martín
8fe31c45f3
fix 'this' scope with arrow function
2017-10-04 11:10:17 +02:00
Simon Martín
fe4c22d2ea
Merge branch 'master' into base-dataview-refactor
2017-10-04 11:08:43 +02:00
Simon Martín
d27cce915c
Merge pull request #747 from CartoDB/formula-dataview-refactor
...
Formula dataview refactor
2017-10-04 10:10:57 +02:00
Simon Martín
21720267cf
from req.context to res.locals
2017-10-03 17:47:57 +02:00
Simon Martín
3ce10690d6
send res.locals instead of res when possible
2017-10-03 13:06:12 +02:00
Simon Martín
6bfc5d8891
fix function name and removing comments of localsMiddleware
2017-10-03 13:03:02 +02:00
Simon Martín
430e1513d8
fix incorrect function parameter
2017-10-03 13:00:52 +02:00
Raul Ochoa
2b1f12e9d5
Allow to instantiate maps with analyses filters
...
This decouples filters from dataviews. They are more verbose now.
Misses validation of filters.
2017-10-02 19:16:44 +02:00
Simon Martín
4fd3c99531
Merge pull request #746 from CartoDB/list-dataview-refactor
...
List dataview refactor
2017-10-02 17:28:54 +02:00
Simon Martín
1e4c63a6dc
Merge pull request #745 from CartoDB/aggregation-dataview-refactor
...
Aggregation dataview refactor
2017-10-02 17:24:12 +02:00
Simon Martín
742420b159
Merge pull request #744 from CartoDB/time-series-refactor
...
Histogram refactor
2017-10-02 17:18:21 +02:00
Simon Martín
55f593eae6
adding forgotten semicolon
2017-10-02 12:08:10 +02:00
Simon Martín
f9d87bc40f
res.locals fixing controllers
2017-10-02 12:07:35 +02:00
Simon Martín
783eb0eec7
res.locals format and layer in namep maps
2017-09-29 17:03:57 +02:00
Simon Martín
c22a35489d
res.locals forgotten things and make jshint happy
2017-09-29 14:38:28 +02:00
Simon Martín
482feabce2
res.locals in named maps controller
2017-09-29 14:37:55 +02:00
Simon Martín
0a753400e0
res.locals in map controller
2017-09-29 12:54:21 +02:00
Simon Martín
a21648ab4a
res.locals in layergroup controller
2017-09-29 12:32:46 +02:00
Simon Martín
b4d03c074a
not move db params to res.locals.db
2017-09-29 11:07:11 +02:00
Raul Ochoa
78b75c7a88
Removes list dataview type
2017-09-28 10:47:44 +00:00
David Manzanares
ad1abb28af
Add configuration flag to enable/disable direct PgSQL MVT
2017-09-28 12:08:22 +02:00
Simon Martín
f824fc5243
base and analyses controller
2017-09-28 12:02:34 +02:00
Simon Martín
4a2cc6a5f8
res.locals in auth_api
2017-09-28 11:55:36 +02:00
Simon
ca612dd02a
res.locals in context middlewares
2017-09-28 11:43:12 +02:00
Unknown
fedcb0d0f9
remove unused middleware
2017-09-28 11:23:53 +02:00
Simon
178b9e8563
moving layergroup-token middleware to middlewarify style
2017-09-27 16:32:49 +02:00
