diff --git a/include/mapnik/json/topojson_grammar.hpp b/include/mapnik/json/topojson_grammar.hpp index eec2bb41a..7f42ce58c 100644 --- a/include/mapnik/json/topojson_grammar.hpp +++ b/include/mapnik/json/topojson_grammar.hpp @@ -70,7 +70,6 @@ private: // properties qi::rule properties; qi::rule attributes; - qi::rule attribute_value; // id qi::rule id; }; diff --git a/include/mapnik/json/topojson_grammar_impl.hpp b/include/mapnik/json/topojson_grammar_impl.hpp index f41ccb97c..5d0306e84 100644 --- a/include/mapnik/json/topojson_grammar_impl.hpp +++ b/include/mapnik/json/topojson_grammar_impl.hpp @@ -262,10 +262,9 @@ topojson_grammar::topojson_grammar() >> (( lit('{') >> attributes >> lit('}')) | json.object) ; - attributes = (json.string_ >> lit(':') >> attribute_value) % lit(',') + attributes = (json.string_ >> lit(':') >> json.value) % lit(',') ; - attribute_value %= json.number | json.string_ ; arcs = lit("\"arcs\"") >> lit(':') >> lit('[') >> -( arc % lit(',')) >> lit(']') ;