+ ident
This commit is contained in:
parent
abd40edfd9
commit
f802a4a60b
1 changed files with 32 additions and 32 deletions
|
@ -32,30 +32,30 @@
|
||||||
|
|
||||||
namespace mapnik { namespace json {
|
namespace mapnik { namespace json {
|
||||||
|
|
||||||
feature_generator::feature_generator()
|
feature_generator::feature_generator()
|
||||||
: grammar_(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 const& f)
|
bool feature_generator::generate(std::string & geojson, mapnik::Feature const& f)
|
||||||
{
|
{
|
||||||
sink_type sink(geojson);
|
sink_type sink(geojson);
|
||||||
return karma::generate(sink, *grammar_,f);
|
return karma::generate(sink, *grammar_,f);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
geometry_generator::geometry_generator()
|
geometry_generator::geometry_generator()
|
||||||
: grammar_(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);
|
||||||
}
|
}
|
||||||
|
|
||||||
}}
|
}}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
|
@ -65,22 +65,22 @@ namespace mapnik { namespace json {
|
||||||
|
|
||||||
namespace mapnik { namespace json {
|
namespace mapnik { namespace json {
|
||||||
|
|
||||||
bool feature_generator::generate(std::string & geojson, mapnik::Feature const& f)
|
bool feature_generator::generate(std::string & geojson, mapnik::Feature const& f)
|
||||||
{
|
{
|
||||||
std::ostringstream s;
|
std::ostringstream s;
|
||||||
s << BOOST_VERSION/100000 << "." << BOOST_VERSION/100 % 1000 << "." << BOOST_VERSION % 100;
|
s << BOOST_VERSION/100000 << "." << BOOST_VERSION/100 % 1000 << "." << BOOST_VERSION % 100;
|
||||||
throw std::runtime_error("feature_generator::generate() requires at least boost 1.47 while your build was compiled against boost " + s.str());
|
throw std::runtime_error("feature_generator::generate() requires at least boost 1.47 while your build was compiled against boost " + s.str());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool geometry_generator::generate(std::string & geojson, mapnik::geometry_container const& g)
|
bool geometry_generator::generate(std::string & geojson, mapnik::geometry_container const& g)
|
||||||
{
|
{
|
||||||
std::ostringstream s;
|
std::ostringstream s;
|
||||||
s << BOOST_VERSION/100000 << "." << BOOST_VERSION/100 % 1000 << "." << BOOST_VERSION % 100;
|
s << BOOST_VERSION/100000 << "." << BOOST_VERSION/100 % 1000 << "." << BOOST_VERSION % 100;
|
||||||
throw std::runtime_error("geometry_generator::generate() requires at least boost 1.47 while your build was compiled against boost " + s.str());
|
throw std::runtime_error("geometry_generator::generate() requires at least boost 1.47 while your build was compiled against boost " + s.str());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
}}
|
}}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue