Commit Graph

2410 Commits

Author SHA1 Message Date
Daniel García Aubert
ca7acb8339 Merge branch 'master' into use-strict 2018-10-25 11:11:30 +02:00
Javier Goizueta
6908aa532c Fix iso format for hours in time dimensions
The HH specifies hour of day 01-12, we need HH24 for 00-23
2018-10-24 21:15:10 +02:00
Daniel García Aubert
361e99006b Ignore line 2018-10-23 18:20:11 +02:00
Daniel García Aubert
b6dcf72268 Missing semicolon 2018-10-23 17:55:35 +02:00
Daniel García Aubert
76cfd185de Please jshint 2018-10-23 17:54:11 +02:00
Daniel García Aubert
79820a0f05 Add function as method of to be stric mode compilant 2018-10-23 17:52:19 +02:00
Daniel García Aubert
a0126f6a15 Use stric mode for resource-locator module 2018-10-23 17:48:53 +02:00
Daniel García Aubert
e7e3d612a1 Use strict mode in modules under lib folder (except lib/cartodb/models/resource-locator.js) 2018-10-23 17:45:42 +02:00
Raul Ochoa
26e4a05276 Going green: prevent TypeError for empty tables/results
This is the intial step to fix https://github.com/CartoDB/carto-vl/issues/1049.
2018-10-23 13:50:49 +00:00
Daniel García Aubert
12d58f3af2 Prevent from uncaught exception: Range filter Error from camshaft when getting analysis query 2018-10-22 15:26:59 +02:00
Daniel García Aubert
5573db2bc1 Do not use Object.assign as _.defautls equivalent 2018-10-19 11:57:54 +02:00
Daniel García Aubert
17886d0e43 Revert "Use early return pattern"
This reverts commit 297e56f4e1.
2018-10-11 18:17:16 +02:00
Daniel García Aubert
1f112d587f Revert "Rename function"
This reverts commit 12dc1626a7.
2018-10-11 18:17:03 +02:00
Daniel García Aubert
e158e3e426 Pass overview-query-rewriter to mvt renderer 2018-10-11 15:41:38 +02:00
Daniel García Aubert
12dc1626a7 Rename function 2018-10-10 15:07:47 +02:00
Daniel García Aubert
297e56f4e1 Use early return pattern 2018-10-10 15:06:56 +02:00
Javier Goizueta
73b3402d85 Refactor stats collection 2018-10-09 13:24:08 +02:00
Javier Goizueta
ee63b247cd Slight refactor 2018-10-08 19:25:04 +02:00
Javier Goizueta
10baf43ede Fix dimension metadata bug 2018-10-07 00:28:53 +02:00
Javier Goizueta
996d7fc90d Lint fixes 2018-10-06 18:26:43 +02:00
Javier Goizueta
c0febf2fd1 Rename time dimension parameters 2018-10-05 20:08:40 +02:00
Javier Goizueta
f841f65a1e Dimensions metadata 2018-10-04 19:50:14 +02:00
Javier Goizueta
c9786ee3f6 Catch aggregation query errors 2018-10-03 23:13:22 +02:00
Javier Goizueta
99b62edcbd Bug fixes 2018-10-03 23:12:58 +02:00
Javier Goizueta
c588d4139e Refactor time dimensions 2018-10-03 21:02:22 +02:00
Javier Goizueta
aff55351ad Unify parameter names 2018-10-03 19:07:47 +02:00
Javier Goizueta
96ba075698 Unify handling of cyclic time groupings
Remove generic cyclic grouping
2018-10-03 18:57:00 +02:00
Javier Goizueta
a7d5415f64 Remove offsets from time dimension computations 2018-10-03 17:12:01 +02:00
Javier Goizueta
dede22c915 Changes in time dimensions API
Use single `starting` epoch instead of various offsets.
Add ISO text representation.
Adopt ISO conventions for day of week and week of year.
Rename internal parameters for consistency with external API.
2018-10-03 17:05:58 +02:00
Javier Goizueta
fbf3fd9d8c Support old and new dimension definitions 2018-09-25 19:10:56 +02:00
Javier Goizueta
fbcfc7a582 WIP: time dimensions for aggregation 2018-09-20 21:12:54 +02:00
Javier Goizueta
0f20cdaae1 More robust adjustment of spatial limits to the aggregation grid
See #1034
2018-09-12 19:27:21 +02:00
Javier Goizueta
1e65804a1b Avoid requiring the_geom for point-sample aggregation 2018-09-12 11:26:14 +02:00
Raúl Marín
fb6987e91a
Merge pull request #1027 from CartoDB/carto_mvt_extent
Update Windshaft to 4.9.0
2018-09-05 13:30:12 +02:00
Eneko Lakasta
65e10bc20d use as flag overviewsAddedToMapconfig instead of overviewsUsed 2018-09-05 13:14:55 +02:00
Eneko Lakasta
dd1ee56648 use .some instead of .map & .some 2018-09-05 11:56:45 +02:00
Eneko Lakasta
c54c3754ef fix indentation 2018-09-05 11:51:58 +02:00
Eneko Lakasta
6dde5fc6f1 use .some instead of reduce 2018-09-04 18:22:48 +02:00
Eneko Lakasta
880ef63720 add to logs named maps overviews instantiation 2018-09-04 16:21:20 +02:00
Eneko Lakasta
b75150e91e set mapType in the controller instead of in the adapter 2018-09-04 16:20:38 +02:00
Eneko Lakasta
006e21379f please jshint line to long 2018-09-04 15:30:20 +02:00
Eneko Lakasta
7df0fb456b add to log anonymous maps instantiations that use overviews tables
Added to tiler profiler object:

overviewsAddedToMapconfig: true
mapType: 'anonymous'
2018-09-04 15:13:17 +02:00
Eneko Lakasta
95d179835c add to logs even if no overviews tables were used.
{usesOverviews:false}
2018-08-30 14:52:37 +02:00
Eneko Lakasta
7c52f504e5 add dataview type to overviews logs 2018-08-30 14:30:03 +02:00
Raul Marin
cd25150056 MVT: Removed error parsing for empty tiles 2018-09-03 14:59:16 +02:00
Eneko Lakasta
c9d50c412d add tests for dataviews 2018-08-29 18:00:13 +02:00
Eneko Lakasta
732f891850 refactor in order not to tamper the dataview results data 2018-08-29 15:06:48 +02:00
Eneko Lakasta
8ef260972d add to log when overviews are being used in dataviews 2018-08-29 13:50:21 +02:00
Javier Goizueta
d338b5ca37 Fix column stats to support spaces in names
This complements changes in #1020
2018-08-21 12:55:30 +02:00
Jesús Arroyo Torrens
e0f49ca8f5 Fix aggregation-query dimension functions regarding to spaces in columns 2018-08-16 15:34:06 +02:00
Jesús Arroyo Torrens
925328c43b Fix bug in date-wrapper regarding to columns with spaces 2018-08-16 13:38:26 +02:00
Jesús Arroyo Torrens
14cf3c1093 Fix typo 2018-08-16 12:16:20 +02:00
Daniel G. Aubert
dfa057d979
Merge pull request #1016 from CartoDB/remove-step-template-maps
Remove step template maps
2018-08-02 15:02:59 +02:00
Daniel García Aubert
98ab237bf7 Merge branch 'master' into remove-step-template-maps 2018-08-02 14:10:26 +02:00
Daniel García Aubert
63e4bcebef Move function to class as private method 2018-08-02 13:13:48 +02:00
Daniel García Aubert
593a72a967 Reorganize code, estract methods and rename others 2018-08-02 11:40:41 +02:00
Simon Martín
6c8f38a241 improve var naming 2018-08-02 11:38:54 +02:00
Simon Martín
a910f1442e explicit error return 2018-08-02 11:35:54 +02:00
Daniel García Aubert
df14afb55f Remove unnecessary code 2018-08-01 19:15:28 +02:00
Daniel García Aubert
732a2d7742 Early return is the way to go. Avoid checking conditions later 2018-08-01 17:39:08 +02:00
Daniel García Aubert
78f4cf3155 Move code 2018-08-01 17:33:20 +02:00
Daniel García Aubert
8f763d655d Do not rename output values 2018-08-01 17:23:40 +02:00
Daniel García Aubert
64329c3fac Rename callback 2018-08-01 16:39:15 +02:00
Daniel García Aubert
c8c22a787e CamelCase 2018-08-01 16:35:19 +02:00
Daniel García Aubert
6a6ec4300b Extract functions to compose query-rewrite-data 2018-08-01 16:30:59 +02:00
Simon Martín
44ba5aa568 forgotten return 2018-08-01 16:22:43 +02:00
Simon Martín
01658c33fd remove step and assert dependencies 2018-08-01 16:03:36 +02:00
Simon Martín
efafd4cb3e success callback without err 2018-08-01 16:02:53 +02:00
Daniel García Aubert
d25740ed51 Extract function to avoid dynamic clousures 2018-08-01 16:02:05 +02:00
Simon Martín
3bb4ad86ff remove template 5 refactor 2018-08-01 16:00:31 +02:00
Simon Martín
b169c96f1c remove step 5 2018-08-01 15:57:22 +02:00
Daniel García Aubert
843f4b8e28 Use early return 2018-08-01 15:53:43 +02:00
Simon Martín
e5b75abc76 some details 2018-08-01 15:53:41 +02:00
Daniel García Aubert
83777540d0 Merge branch 'master' into remove-step-mapconfig-overviews-adapter 2018-08-01 15:51:43 +02:00
Simon Martín
0e28348e16 manage JSON parse and stringify sinc errors 2018-08-01 15:48:24 +02:00
Simon Martín
7b7bee2901 improve naming 2018-08-01 15:43:45 +02:00
Simon Martín
2a2f703abc style details 2018-08-01 15:40:40 +02:00
Simon Martín
e85f4e4129 selft to this 2018-08-01 15:39:25 +02:00
Simon Martín
bcad6dbe22 anage errors 2018-08-01 15:32:44 +02:00
Simon Martín
e9f88a78d5 remove step 4 2018-08-01 15:28:15 +02:00
Simon Martín
085d26f1b2 remove step 3: refactor 2018-08-01 13:27:07 +02:00
Daniel García Aubert
559546d333 Merge branch 'master' into remove-step-filter-stats 2018-08-01 13:22:57 +02:00
Simon Martín
da8d92b78e remove step 3 2018-08-01 13:20:10 +02:00
Simon Martín
2134bf898a check user template limit in the right way 2018-08-01 13:13:25 +02:00
Daniel García Aubert
e27ed7e79d Merge branch 'master' into remove-step-user-limits 2018-08-01 12:46:47 +02:00
Simon Martín
f27d5ba7d1 unneeded check 2018-08-01 12:40:22 +02:00
Simon Martín
09a67871fb manage JSON.stringify sync error 2018-08-01 12:38:50 +02:00
Simon Martín
cec9994add style details 2018-08-01 12:33:59 +02:00
Simon Martín
d45d0018d2 self to this 2018-08-01 12:32:20 +02:00
Simon Martín
410cbd082c manage errors 2018-08-01 12:26:40 +02:00
Simon Martín
fd875c41c7 remove step 2 2018-08-01 12:20:01 +02:00
Simon Martín
750798d0a3 ensuring redis_pool connection release 2018-08-01 12:10:09 +02:00
Simon Martín
04faaea10d remove unneded check 2018-08-01 11:49:40 +02:00
Simon Martín
74831c9b7f using ... operator instead of apply 2018-08-01 11:48:12 +02:00
Simon Martín
5471a218eb return errors 2018-08-01 11:39:07 +02:00
Simon Martín
79f2a8dde9 vars refactor: that to this, ... 2018-08-01 11:30:17 +02:00
Simon Martín
5c0b7487f7 using calbacks instead of step 2018-08-01 11:25:55 +02:00
Daniel García Aubert
3a3baf3c85 Rename variable 2018-07-31 15:41:29 +02:00
Simon Martín
b8d320c434 return callback 2018-07-31 15:19:41 +02:00
Simon Martín
515e482886 early return 2018-07-31 15:07:34 +02:00
Simon Martín
ea0805b017 early return 2018-07-31 15:01:22 +02:00
Daniel García Aubert
ec0e90e8ce Avoid uncaught exceptions 2018-07-31 13:33:33 +02:00
Daniel García Aubert
d4de54f292 Extract get query with filters 2018-07-31 13:26:38 +02:00
Daniel García Aubert
9124a26a45 Move veriable declaration 2018-07-31 12:47:03 +02:00
Daniel García Aubert
18603ad24f Reduce cyclomatic complexity 2018-07-31 12:43:54 +02:00
Daniel García Aubert
70ac0587db Missing error 2018-07-31 12:15:20 +02:00
Daniel García Aubert
230b1bb3db Remove step .searchDataview() 2018-07-31 11:59:39 +02:00
Simon Martín
23ef884e9b remove step 1 2018-07-31 10:26:46 +02:00
Simon Martín
bb24b1dfcc indentation 2018-07-31 10:25:56 +02:00
Simon Martín
324e614902 change _.extend by Object.assign 2018-07-30 18:25:26 +02:00
Simon Martín
20c8d07a46 remove step: last function 2018-07-30 17:59:06 +02:00
Simon Martín
fe9f4939d5 remove step: function 2 2018-07-30 17:49:20 +02:00
Simon Martín
a89131c043 remove step: function 1 2018-07-30 17:34:14 +02:00
Simon Martín
1f6bb6839a remove step 2018-07-30 17:32:57 +02:00
Simon Martín
1e70717554 indentation 2018-07-30 17:31:42 +02:00
Simon Martín
3cf378e045 remove 'self' 2018-07-30 17:21:19 +02:00
Simon Martín
12ad4420aa remove step: function 2 refactor 2018-07-30 17:18:35 +02:00
Simon Martín
70000f9df1 remove step: function 2 2018-07-30 17:16:27 +02:00
Simon Martín
eaff11ef6e remove step: function 1 2018-07-30 17:15:04 +02:00
Simon Martín
6c3b546648 remove step 2018-07-30 17:09:34 +02:00
Simon Martín
384f4f74e0 remove 'self' with arrows functions 2018-07-30 16:44:30 +02:00
Simon Martín
898bac5b04 jshint and style 2018-07-30 16:42:17 +02:00
Simon Martín
cd08ad693f remove step: last function refactor 2018-07-30 16:38:04 +02:00
Simon Martín
c2577d1d25 remove step: last function 2018-07-30 16:02:04 +02:00
Daniel García Aubert
13075460ac Do not override incoming arguments 2018-07-30 16:00:30 +02:00
Daniel García Aubert
cca0848e6d Improve error 2018-07-30 15:59:43 +02:00
Simon Martín
150658d58d remove step: 3 function refactor 2018-07-30 15:59:37 +02:00
Daniel García Aubert
6be1a77a29 Use callback to return the error 2018-07-30 15:57:47 +02:00
Simon Martín
fb683e438d remove step: second function 2018-07-30 15:56:18 +02:00
Simon Martín
2196a89ec3 remove step: 2 function refactor 2018-07-30 15:55:24 +02:00
Simon Martín
bafeceeb6e remove step: first funcion 2018-07-30 15:54:26 +02:00
Simon Martín
eeafad7cd9 remove step 2018-07-30 15:52:41 +02:00
Daniel García Aubert
94b7353fbf Fix uncaught exception 2018-07-30 15:52:04 +02:00
Simon Martín
60cd91f144 indentation 2018-07-30 15:50:41 +02:00
Daniel García Aubert
1d199f8713 Remove step in method 2018-07-30 15:19:53 +02:00
Javier Goizueta
fcfa763890
Merge pull request #1002 from CartoDB/aggregation-fixes
Aggregation fixes
2018-07-18 11:54:13 +02:00
Daniel G. Aubert
3e0cb0ed37
Merge pull request #997 from CartoDB/last-modified-always
Remove parameter `now` for last-modified-header middleware
2018-07-17 11:32:37 +02:00
Daniel García Aubert
f9b59d8549 Do not override stats 2018-07-16 17:18:58 +02:00
Daniel García Aubert
81eb849aff Add stats first 2018-07-16 16:58:53 +02:00
Daniel García Aubert
9f9b933607 Add create layergroup stats 2018-07-16 16:52:26 +02:00
Javier Goizueta
2d102c4810 Compensate for bbox lack of accuracy 2018-07-16 12:44:30 +02:00
Javier Goizueta
2063ac15ee Fix long lines 2018-07-16 11:58:56 +02:00
Javier Goizueta
716f983e71 Filter out partially aggregated clusters
Fixes #889
2018-07-15 22:26:37 +02:00
Javier Goizueta
31feb58e1f Compute aggregation cell size accurately
This fixes #1001
2018-07-15 22:25:16 +02:00
Daniel García Aubert
4f81f402f5 Remove parameter now for last-modified-header 2018-07-10 13:22:38 +02:00
Rafa de la Torre
e247e45f96 Qualify columns and improve if/else style
As suggested by Algunenano: qualify column names with the
table/subquery/cte to avoid name clashing, and polish the code style a
little.
2018-07-05 17:21:38 +02:00
Rafa de la Torre
a1807fd0c3 A better solution to the start-end problem 2018-07-05 12:39:26 +02:00
Rafa de la Torre
d937ce4982 Fix the min >= start and max <= end case (WIP)
This fixes the 'should get bins with min >= start and max <= end' test
case but probably breaks a number of other cases (those with no start
and/or no end).
2018-07-05 11:56:26 +02:00
Eneko Lakasta
923b23871f Please jshint 2018-07-03 14:48:54 +02:00
Eneko Lakasta
409a103990 update rate limit error message 2018-07-03 14:36:29 +02:00
Eneko Lakasta
6a6815d893 update render limits error message 2018-07-03 14:32:10 +02:00
Eneko Lakasta
c874a734fd fix db limit error message set order 2018-07-02 13:02:36 +02:00
Eneko Lakasta
ee25585f06 add new error message 2018-06-29 15:01:12 +02:00
Simon Martín
37f6ac0c87 Merge branch 'master' into tilejson-url-apikey 2018-06-26 10:23:09 +02:00
Simon Martín
79fdd07d8f adding api key to tiles base urls with querystring 2018-06-25 16:23:23 +02:00
Simon Martín
762dce7853 adding api key to tiles base urls 2018-06-22 17:31:45 +02:00
Javier Goizueta
e89503e1fa Subsitute tokens to get columns for dates_as_numbers
Fixes #980
2018-06-18 13:16:49 +02:00
Javier Goizueta
e0cd1aba29 Refactor: move common token substitutions to query-utils 2018-06-18 13:15:45 +02:00
Javier Goizueta
90efe14bfb
Merge pull request #971 from CartoDB/cartovl-130
Send dates as unix epoch instead strings in .mvt files
2018-06-13 13:07:35 +02:00
IagoLast
649297df83 Use early return 2018-06-13 09:42:53 +02:00
IagoLast
ae7e7578db Use early return 2018-06-13 09:38:24 +02:00
Javier Goizueta
0cf6605b8d Use more precise function name 2018-06-12 12:59:10 +02:00
Javier Goizueta
4a52620d83 Various fixes
This avoids errors when trying to wrap dates or detect wrapped dates in non-mapnik layers
2018-06-12 12:05:31 +02:00
Javier Goizueta
660c1777e3 Fix per-layer date wrapping 2018-06-11 19:31:42 +02:00
Daniel García Aubert
aba737c61b Merge branch 'master' into mapconfig-provirers-refactor 2018-06-11 15:50:52 +02:00
Eneko Lakasta
7f7eb78d8c Merge branch 'master' into remove-auth-fallback 2018-06-11 12:02:58 +02:00
Daniel García Aubert
c6a74b66ce Use external module to get full qualified domain name properly 2018-06-08 13:46:42 +02:00
Raul Marin
102244f467 Regression: Accept layer option in the static map urls 2018-06-07 12:14:31 +02:00
Javier Goizueta
55f6241769 Add date wrapping metadata 2018-06-05 15:39:01 +02:00
IagoLast
a883514c8a Remove control flag 2018-06-05 09:35:01 +02:00
IagoLast
9ee6d7fc91 Implement multiple layer date wrapping 2018-06-05 09:34:44 +02:00
IagoLast
2ee6c8487d PR style fixes 2018-06-05 08:44:20 +02:00
IagoLast
8ec2b35557 Fix tests 2018-06-01 12:25:36 +02:00
Ubuntu
ae4b233458 Pass tests 2018-06-01 10:18:07 +00:00
elenatorro
79962a7566 Refactor long line 2018-05-31 19:07:57 +02:00
elenatorro
d4c6282455 Refactor date wrapper 2018-05-31 18:53:01 +02:00
elenatorro
db3370cd21 Use wrapDates function from vector adapter 2018-05-31 18:46:23 +02:00
elenatorro
4213e3163a Move queryPromise function 2018-05-31 18:37:43 +02:00
IagoLast
3850bbb68e Send dates as unix epoch instead strings in .mvt files
This commit creates a new ConfigAdapter used in vector maps instantiations.
This adapter generates a new sql query for ONE SINGLE LAYER (carto-vl currently only supports one layer per mvt)
where the date columns are wrapped into a epoch using the `date_part` function.

Due this mvt files are smaller since we use numbers instead strings to represent dates, this is also faster in carto-gl
where we interpolate linearly between 0 and 1 to create animations.

Notice we should add a parameter to make this transformation optional.
We also should take into account the epoch precission.
2018-05-31 17:49:40 +02:00
Daniel García Aubert
ea95050d43 Extract base class in order to share createAffectedTables and getAffectedTables methods 2018-05-31 14:57:34 +02:00
Daniel García Aubert
c32dba1ecb Use ES6 class syntax 2018-05-30 20:28:15 +02:00
Daniel García Aubert
94a5020faf Do not use underscore 2018-05-30 20:10:59 +02:00
Daniel García Aubert
c0e6bf1299 Use ES6 class syntax 2018-05-30 20:08:35 +02:00
Daniel García Aubert
9fe8958e8c Use ES6 class syntax 2018-05-30 20:02:38 +02:00
Daniel García Aubert
7c51895b0f Use const and let instead of var 2018-05-30 19:50:07 +02:00
Daniel García Aubert
16bca85438 Do not use underscore 2018-05-30 19:43:23 +02:00
Daniel García Aubert
9d415d0dbe Extract method to get and build context 2018-05-30 19:30:34 +02:00
Daniel García Aubert
1d0210a372 Reorder code 2018-05-30 19:07:28 +02:00
Daniel García Aubert
2fb6c08702 Remove unnecessary variables 2018-05-30 18:37:11 +02:00
Daniel García Aubert
f7c712f6eb Avoid functions with side effects 2018-05-30 18:31:59 +02:00
Daniel García Aubert
eabd25ee6a Use the returned template instead of the cached one 2018-05-30 18:18:42 +02:00
Daniel García Aubert
5fc49ab3c2 Remove duplicated assignment 2018-05-30 18:16:42 +02:00
Daniel García Aubert
1b6a722c0c Remove step 2018-05-30 18:15:51 +02:00
Eneko Lakasta
6414cd52c0 Merge branch 'master' into remove-auth-fallback 2018-05-30 17:53:24 +02:00
Daniel García Aubert
5cfffcfa83 Use const instead of var 2018-05-30 17:22:12 +02:00
Daniel García Aubert
4e28f7bb4e Do not require assert and step 2018-05-30 17:10:18 +02:00
Daniel García Aubert
532d50ad7a Return 'null' explicitly 2018-05-30 17:09:01 +02:00
Daniel García Aubert
d8b0d338c0 Use 'const' instead of 'var' 2018-05-30 17:02:15 +02:00
Daniel García Aubert
cd0be5f79d Do not require 'step' 2018-05-30 17:00:55 +02:00
Daniel García Aubert
3820894454 Do not use 'step' 2018-05-30 17:00:15 +02:00
Daniel García Aubert
fe79ee0315 Merge branch 'master' into unify-connection-pool-config 2018-05-29 16:44:21 +02:00
Javier Goizueta
26da872704 Leave sample exclude_columns for later 2018-05-28 17:37:45 +02:00
Javier Goizueta
8a1d5d3a48 Be careful and detect type invalid types 2018-05-28 17:36:58 +02:00
Javier Goizueta
4bb8914d9a Add parameters to select metadata sample columns 2018-05-28 16:08:31 +02:00
Daniel García Aubert
bbab9c1a6b Avoid breaking changes 2018-05-25 14:44:58 +02:00
Daniel García Aubert
8fe192267d cosmetic 2018-05-25 13:37:57 +02:00
Daniel García Aubert
92255797d9 Add torque options to renderer factory 2018-05-25 13:37:34 +02:00
Daniel García Aubert
f404285140 Use postgres pool configuration to have the same configuration for all renderers. 2018-05-24 18:36:45 +02:00
Daniel García Aubert
ee38c717a5 Remove geojson renderer config 2018-05-24 18:11:18 +02:00
Daniel García Aubert
1668392296 Move 'postgres' attributes inside Mapnik's renderer configuration and keep params relative to user's connection 2018-05-24 13:42:32 +02:00
Javier Goizueta
c1feaecbcb Merge branch 'master' into refactor-metadata
# Conflicts:
#	lib/cartodb/backends/layer-stats/mapnik-layer-stats.js
2018-05-23 12:12:36 +02:00
Javier Goizueta
94c34eeb23 Small change to use const 2018-05-23 11:15:20 +02:00
Javier Goizueta
97b4e19777 Add metadata parameter for NULL categories 2018-05-22 13:00:18 +02:00
Javier Goizueta
ebc086106f Refactor metadata queryPromise helper
This function to adapt query execution as a Promise was unnecessary complex.
2018-05-21 17:33:03 +02:00
Javier Goizueta
6384f5538c Rename variable for clarity 2018-05-21 17:06:53 +02:00
Javier Goizueta
d7a90e6be4 Remove debugging comment 2018-05-21 15:54:52 +02:00
Javier Goizueta
b233f18a0f Modernize code copied from SQL API 2018-05-21 15:43:23 +02:00
Javier Goizueta
32092d212e Fix bug 2018-05-21 14:05:27 +02:00
Javier Goizueta
11cdcc65ad Add safety limit to sample metadata
The sampling probability is now being computed using an estimate of the table row count
This could led to too high probabilities (to large samples) if the estimate is not accurate.
To avoid potential problems with large samples we've added a LIMIT to the sampling queries.
2018-05-21 12:45:16 +02:00
Javier Goizueta
fecd63e582 Fix bug 2018-05-21 11:59:49 +02:00
Javier Goizueta
38e55367b1 Revert error behaviour for estimatedFeatureCount
Keep current production behavior of ignoreing errors when computing this stat and returning -1.
This is done as to no introduce any instability in production at the moment.
2018-05-21 11:44:52 +02:00
Javier Goizueta
4e99ff1c39 Fix token substitution for stat queries 2018-05-18 22:25:32 +02:00
Javier Goizueta
8e8458e557 Merge branch 'master' into metadata 2018-05-18 20:49:26 +02:00
Javier Goizueta
391ac51f0f Implement metadata queries with plain Promises
Remove usage of PhasedExecution
This achives better query execution granularity and
removes questionable usage of shared results object.
It introduces a couple of behavior changes:
* estimatedFeatureCount desn't ignore errors now
* sample always uses estimatedFeatureCount,even if the actual count is also computed.
2018-05-18 15:33:07 +02:00
Javier Goizueta
4bc8fb207a Use sql_raw for query without aggregation 2018-05-18 15:29:46 +02:00
Simon Martín
81bace1dca Merge branch 'master' into fix-dataview-typeof 2018-05-17 12:13:11 +02:00
Javier Goizueta
012fa91e83 Typo 2018-05-16 14:45:34 +02:00
Javier Goizueta
3af1182206 Rename misleading function argument 2018-05-16 14:45:19 +02:00
Simon Martín
04e00bb834 Merge branch 'master' into fix-image-format-png 2018-05-16 14:40:59 +02:00
Simon Martín
56aa1b39f0 removing 'jpeg' as valid format and no checking agains lowercase 2018-05-16 12:00:40 +02:00
Daniel G. Aubert
d940ab36e1
Merge pull request #954 from CartoDB/controllers-goodies
Controllers goodies
2018-05-14 18:31:48 +02:00
Daniel García Aubert
5a397afd06 In order to extract common middlewares between routers and controlles we need to activate mergeParams options to preserve the req.params from the parent router 2018-05-14 11:50:48 +02:00
Javier Goizueta
5e09c80b71 Remove comment 2018-05-11 19:57:49 +02:00
Javier Goizueta
b906f88a44 Slight refactor 2018-05-11 19:32:03 +02:00
Javier Goizueta
24b1b53ba0 Merge branch 'master' into metadata 2018-05-11 18:58:38 +02:00
Javier Goizueta
53fae9fbbd Comment 2018-05-11 18:57:14 +02:00
Simon Martín
ad4ed7a06b detail 2018-05-11 17:47:47 +02:00
Simon Martín
7f5e655730 static image format for last route 2018-05-11 17:45:17 +02:00
Simon Martín
e96a9f0b46 static image format controllers 2018-05-11 17:42:28 +02:00
Simon Martín
7112341c51 checkStaticImageFormat middleware 2018-05-11 17:41:00 +02:00
Daniel García Aubert
f4d60f963d Add comment 2018-05-11 16:37:02 +02:00
Daniel García Aubert
c6babc7dc4 Create .middlewares() method to build midlleware stack to perform request 2018-05-11 16:26:05 +02:00
Daniel García Aubert
3905ed796e Use ES6 class syntax 2018-05-11 16:24:28 +02:00
Daniel García Aubert
595d006d5b Rename function 2018-05-11 16:21:57 +02:00
Daniel García Aubert
3bcf6d7ca0 Place comment 2018-05-11 16:20:44 +02:00
Daniel García Aubert
68f5ee7bde Use ES6 class syntax 2018-05-11 16:18:52 +02:00
Daniel García Aubert
9db6e2161b Use ES6 class syntax 2018-05-11 16:15:33 +02:00
Daniel García Aubert
6eeb75a35e Use .middlewares() method to build middleware stack to process the request 2018-05-11 16:13:34 +02:00
Daniel García Aubert
1f717617b0 Add .middlewares() method to build middleware stack to be mounted 2018-05-11 16:07:25 +02:00
Daniel García Aubert
3d7231929c Create .middlewares() method to return the middlewares to process the request 2018-05-11 15:34:10 +02:00