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

+ add unified interface to mapnik2.Feature:

Browse source 
add_geometries_from_wkt
    add_geometries_from_wkb
 and mapnik2.Path :
     from_wkt
     from_wkb
TODO: integrate mapnik2.Path with mapnik2.Feature (mapnik 2.1)
This commit is contained in:
Artem Pavlenko 2011-09-13 11:54:12 +00:00
parent fad2d7739b
commit 1fa78f32e0
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bindings/python/mapnik_feature.cpp
View file

@ -33,6 +33,7 @@
#include <mapnik/feature.hpp>
#include <mapnik/datasource.hpp>
#include <mapnik/wkb.hpp>
#include <mapnik/wkt/wkt_factory.hpp>
#include "mapnik_value_converter.hpp"
mapnik::geometry_type & (mapnik::Feature::*get_geom1)(unsigned) = &mapnik::Feature::get_geometry;
@ -41,16 +42,17 @@ namespace {
using mapnik::Feature;
using mapnik::geometry_utils;
using mapnik::from_wkt;
void feature_add_geometry_from_wkb(Feature &feature, std::string wkb)
void feature_add_geometries_from_wkb(Feature &feature, std::string wkb)
{
geometry_utils::from_wkb(feature, wkb.c_str(), wkb.size(), true);
geometry_utils::from_wkb(feature.paths(), wkb.c_str(), wkb.size(), true);
}
void add_geometry(Feature & feature, std::auto_ptr<mapnik::geometry_type> geom)
void feature_add_geometries_from_wkt(Feature &feature, std::string wkt)
{
feature.add_geometry(geom.get());
geom.release();
bool result = mapnik::from_wkt(wkt, feature.paths());
if (!result) throw std::runtime_error("Failed to parse WKT");
}
} // end anonymous namespace
@ -256,10 +258,12 @@ void export_feature()
boost::noncopyable>("Feature",init<int>("Default ctor."))
.def("id",&Feature::id)
.def("__str__",&Feature::to_string)
.def("add_geometry_from_wkb", &feature_add_geometry_from_wkb)
.def("add_geometry", add_geometry)
.def("num_geometries",&Feature::num_geometries)
.def("get_geometry", make_function(get_geom1,return_value_policy<reference_existing_object>()))
.def("add_geometries_from_wkb", &feature_add_geometries_from_wkb)
.def("add_geometries_from_wkt", &feature_add_geometries_from_wkt)
//.def("add_geometry", add_geometry)
//.def("num_geometries",&Feature::num_geometries)
//.def("get_geometry", make_function(get_geom1,return_value_policy<reference_existing_object>()))
.def("geometries",make_function(&Feature::paths,return_value_policy<reference_existing_object>()))
.def("envelope", &Feature::envelope)
.def(map_indexing_suite2<Feature, true >())
.def("iteritems",iterator<Feature> ())

9
bindings/python/mapnik_geometry.cpp
View file

@ -24,13 +24,13 @@
#include <boost/python/def.hpp>
#include <boost/python/exception_translator.hpp>
#include <boost/python/manage_new_object.hpp>
//#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
#include <boost/python/iterator.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
// mapnik
#include <mapnik/geometry.hpp>
#include <mapnik/wkt/wkt_factory.hpp>
#include <mapnik/wkb.hpp>
namespace {
@ -53,6 +53,11 @@ void from_wkt_impl(path_type& p, std::string const& wkt)
if (!result) throw std::runtime_error("Failed to parse WKT");
}
void from_wkb_impl(path_type& p, std::string const& wkb)
{
mapnik::geometry_utils::from_wkb(p, wkb.c_str(), wkb.size(), true);
}
}
void export_geometry()
@ -80,7 +85,7 @@ void export_geometry()
class_<path_type,boost::noncopyable>("Path")
.def("__getitem__", getitem_impl,return_value_policy<reference_existing_object>())
.def("from_wkt",from_wkt_impl)
.def("from_wkb",from_wkb_impl)
;
}