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

fix geojson plugin by avoiding static const grammar for now

Browse source
This commit is contained in:
Dane Springmeyer 2014-07-28 18:39:29 -07:00
parent 8ae5d322db
commit 5fc2e01531
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/input/geojson/geojson_datasource.cpp
View file

@ -155,9 +155,12 @@ void geojson_datasource::parse_geojson(T & stream)
boost::spirit::multi_pass<base_iterator_type> end = boost::spirit::multi_pass<base_iterator_type> end =
boost::spirit::make_default_multi_pass(base_iterator_type()); boost::spirit::make_default_multi_pass(base_iterator_type());
// FIXME - for perf we need to declare grammar as 'static const'
// but we cannot because then all features will interact only with the first context_ptr
// created in the process which leads to very odd bugs
mapnik::context_ptr ctx = std::make_shared<mapnik::context_type>(); mapnik::context_ptr ctx = std::make_shared<mapnik::context_type>();
static const mapnik::transcoder tr("utf8"); mapnik::transcoder tr("utf8");
static const mapnik::json::feature_collection_grammar<boost::spirit::multi_pass<base_iterator_type>,mapnik::feature_impl> fc_grammar(ctx, tr); mapnik::json::feature_collection_grammar<boost::spirit::multi_pass<base_iterator_type>,mapnik::feature_impl> fc_grammar(ctx, tr);
boost::spirit::standard_wide::space_type space; boost::spirit::standard_wide::space_type space;
bool result = boost::spirit::qi::phrase_parse(begin, end, fc_grammar, space, features_); bool result = boost::spirit::qi::phrase_parse(begin, end, fc_grammar, space, features_);
if (!result) if (!result)