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

python bindings - revive 'to_wkb(byteOrder)' method

Browse source
This commit is contained in:
artemp 2015-03-16 16:15:21 +01:00
parent 642bdfa78c
commit ad393cdd75
1 changed files with 20 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
bindings/python/mapnik_geometry.cpp
View file

@ -50,6 +50,7 @@
#include <mapnik/wkt/wkt_factory.hpp> // from_wkt/to_wkt #include <mapnik/wkt/wkt_factory.hpp> // from_wkt/to_wkt
#include <mapnik/json/geometry_parser.hpp> // from_geojson #include <mapnik/json/geometry_parser.hpp> // from_geojson
#include <mapnik/util/geometry_to_geojson.hpp> // to_geojson #include <mapnik/util/geometry_to_geojson.hpp> // to_geojson
#include <mapnik/util/geometry_to_wkb.hpp> // to_wkb
//#include <mapnik/util/geometry_to_svg.hpp> //#include <mapnik/util/geometry_to_svg.hpp>
#include <mapnik/wkb.hpp> #include <mapnik/wkb.hpp>
@ -59,7 +60,6 @@
namespace { namespace {
std::shared_ptr<mapnik::new_geometry::geometry> 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::new_geometry::geometry> geom = std::make_shared<mapnik::new_geometry::geometry>(); std::shared_ptr<mapnik::new_geometry::geometry> geom = std::make_shared<mapnik::new_geometry::geometry>();
@ -99,43 +99,24 @@ inline std::string boost_version()
return s.str(); return s.str();
} }
//PyObject* to_wkb(mapnik::geometry_type const& geom, mapnik::util::wkbByteOrder byte_order) PyObject* to_wkb(mapnik::new_geometry::geometry const& geom, mapnik::wkbByteOrder byte_order)
//{ {
// mapnik::util::wkb_buffer_ptr wkb = mapnik::util::to_wkb(geom,byte_order); mapnik::util::wkb_buffer_ptr wkb = mapnik::util::to_wkb(geom,byte_order);
// if (wkb) if (wkb)
// { {
// return return
//#if PY_VERSION_HEX >= 0x03000000 #if PY_VERSION_HEX >= 0x03000000
// ::PyBytes_FromStringAndSize ::PyBytes_FromStringAndSize
//#else #else
// ::PyString_FromStringAndSize ::PyString_FromStringAndSize
//#endif #endif
// ((const char*)wkb->buffer(),wkb->size()); ((const char*)wkb->buffer(),wkb->size());
// } }
// else else
// { {
// Py_RETURN_NONE; Py_RETURN_NONE;
// } }
//} }
//PyObject* to_wkb2( mapnik::geometry_container const& p, mapnik::util::wkbByteOrder byte_order)
//{
// mapnik::util::wkb_buffer_ptr wkb = mapnik::util::to_wkb(p,byte_order);
// if (wkb)
// {
// return
//#if PY_VERSION_HEX >= 0x03000000
// ::PyBytes_FromStringAndSize
//#else
// ::PyString_FromStringAndSize
//#endif
// ((const char*)wkb->buffer(),wkb->size());
// }
// else
// {
// Py_RETURN_NONE;
// }
//}
std::string to_geojson_impl(mapnik::new_geometry::geometry const& geom) std::string to_geojson_impl(mapnik::new_geometry::geometry const& geom)
{ {
@ -243,7 +224,7 @@ void export_geometry()
.def("is_simple", &geometry_is_simple_impl) .def("is_simple", &geometry_is_simple_impl)
.def("correct", &geometry_correct_impl) .def("correct", &geometry_correct_impl)
.def("centroid",&geometry_centroid_impl) .def("centroid",&geometry_centroid_impl)
//.def("to_wkb",&to_wkb) .def("to_wkb",&to_wkb)
.def("to_wkt",&to_wkt_impl) .def("to_wkt",&to_wkt_impl)
.def("to_geojson",&to_geojson_impl) .def("to_geojson",&to_geojson_impl)
//.def("to_svg",&to_svg) //.def("to_svg",&to_svg)