Raul Ochoa
64dd033c94
Merge branch 'master' into turbo-carto-tokens
2016-05-19 13:39:36 +02:00
Raul Ochoa
2e79781711
Adds support for sql wrap in all layers
...
Previously it was only working for analyses ones.
2016-05-19 13:34:29 +02:00
Raul Ochoa
ee94b8a587
Very raw implementation of SubstitutionTokens based on origin data
2016-05-19 12:13:49 +02:00
Raul Ochoa
ba08745c23
Adds hasTokens method to SubstitutionTokens
2016-05-19 12:10:19 +02:00
Raul Ochoa
573932efba
Simplify condition and use positive naming for parsing cartocss
2016-05-19 11:48:57 +02:00
Raul Ochoa
c7f37047b0
Save original query from analysis before wrapping it
2016-05-19 11:41:06 +02:00
Javier Goizueta
2a06405a58
Move definition to the scope where it's needed
2016-05-18 18:21:17 +02:00
Javier Goizueta
a1e024e228
Fix dataview problem for bbox with no query rewrite data
...
Fixes #457
2016-05-18 17:49:09 +02:00
Javier Goizueta
e98a5aeff0
Small code clean-up
2016-05-18 15:48:30 +02:00
Javier Goizueta
4c375780c7
replace underscore functions by standard (ES5) equivalents
...
Note: _.find(a,...) is not replaced by a.find(...)
because it is not available for all the collections
we need it for.
2016-05-18 15:43:20 +02:00
Javier Goizueta
48415fb1f3
Merge branch 'master' into overviews-widgets-2
2016-05-18 13:58:55 +02:00
Javier Goizueta
8da7cf73c1
Remove comment
2016-05-18 13:55:09 +02:00
Javier Goizueta
ba30f460ee
Remove comment
...
Overviews will not be used for dataview search
2016-05-18 13:42:58 +02:00
Javier Goizueta
e1aa0bc7ae
Use JSON format for EXPLAIN
2016-05-18 13:09:55 +02:00
Javier Goizueta
aa0ddaae95
Remove comment
2016-05-18 08:07:48 +02:00
Javier Goizueta
cb3706e5cf
Update Query Rewriter comments
2016-05-18 08:04:11 +02:00
Javier Goizueta
3d8f6576aa
Implement category and range filters
2016-05-18 07:48:11 +02:00
Javier Goizueta
42ef40282b
💄 shorten long lines
2016-05-17 15:46:13 +02:00
Javier Goizueta
7f7204df6c
Add filter stats information to query rewriter data
2016-05-17 15:41:31 +02:00
Javier Goizueta
3c6d930434
Fix bug
2016-05-17 15:39:32 +02:00
Raul Ochoa
8fb35571fe
Adds support for mapnik substitution token at turbo-carto level
...
Goes green and fixes #455
2016-05-17 15:00:18 +02:00
Javier Goizueta
df63fbbd04
Refactor filter application into own model
...
This also avoids storing an object in the overviews query rewriter
for the bbox filter (a plain data structure is used instead).
2016-05-17 13:55:00 +02:00
Javier Goizueta
9d82e8c27c
Use bounding box of dataviews to select overviews level
2016-05-13 20:47:36 +02:00
Javier Goizueta
224eb392ba
Add overviews-dependent dataviews behaviour
...
Now QueryRewriter is used in dataview objects they can decide
whether overviews are applicable, have the oportunity to
adapt queries for overviews, etc.
This is done by having overviews-related behaviour in models/dataview/overviews
and falling back to the regular models/dataview.
2016-05-13 18:46:58 +02:00
Raul Ochoa
c12e5f7a27
Fix named maps with analysis
...
Named map provider was missing analysis backend dependency
Fixes #450
2016-05-13 16:57:27 +02:00
Raul Ochoa
2e26e2e126
Use split strategy for head/tails turbo-carto quantification
2016-05-13 12:57:43 +02:00
Raul Ochoa
61765d20e1
Fail on turbo-carto specific errors
...
This will try to fallback on postcss errors so it still targets
carto parser in those cases.
Closes #434
2016-05-13 12:10:05 +02:00
Javier Goizueta
b574489950
Refactor to reduce cyclomatic complexity
2016-05-12 18:47:24 +02:00
Javier Goizueta
85788f42a6
Adapt QueryRewriter to new requirements
2016-05-12 18:30:10 +02:00
Javier Goizueta
5fb7f07498
Prevent problems with missing layers in mapconfig
2016-05-12 18:29:30 +02:00
Javier Goizueta
3300c095ed
Merge branch 'master' into overviews-widgets-2
2016-05-12 17:37:24 +02:00
Javier Goizueta
55cf0a8447
Fix typo
2016-05-12 16:43:09 +02:00
Javier Goizueta
64a87690ee
💄 Fix line lengths, etc.
2016-05-12 16:20:34 +02:00
Javier Goizueta
3890014250
Fix QueryRewriter use
...
QueryRewriter should be passed the query that would be used otherwise.
If QR cannot handle it, it will be returned unmodified.
So QR must be used when a query has been prepared and the result
of QR should be used to replace it.
2016-05-12 10:25:09 +02:00
Javier Goizueta
65612f0109
Add filters information at map instantion time to the query rewriter data
2016-05-11 19:24:13 +02:00
Raul Ochoa
3e4f71d873
Nicer error message when missing sql from layer options
...
Fixes #446
2016-05-11 18:24:47 +02:00
Javier Goizueta
fa19f90a6a
Apply overviews query rewriter to dataviews
...
This requires the QueryRewriter to handle a filters parametes in
its data (with Camshaft filter definitions) and a final
options parameters with a bounding_box parameter.
2016-05-11 18:18:22 +02:00
Raul Ochoa
4570d17ce1
Use original query from source nodes
...
Doing a st_transform doesn't make sense as we already should have
the_geom_webmercator column available
2016-05-10 17:09:36 +02:00
Raul Ochoa
6639664b3f
Allow override zoom+center or bbox for static named maps previews
2016-05-09 21:13:13 +02:00
Raul Ochoa
3e94e3288f
Use sql as replacement variable
2016-05-06 17:09:41 +02:00
Raul Ochoa
7d4caf6974
Analysis layers can have a sql_wrap option to wrap node queries
2016-05-06 16:37:52 +02:00
Raul Ochoa
c77ea49594
Use a more aggressive cache control header for node status endpoint
2016-05-05 17:52:37 +02:00
Raul Ochoa
e3d6da06a7
Remove console usage
2016-05-05 12:17:51 +02:00
Raul Ochoa
755dfe6822
Append dataviews related columns to layers
2016-04-27 18:30:05 +02:00
Raul Ochoa
dd731399dc
Starts using turbo-carto dependency
2016-04-26 16:28:05 +02:00
Raul Ochoa
c5bed48d61
Handle missing analyses nodes for layers pointing to them
...
Fixes #422
2016-04-21 17:24:52 +02:00
Raul Ochoa
93dd8a2213
Add analyses metadata for named maps excluding queries
2016-04-21 17:03:41 +02:00
Raul Ochoa
4e4a223f24
Better naming for analysis mapconfig adapter
2016-04-21 16:25:59 +02:00
Raul Ochoa
bc845b2e8d
Validate dataviews format before instantiating
2016-04-21 16:16:00 +02:00
Raul Ochoa
08ad961123
Adds support to return multiple errors in BaseController.sendError
2016-04-21 16:05:48 +02:00
