cartodb/carto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds support for other turbo-carto functions

Browse Source
This commit is contained in:
Raul Ochoa 2016-07-20 13:17:10 +02:00
parent 0d6f9d4634
commit 803f0c0a49
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/carto/torque-reference.js
View File

@ -167,6 +167,15 @@ var _mapnik_reference_latest = {
["colorize-alpha", -1],
["color-to-alpha", 1],
["scale-hsla", 8],
["buckets", -1],
["category", -1],
["equal", -1],
["headtails", -1],
["jenks", -1],
["quantiles", -1],
["cartocolor", -1],
["colorbrewer", -1],
["range", -1],
["ramp", -1]
],
"doc": "A list of image filters."

17
test/rendering_js.test.js
View File

@ -166,4 +166,21 @@ describe('RenderingJS', function() {
assert.equal(st.args[2].value, 'jenks');
})
it.only("should parse turbocarto with inner functions", function(){
var css = [
'#layer {',
' marker-width: ramp([cartodb_id], cartocolor(Bold), category(10));',
'}'
].join('\n');
var shader = (new carto.RendererJS({ debug: true })).render(css);
var layer = shader.getLayers()[0];
var st = layer.shader['marker-width'].style({}, {zoom: 1});
assert.equal(st.name, "ramp");
assert.equal(st.args.length, 3);
assert.equal(st.args[1].name, 'cartocolor');
assert.equal(st.args[1].args[0].value, 'Bold');
assert.equal(st.args[2].name, 'category');
assert.equal(st.args[2].args[0].value, 10);
});
});