From 38ec14c739702d165a7745abae7616c2afd73746 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 12 May 2016 18:52:05 +0200
Subject: [PATCH] topojson - use json.value directly

---
 include/mapnik/json/topojson_grammar.hpp      | 1 -
 include/mapnik/json/topojson_grammar_impl.hpp | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

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<Iterator, space_type, mapnik::topojson::properties()> properties;
     qi::rule<Iterator, space_type, mapnik::topojson::properties()> attributes;
-    qi::rule<Iterator, space_type, mapnik::json::json_value()> attribute_value;
     // id
     qi::rule<Iterator,space_type> 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<Iterator, ErrorHandler>::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(']') ;