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

python bindings - revive from_wkb method

Browse source
This commit is contained in:
artemp 2015-03-11 12:40:39 +01:00
parent 26fdd0b680
commit b62694920b
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bindings/python/mapnik_geometry.cpp
View file

@ -93,13 +93,19 @@ namespace {
// return paths; // return paths;
//} //}
//std::shared_ptr<mapnik::geometry_container> from_wkb_impl(std::string const& wkb) std::shared_ptr<mapnik::new_geometry::geometry> from_wkb_impl(std::string const& wkb)
//{ {
// std::shared_ptr<mapnik::geometry_container> paths = std::make_shared<mapnik::geometry_container>(); std::shared_ptr<mapnik::new_geometry::geometry> geom = std::make_shared<mapnik::new_geometry::geometry>();
// if (!mapnik::geometry_utils::from_wkb(*paths, wkb.c_str(), wkb.size())) try
// throw std::runtime_error("Failed to parse WKB"); {
// return paths; *geom = std::move(mapnik::geometry_utils::from_wkb(wkb.c_str(), wkb.size()));
//} }
catch (...)
{
throw std::runtime_error("Failed to parse WKB");
}
return geom;
}
std::shared_ptr<mapnik::new_geometry::geometry> from_wkt_impl(std::string const& wkt) std::shared_ptr<mapnik::new_geometry::geometry> from_wkt_impl(std::string const& wkt)
{ {
@ -278,8 +284,10 @@ void export_geometry()
.def("envelope",&geometry_envelope_impl) .def("envelope",&geometry_envelope_impl)
.def("from_geojson", from_geojson_impl) .def("from_geojson", from_geojson_impl)
.def("from_wkt", from_wkt_impl) .def("from_wkt", from_wkt_impl)
.def("from_wkb", from_wkb_impl)
.staticmethod("from_geojson") .staticmethod("from_geojson")
.staticmethod("from_wkt") .staticmethod("from_wkt")
.staticmethod("from_wkb")
// .def("__str__",&mapnik::geometry_type::to_string) // .def("__str__",&mapnik::geometry_type::to_string)
.def("type",&geometry_type_impl) .def("type",&geometry_type_impl)
.def("is_valid", &geometry_is_valid_impl) .def("is_valid", &geometry_is_valid_impl)