Changeset 1148

Timestamp:

05/19/09 20:18:46 (15 months ago)

Author:

dane

Message:

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

Files:

• trunk/bindings/python/mapnik_layer.cpp (modified) (3 diffs)

trunk/bindings/python/mapnik_layer.cpp

@@ -31 +31 @@
 #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;
 
 
@@ -54 +55 @@
             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);
    }
 
@@ -102 +103 @@
         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));
         }