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

return string repr of types rather than dodgy type conversion in python

Browse source
This commit is contained in:
Dane Springmeyer 2011-07-12 00:58:02 +00:00
parent a726787a40
commit a6a8e8348a
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bindings/python/mapnik/__init__.py
View file

@ -231,23 +231,11 @@ class _Projection(Projection,_injector):
"""
return inverse_(obj,self)
def get_types(num):
dispatch = {1: int,
2: float,
3: float,
4: str,
5: Geometry2d,
6: object}
return dispatch.get(num)
class _Datasource(Datasource,_injector):
def describe(self):
return Describe(self)
def field_types(self):
return map(get_types,self._field_types())
def all_features(self,fields=None):
query = Query(self.envelope())
attributes = fields or self.fields()
@ -657,6 +645,7 @@ __all__ = [
#'ColorBand',
'CompositeOp',
'DatasourceCache',
'MemoryDatasource',
'Box2d',
'Feature',
'Featureset',

21
bindings/python/mapnik_datasource.cpp
View file

@ -136,7 +136,24 @@ boost::python::list field_types(boost::shared_ptr<mapnik::datasource> const& ds)
for (; it != end; ++it)
{
unsigned type = it->get_type();
fld_types.append(type);
if (type == mapnik::Integer)
// this crashes, so send back strings instead
//fld_types.append(boost::python::object(boost::python::handle<>(&PyInt_Type)));
fld_types.append(boost::python::str("int"));
else if (type == mapnik::Float)
fld_types.append(boost::python::str("float"));
else if (type == mapnik::Double)
fld_types.append(boost::python::str("float"));
else if (type == mapnik::String)
fld_types.append(boost::python::str("str"));
else if (type == mapnik::Boolean)
fld_types.append(boost::python::str("bool"));
else if (type == mapnik::Geometry)
fld_types.append(boost::python::str("geometry"));
else if (type == mapnik::Object)
fld_types.append(boost::python::str("object"));
else
fld_types.append(boost::python::str("unknown"));
}
}
return fld_types;
@ -153,7 +170,7 @@ void export_datasource()
.def("features",&datasource::features)
.def("bind",&datasource::bind)
.def("fields",&fields)
.def("_field_types",&field_types)
.def("field_types",&field_types)
.def("encoding",&encoding) //todo expose as property
.def("name",&name)
.def("features_at_point",&datasource::features_at_point)