From 11bc9a03116565e9de5bee6395c8a9577baef2df Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Fri, 19 Apr 2013 11:59:58 +0100
Subject: [PATCH] + re-enable geojson generator

---
 src/json/geojson_generator.cpp | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/json/geojson_generator.cpp b/src/json/geojson_generator.cpp
index 34ec5e811..38ffb3d2a 100644
--- a/src/json/geojson_generator.cpp
+++ b/src/json/geojson_generator.cpp
@@ -20,13 +20,13 @@
  *
  *****************************************************************************/
 
+#define BOOST_SPIRIT_USE_PHOENIX_V3 1
+
 // boost
 #include <boost/version.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/json/geojson_generator.hpp>
 
-#define BOOST_SPIRIT_USE_PHOENIX_V3 1
-
 #if BOOST_VERSION >= 104700
 
 #include <mapnik/json/feature_generator_grammar.hpp>
@@ -36,28 +36,25 @@
 namespace  mapnik { namespace json {
 
 feature_generator::feature_generator()
-    : grammar_(0) {} // new feature_generator_grammar<sink_type>()) {}
+    : grammar_(new feature_generator_grammar<sink_type>()) {}
 
 feature_generator::~feature_generator() {}
 
 bool feature_generator::generate(std::string & geojson, mapnik::feature_impl const& f)
 {
-    //sink_type sink(geojson);
-    //return karma::generate(sink, *grammar_,f);
-    return false;
+    sink_type sink(geojson);
+    return karma::generate(sink, *grammar_,f);
 }
 
-
 geometry_generator::geometry_generator()
-    : grammar_(0) {} //new multi_geometry_generator_grammar<sink_type>()) {}
+    : grammar_(new multi_geometry_generator_grammar<sink_type>()) {}
 
 geometry_generator::~geometry_generator() {}
 
 bool geometry_generator::generate(std::string & geojson, mapnik::geometry_container const& g)
 {
-//sink_type sink(geojson);
-//  return karma::generate(sink, *grammar_,g);
-return false;
+    sink_type sink(geojson);
+    return karma::generate(sink, *grammar_,g);
 }
 
 }}