Changeset 6862

Timestamp:

12/03/07 02:16:09 (7 months ago)

Author:

jbronn

Message:

gis: gdal: Added GDAL_LIBRARY_PATH setting; added tests and extended support geometry transform; added the units method for spatial reference objects.

Files:

• django/branches/gis/django/contrib/gis/gdal/geometries.py (modified) (1 diff)
• django/branches/gis/django/contrib/gis/gdal/libgdal.py (modified) (1 diff)
• django/branches/gis/django/contrib/gis/gdal/srs.py (modified) (1 diff)
• django/branches/gis/django/contrib/gis/tests/test_gdal_geom.py (modified) (3 diffs)
• django/branches/gis/django/contrib/gis/tests/test_gdal_srs.py (modified) (1 diff)

django/branches/gis/django/contrib/gis/gdal/geometries.py

@@ -311 +311 @@
-        elif isinstance(coord_trans, SpatialReference):
-            geom_transform_to(self._ptr, coord_trans._ptr)
+        elif isinstance(coord_trans, (int, basestring)):
+            sr = SpatialReference(coord_trans)
+            geom_transform_to(self._ptr, sr._ptr)
-        else:
-            raise TypeError('Either a CoordTransform or a SpatialReference object required for transformation.')

django/branches/gis/django/contrib/gis/gdal/libgdal.py

@@ -4 +4 @@
-from django.contrib.gis.gdal.error import OGRException
-
-
+
+
+
+
+
+
+
+
+
+
-    # Windows NT shared library
-    lib_name = 'libgdal-1.dll'

django/branches/gis/django/contrib/gis/gdal/srs.py

@@ -226 +226 @@
-        return units
-
+    @property
+    def units(self):
+        """
+        Returns a 2-tuple of the units value and the units name, 
+        and will automatically determines whether to return the linear
+        or angular units.
+        """
+        if self.projected or self.local:
+            return linear_units(self._ptr, byref(c_char_p()))
+        elif self.geographic:
+            return angular_units(self._ptr, byref(c_char_p()))
+        else:
+            return (None, None)
+
-    #### Spheroid/Ellipsoid Properties ####
-    @property

django/branches/gis/django/contrib/gis/tests/test_gdal_geom.py

@@ -1 +1 @@
-import unittest
-from django.contrib.gis.gdal import OGRGeometry, OGRGeomType, \
-
+, CoordTransform
-from django.contrib.gis.tests.geometries import *
-
@@ -202 +202 @@
-            self.assertEqual(mpoly.wkt, OGRGeometry(mp.wkt).wkt)
-
-
+a
-        "Testing OGR Geometries with Spatial Reference objects."
-        for mp in multipolygons:
@@ -252 +252 @@
-                    self.assertEqual('WGS 72', ring.srs.name)
-                    self.assertEqual(4322, ring.srid)
+
+    def test09b_srs_transform(self):
+        "Testing transform()."
+        orig = OGRGeometry('POINT (-104.609252 38.255001)', 4326)
+        trans = OGRGeometry('POINT(992363.390841912 481455.395105533)', 2774)
+
+        # Using an srid, a SpatialReference object, and a CoordTransform object
+        # or transformations.
+        t1, t2, t3 = orig.clone(), orig.clone(), orig.clone()
+        t1.transform(trans.srid)
+        t2.transform(SpatialReference('EPSG:2774'))
+        ct = CoordTransform(SpatialReference('WGS84'), SpatialReference(2774))
+        t3.transform(ct)
+
+        for p in (t1, t2, t3):
+            self.assertAlmostEqual(trans.x, p.x, 7)
+            self.assertAlmostEqual(trans.y, p.y, 7)
-
-    def test10_difference(self):

django/branches/gis/django/contrib/gis/tests/test_gdal_srs.py

@@ -156 +156 @@
-        self.assertEqual('EPSG', s1['AUTHORITY'])
-        self.assertEqual(4326, int(s1['AUTHORITY', 1]))
-
+#
-        self.assertEqual(None, s1['FOOBAR'])
-