Changeset 930

Timestamp:

10/24/07 12:04:31

Author:

dokai

Message:

Implemented pickle support for DiskFeatureStore? and applied the "EPSG over
PROJ.4 preference" code from DiskFeatureStore? to DiskRasterStore?.

Files:

• PCL/trunk/PCL-GDAL/cartography/data/disk.py (modified) (3 diffs)
• PCL/trunk/PCL-GDAL/tests/testdiskfeatures.py (modified) (3 diffs)

PCL/trunk/PCL-GDAL/cartography/data/disk.py

@@ -81 +81 @@
-        """
-        self.path = path
+        self._featuretypes = {}
+        self._initialize_featuretypes()
+
+    def __getstate__(self):
+        """Pickle support"""
+        return (self.path,)
+
+    def __setstate__(self, state):
+        """Pickle support"""
+        self.path, = state
-        self._featuretypes = {}
-        self._initialize_featuretypes()
@@ -446 +456 @@
-        """Return an informational dict, implementing IDataSource"""
-        ds = gdal.Open(self.path)
-s
-s
-s
+ef
+ef
+ef
-        proj = proj4.strip()
-
+
+
+
+
+
+
+
+
+
+
+
-        g = ds.GetGeoTransform()
-        size = (ds.RasterXSize, ds.RasterYSize)
@@ -464 +484 @@
-        r = ((b[2] - b[0]) / size[0], (b[3] - b[1]) / size[1])
-        return {'typename': typename or self.typenames()[0], 
-
+.toEPSG() or srs.tostring()
-                'bands': p, 'size': size, 'resolution': r}
-

PCL/trunk/PCL-GDAL/tests/testdiskfeatures.py

@@ -60 +60 @@
-        typenames = store.typenames()
-        self.assert_(typenames == TYPENAMES, typenames)
+
+class PickleTest(unittest.TestCase):
+    """Test that PGFeatureStore can be pickled."""
+
+    def test_picklesupport(self):
+        import pickle
+        from sets import Set
+        store = DiskFeatureStore(DISKSTORE)
+        typenames_before = Set(store.typenames())
+        persisted = pickle.dumps(store)
+        del store
+        resurrected = pickle.loads(persisted)
+        self.assertEquals(typenames_before, Set(resurrected.typenames()))
-
-class StoreTest(unittest.TestCase):
@@ -191 +204 @@
-        self.assertEqual(store.typenames(), ['raster.vrt'])
-        self.assertEqual(store.info(),
-+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs
+EPSG:4326
-             'bands': [['Band 1', 'Byte']],
-             'bounds': (-8.0333333000000007, 49.233343899999994, 2.8333224999999995, 59.8333333), 
@@ -207 +220 @@
-        [unittest.makeSuite(klass)
-         for klass
-
+, PickleTest
-         ])
-