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

instantiate geojson grammar using chr_iterator_type = char const* - via #2700

Browse source
This commit is contained in:
artemp 2015-02-12 11:51:11 +01:00
parent 81ef45b06c
commit e8f397c41c
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugins/input/geojson/large_geojson_featureset.cpp
View file

@ -23,8 +23,8 @@
// mapnik
#include <mapnik/feature.hpp>
#include <mapnik/feature_factory.hpp>
#include <mapnik/json/geometry_grammar_impl.hpp>
#include <mapnik/json/feature_grammar_impl.hpp>
#include <mapnik/json/geometry_grammar.hpp>
#include <mapnik/json/feature_grammar.hpp>
#include <mapnik/utils.hpp>
// stl
#include <string>
@ -62,9 +62,10 @@ mapnik::feature_ptr large_geojson_featureset::next()
std::vector<char> json;
json.resize(size);
std::fread(json.data(), size, 1, file_.get());
using chr_iterator_type = std::vector<char>::const_iterator;
chr_iterator_type start = json.begin();
chr_iterator_type end = json.end();
using chr_iterator_type = char const*;
chr_iterator_type start = json.data();
chr_iterator_type end = start + json.size();
static const mapnik::transcoder tr("utf8");
static const mapnik::json::feature_grammar<chr_iterator_type,mapnik::feature_impl> grammar(tr);