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

remove spirit::multi_pass - refs #2397

Browse source
This commit is contained in:
Dane Springmeyer 2014-08-26 16:22:12 -07:00
parent b6bfab99b8
commit 616896c6ee
2 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,6 @@
// boost // boost
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/spirit/include/support_multi_pass.hpp>
// mapnik // mapnik
#include <mapnik/unicode.hpp> #include <mapnik/unicode.hpp>
@ -49,7 +48,6 @@
#include <mapnik/json/geometry_grammar_impl.hpp> #include <mapnik/json/geometry_grammar_impl.hpp>
#include <boost/spirit/include/qi.hpp> #include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/support_multi_pass.hpp>
using mapnik::datasource; using mapnik::datasource;
using mapnik::parameters; using mapnik::parameters;
@ -127,43 +125,41 @@ geojson_datasource::geojson_datasource(parameters const& params)
} }
if (!inline_string_.empty()) if (!inline_string_.empty())
{ {
std::istringstream in(inline_string_); parse_geojson(inline_string_);
parse_geojson(in);
} }
else else
{ {
#if defined (_WINDOWS) #ifdef _WINDOWS
std::ifstream in(mapnik::utf8_to_utf16(filename_),std::ios_base::in | std::ios_base::binary); std::unique_ptr<std::FILE, int (*)(std::FILE *)> file(_wfopen(mapnik::utf8_to_utf16(filename_).c_str(), L"rb"), fclose);
#else #else
std::ifstream in(filename_.c_str(),std::ios_base::in | std::ios_base::binary); std::unique_ptr<std::FILE, int (*)(std::FILE *)> file(std::fopen(filename_.c_str(),"rb"), std::fclose);
#endif #endif
if (!in.is_open()) if (file == nullptr)
{ {
throw mapnik::datasource_exception("GeoJSON Plugin: could not open: '" + filename_ + "'"); throw mapnik::datasource_exception("GeoJSON Plugin: could not open: '" + filename_ + "'");
} }
parse_geojson(in); std::fseek(file.get(), 0, SEEK_END);
in.close(); std::size_t file_size = std::ftell(file.get());
std::fseek(file.get(), 0, SEEK_SET);
std::string file_buffer;
file_buffer.resize(file_size);
std::fread(&file_buffer[0], file_size, 1, file.get());
parse_geojson(file_buffer);
} }
} }
namespace { namespace {
using base_iterator_type = std::istreambuf_iterator<char>; using base_iterator_type = std::string::const_iterator;
const mapnik::transcoder tr("utf8"); const mapnik::transcoder tr("utf8");
const mapnik::json::feature_collection_grammar<boost::spirit::multi_pass<base_iterator_type>,mapnik::feature_impl> fc_grammar(tr); const mapnik::json::feature_collection_grammar<base_iterator_type,mapnik::feature_impl> fc_grammar(tr);
} }
template <typename T> template <typename T>
void geojson_datasource::parse_geojson(T & stream) void geojson_datasource::parse_geojson(T const& buffer)
{ {
boost::spirit::multi_pass<base_iterator_type> begin =
boost::spirit::make_default_multi_pass(base_iterator_type(stream));
boost::spirit::multi_pass<base_iterator_type> end =
boost::spirit::make_default_multi_pass(base_iterator_type());
boost::spirit::standard_wide::space_type space; boost::spirit::standard_wide::space_type space;
mapnik::context_ptr ctx = std::make_shared<mapnik::context_type>(); mapnik::context_ptr ctx = std::make_shared<mapnik::context_type>();
bool result = boost::spirit::qi::phrase_parse(begin, end, (fc_grammar)(boost::phoenix::ref(ctx)), space, features_); bool result = boost::spirit::qi::phrase_parse(buffer.begin(), buffer.end(), (fc_grammar)(boost::phoenix::ref(ctx)), space, features_);
if (!result) if (!result)
{ {
if (!inline_string_.empty()) throw mapnik::datasource_exception("geojson_datasource: Failed parse GeoJSON file from in-memory string"); if (!inline_string_.empty()) throw mapnik::datasource_exception("geojson_datasource: Failed parse GeoJSON file from in-memory string");

2
plugins/input/geojson/geojson_datasource.hpp
View file

@ -82,7 +82,7 @@ public:
mapnik::layer_descriptor get_descriptor() const; mapnik::layer_descriptor get_descriptor() const;
boost::optional<mapnik::datasource::geometry_t> get_geometry_type() const; boost::optional<mapnik::datasource::geometry_t> get_geometry_type() const;
template <typename T> template <typename T>
void parse_geojson(T & stream); void parse_geojson(T const& buffer);
private: private:
mapnik::datasource::datasource_t type_; mapnik::datasource::datasource_t type_;
std::map<std::string, mapnik::parameters> statistics_; std::map<std::string, mapnik::parameters> statistics_;