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

via a layer object pickle datasource params rather than the datasource object itself - see #345

Browse source
This commit is contained in:
Dane Springmeyer 2009-05-20 00:18:46 +00:00
parent 9a2894dc3c
commit 424980d92b
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bindings/python/mapnik_layer.cpp
View file

@ -30,10 +30,11 @@
// mapnik
#include <mapnik/layer.hpp>
#include <mapnik/datasource.hpp>
#include <mapnik/datasource_cache.hpp>
using mapnik::Layer;
using mapnik::parameters;
using mapnik::datasource;
using mapnik::datasource_cache;
struct layer_pickle_suite : boost::python::pickle_suite
@ -53,7 +54,7 @@ struct layer_pickle_suite : boost::python::pickle_suite
{
s.append(style_names[i]);
}
return boost::python::make_tuple(l.abstract(),l.title(),l.clear_label_cache(),l.getMinZoom(),l.getMaxZoom(),l.isQueryable(),l.datasource(),s);
return boost::python::make_tuple(l.abstract(),l.title(),l.clear_label_cache(),l.getMinZoom(),l.getMaxZoom(),l.isQueryable(),l.datasource()->params(),s);
}
static void
@ -101,8 +102,8 @@ struct layer_pickle_suite : boost::python::pickle_suite
if (state[6])
{
boost::shared_ptr<datasource> ds = extract<boost::shared_ptr<datasource> >(state[6]);
l.set_datasource(ds);
mapnik::parameters params = extract<parameters>(state[6]);
l.set_datasource(datasource_cache::instance()->create(params));
}
boost::python::list s = extract<boost::python::list>(state[7]);