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
