sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simplify rules

Browse source
This commit is contained in:
artemp 2016-05-17 13:05:53 +02:00
parent 8f74de8525
commit c66fd480b5
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/mapnik/json/topojson_grammar.hpp
View file

@ -69,7 +69,6 @@ private:
qi::rule<Iterator, space_type, std::vector<index_type>()> ring;
// properties
qi::rule<Iterator, space_type, mapnik::topojson::properties()> properties;
qi::rule<Iterator, space_type, mapnik::topojson::properties()> attributes;
};
}}

6
include/mapnik/json/topojson_grammar_impl.hpp
View file

@ -271,13 +271,9 @@ topojson_grammar<Iterator, ErrorHandler>::topojson_grammar()
properties = lit("\"properties\"")
>> lit(':')
>> lit('{') >> attributes >> lit('}')
>> lit('{') >> (json.string_ >> lit(':') >> json.value) % lit(',') >> lit('}')
;
attributes = (json.string_ >> lit(':') >> json.value) % lit(',')
;
arcs = lit("\"arcs\"") >> lit(':')
>> lit('[') >> -( arc % lit(',')) >> lit(']') ;