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

+ re-enable geojson generator

Browse source
This commit is contained in:
artemp 2013-04-19 11:59:58 +01:00
parent 8bb6bb1d68
commit 11bc9a0311
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/json/geojson_generator.cpp
View file

@ -20,13 +20,13 @@
* *
*****************************************************************************/ *****************************************************************************/
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
// boost // boost
#include <boost/version.hpp> #include <boost/version.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/json/geojson_generator.hpp> #include <mapnik/json/geojson_generator.hpp>
#define BOOST_SPIRIT_USE_PHOENIX_V3 1
#if BOOST_VERSION >= 104700 #if BOOST_VERSION >= 104700
#include <mapnik/json/feature_generator_grammar.hpp> #include <mapnik/json/feature_generator_grammar.hpp>
@ -36,28 +36,25 @@
namespace mapnik { namespace json { namespace mapnik { namespace json {
feature_generator::feature_generator() feature_generator::feature_generator()
: grammar_(0) {} // new feature_generator_grammar<sink_type>()) {} : grammar_(new feature_generator_grammar<sink_type>()) {}
feature_generator::~feature_generator() {} feature_generator::~feature_generator() {}
bool feature_generator::generate(std::string & geojson, mapnik::feature_impl const& f) bool feature_generator::generate(std::string & geojson, mapnik::feature_impl const& f)
{ {
//sink_type sink(geojson); sink_type sink(geojson);
//return karma::generate(sink, *grammar_,f); return karma::generate(sink, *grammar_,f);
return false;
} }
geometry_generator::geometry_generator() 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() {} geometry_generator::~geometry_generator() {}
bool geometry_generator::generate(std::string & geojson, mapnik::geometry_container const& g) bool geometry_generator::generate(std::string & geojson, mapnik::geometry_container const& g)
{ {
//sink_type sink(geojson); sink_type sink(geojson);
// return karma::generate(sink, *grammar_,g); return karma::generate(sink, *grammar_,g);
return false;
} }
}} }}