fix test failure when calling ds.all_features() by allowing a simple Box2d Query contructor - sidestepping issue of converting a python tuple to a boost tuple atm

This commit is contained in:
Dane Springmeyer 2010-09-26 23:39:04 +00:00
parent 03250d0efe
commit 154450fb8b
3 changed files with 9 additions and 1 deletions

View file

@ -234,7 +234,7 @@ class _Datasource(Datasource,_injector):
def field_types(self):
return map(get_types,self._field_types())
def all_features(self):
query = Query(self.envelope(),1.0)
query = Query(self.envelope())
for fld in self.fields():
query.add_property_name(fld)
return self.features(query).features

View file

@ -42,6 +42,7 @@ void export_query()
class_<query>("Query", "a spatial query data object",
init<box2d<double>,query::resolution_type const&,double>() )
.def(init<box2d<double> >())
.def_pickle(query_pickle_suite())
.add_property("resolution",make_function(&query::resolution,
return_value_policy<copy_const_reference>()))

View file

@ -56,6 +56,13 @@ public:
scale_denominator_(scale_denominator),
filter_factor_(1.0)
{}
query(box2d<double> const& bbox)
: bbox_(bbox),
resolution_(resolution_type(1.0,1.0)),
scale_denominator_(1.0),
filter_factor_(1.0)
{}
query(query const& other)
: bbox_(other.bbox_),