From 9f89ce17a6bd5d24bc9663a12e4b091f3d1ba23a Mon Sep 17 00:00:00 2001
From: Artem Pavlenko <artem@mapnik.org>
Date: Fri, 9 Dec 2011 11:28:41 +0000
Subject: [PATCH 1/2] + increase coordinates precision

---
 include/mapnik/util/geometry_wkt_generator.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/mapnik/util/geometry_wkt_generator.hpp b/include/mapnik/util/geometry_wkt_generator.hpp
index 38ce28a02..7ff923ce0 100644
--- a/include/mapnik/util/geometry_wkt_generator.hpp
+++ b/include/mapnik/util/geometry_wkt_generator.hpp
@@ -78,6 +78,7 @@ struct coordinate_policy : karma::real_policies<T>
 {
     typedef boost::spirit::karma::real_policies<T> base_type;
     static int floatfield(T n) { return base_type::fmtflags::fixed; }
+    static unsigned precision(T n) { return 6u ;}
 };
 
 

From 05fbb2b6462a04fac434e89550eb47e7a8671c60 Mon Sep 17 00:00:00 2001
From: Artem Pavlenko <artem@mapnik.org>
Date: Fri, 9 Dec 2011 11:29:34 +0000
Subject: [PATCH 2/2] SVG generator impl

---
 .../mapnik/util/geometry_svg_generator.hpp    | 105 ++++++++++++++++--
 1 file changed, 93 insertions(+), 12 deletions(-)

diff --git a/include/mapnik/util/geometry_svg_generator.hpp b/include/mapnik/util/geometry_svg_generator.hpp
index e69070148..22337ed1c 100644
--- a/include/mapnik/util/geometry_svg_generator.hpp
+++ b/include/mapnik/util/geometry_svg_generator.hpp
@@ -30,7 +30,6 @@
 #include <mapnik/geometry.hpp>
 #include <mapnik/util/vertex_iterator.hpp>
 #include <mapnik/util/container_adapter.hpp>
-
 // boost
 #include <boost/tuple/tuple.hpp>
 #include <boost/spirit/include/karma.hpp>
@@ -38,6 +37,8 @@
 #include <boost/spirit/include/phoenix_operator.hpp>
 #include <boost/spirit/include/phoenix_fusion.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>
+#include <boost/spirit/home/phoenix/statement/if.hpp>
+#include <boost/fusion/include/boost_tuple.hpp>
 
 //#define BOOST_SPIRIT_USE_PHOENIX_V3 1
 
@@ -46,20 +47,100 @@ namespace mapnik { namespace util {
 namespace karma = boost::spirit::karma;
 namespace phoenix = boost::phoenix;
 
-template <typename OutputIterator>
-bool generate_svg (OutputIterator sink, mapnik::geometry_type const& geom)
+namespace detail {
+struct get_type
 {
-    using boost::spirit::karma::double_;
-    using boost::spirit::karma::uint_;
-    using boost::spirit::karma::generate;
-    return generate (sink,
-                     // begin grammar                  
-                     ((&uint_(mapnik::SEG_MOVETO) << 'M' | 'L')
-                      << " " << double_ << " " << double_) % ' '
-                     // end grammar
-                    , geom);
+    template <typename T>
+    struct result { typedef int type; };
+
+    int operator() (geometry_type const& geom) const
+    {
+        return (int)geom.type();
+    }
+};
+
+struct get_first
+{
+    template <typename T>
+    struct result { typedef geometry_type::value_type const type; };
+
+    geometry_type::value_type const operator() (geometry_type const& geom) const
+    {
+        geometry_type::value_type coord;
+        boost::get<0>(coord) = geom.get_vertex(0,&boost::get<1>(coord),&boost::get<2>(coord));
+        return coord;
+    }
+};
+
+template <typename T>
+struct coordinate_policy : karma::real_policies<T>
+{
+    typedef boost::spirit::karma::real_policies<T> base_type;
+    static int floatfield(T n) { return base_type::fmtflags::fixed; }
+    static unsigned precision(T n) { return 6u ;}
+};
 }
 
+template <typename OutputIterator>
+struct svg_generator : 
+        karma::grammar<OutputIterator, geometry_type const& ()>
+{
+    
+    svg_generator()
+        : svg_generator::base_type(svg)
+    {
+        using boost::spirit::karma::uint_;
+        using boost::spirit::karma::_val;
+        using boost::spirit::karma::_1;
+        using boost::spirit::karma::lit;
+        using boost::spirit::karma::_a;
+        
+        svg = point | linestring | polygon 
+            ;
+        
+        point = &uint_(mapnik::Point)[_1 = _type(_val)] 
+            << svg_point [_1 = _first(_val)]
+            ;
+        
+        svg_point = &uint_ 
+            << lit("cx=\"") << coord_type 
+            << lit("\" cy=\"") << coord_type
+            << lit('\"')
+            ;
+        
+        linestring = &uint_(mapnik::LineString)[_1 = _type(_val)] 
+            << svg_path  
+            ;
+        
+        polygon = &uint_(mapnik::Polygon)[_1 = _type(_val)]
+            << svg_path
+            ;
+        
+        svg_path %= ((&uint_(mapnik::SEG_MOVETO) << lit('M') 
+                      | &uint_(mapnik::SEG_LINETO) [_a +=1] << karma::string [if_(_a == 1) [_1 = "L" ] ])
+                     << lit(' ') << coord_type << lit(' ') << coord_type) % lit(' ')
+            ;
+        
+        
+        
+    }
+    // rules
+    karma::rule<OutputIterator, geometry_type const& ()> svg; 
+    karma::rule<OutputIterator, geometry_type const& ()> point;
+    karma::rule<OutputIterator, geometry_type const& ()> linestring;
+    karma::rule<OutputIterator, geometry_type const& ()> polygon;
+
+    karma::rule<OutputIterator, geometry_type::value_type ()> svg_point;
+    karma::rule<OutputIterator, karma::locals<unsigned>, geometry_type const& ()> svg_path;    
+
+    // phoenix functions
+    phoenix::function<detail::get_type > _type;
+    phoenix::function<detail::get_first> _first;
+    //
+    karma::real_generator<double, detail::coordinate_policy<double> > coord_type;
+    
+};
+
 }}
 
 #endif // MAPNIK_GEOMETRY_SVG_GENERATOR_HPP