Marker-type only being parsed out of first style block

[andrewxhill]

examples

http://examples.cartodb.com/tiles/carto_tests/0/0/0.png?style=%23carto_tests+%7B+marker-type%3Aellipse%3B+%7D+%23carto_tests+%5Bid%3D1%5D+%7B+marker-fill%3Ared%3B+%7D+&sql=SELECT+1+as+id%2C+st_envelope%28st_buffer%28st_transform%28st_setsrid%28st_makepoint%2810%2Ax%2C10%2Ax%29%2C4326%29%2C3857%29%2C10000000%29%29+as+the_geom_webmercator+FROM+generate_series%28-6%2C6%29+x+UNION+ALL+SELECT+1+as+name%2C+st_transform%28st_setsrid%28st_makepoint%2810%2Ax%2C10%2Ax%29%2C4326%29%2C3857%29+as+the_geom_webmercator+FROM+generate_series%28-6%2C6%29+x

staging20

http://staging20.cartodb.com/tiles/carto_tests/0/0/0.png?style=%23carto_tests+%7B+marker-type%3Aellipse%3B+%7D+%23carto_tests+%5Bid%3D1%5D+%7B+marker-fill%3Ared%3B+%7D+&sql=SELECT+1+as+id%2C+st_envelope%28st_buffer%28st_transform%28st_setsrid%28st_makepoint%2810%2Ax%2C10%2Ax%29%2C4326%29%2C3857%29%2C10000000%29%29+as+the_geom_webmercator+FROM+generate_series%28-6%2C6%29+x+UNION+ALL+SELECT+1+as+name%2C+st_transform%28st_setsrid%28st_makepoint%2810%2Ax%2C10%2Ax%29%2C4326%29%2C3857%29+as+the_geom_webmercator+FROM+generate_series%28-6%2C6%29+x

[strk]

In more readable code, this is about this Mapnik-2.0.x style:

#carto_tests { marker-type:ellipse; } 
#carto_tests [id=1] { marker-fill:red; }

Needing to be converted to 2.1.0, where the default marker-type with lineal and polygonal input changed from arrow to ellipse.

Our current transformer adds [mapnik-geometry-type>1] { marker-type:arrow; } when it sees no explicit marker-type directive given in a block. In this case the explicit directive is given in another block, so the [id=1] block (which catches all input, btw) still gets the marker-type:arrow directly added.

[strk]

Current plan to fix this: consider blocks with no conditions in a special way, considering they'll be applied to all later blocks.

To research: what happens if the same directive appears multiple times, which one takes precedence.
Also: what happens when multiple blocks with no conditions are added (same thing: which one takes precedence).

Of course this won' t fix all cases, but hopefully most common ones.