Changeset 3149

Timestamp:

Jun 13, 2006, 4:33:40 PM (18 years ago)

Author:

duncan

Message:

made geospatial.set_geo_reference more flexible.

Location:

inundation/geospatial_data

Files:

• geospatial_data.py (modified) (2 diffs)
• test_geospatial_data.py (modified) (2 diffs)

inundation/geospatial_data/geospatial_data.py

@@ -98 +98 @@
 
         self.set_verbose(verbose)
-
+        self.geo_reference=None #create the attribute 
         if file_name is None:
             if delimiter is not None:
@@ -165 +165 @@
         from coordinate_transforms.geo_reference import Geo_reference
 
-
         if geo_reference is None:
-            self.geo_reference = Geo_reference() # Use default
-        elif isinstance(geo_reference, Geo_reference):
-            self.geo_reference = geo_reference
-        else:
+            geo_reference = Geo_reference() # Use default
+        if not isinstance(geo_reference, Geo_reference):
             msg = 'Argument geo_reference must be a valid Geo_reference \n'
             msg += 'object or None.'
             raise msg
+
+        # if a geo ref already exists, change the point data to
+        # represent the new geo-ref
+        if  self.geo_reference is not None:
+            #print "self.geo_reference",self.geo_reference 
+            #print "geo_reference",geo_reference
+            #FIXME: Maybe put out a warning here...
+            self.data_points = geo_reference.change_points_geo_ref \
+                               (self.data_points, 
+                                self.geo_reference)
+            
+        self.geo_reference = geo_reference
 
 

inundation/geospatial_data/test_geospatial_data.py

@@ -113 +113 @@
             raise 'Should have raised exception' 
 
-
+    def test_set_geo_reference(self):
+        points_ab = [[12.5,34.7],[-4.5,-60.0]]
+        x_p = -10
+        y_p = -40
+        geo_ref = Geo_reference(56, x_p, y_p)
+        points_rel = geo_ref.change_points_geo_ref(points_ab)
+        spatial = Geospatial_data(points_rel)
+        # since the geo_ref wasn't set
+        assert not allclose( points_ab, spatial.get_data_points(absolute=True))
+        
+        spatial = Geospatial_data(points_rel, geo_reference=geo_ref)
+        assert allclose( points_ab, spatial.get_data_points(absolute=True))
+        
+        x_p = 10
+        y_p = 400
+        new_geo_ref = Geo_reference(56, x_p, y_p)
+        spatial.set_geo_reference(new_geo_ref)
+        assert allclose( points_ab, spatial.get_data_points(absolute=True))
+        
+        
+        
     def test_conversions_to_points_dict(self):
         """test conversions to points_dict
@@ -1170 +1190 @@
 
 if __name__ == "__main__":
-    #suite = unittest.makeSuite(Test_Geospatial_data, 'test_check_geo_reference1')
+    #suite = unittest.makeSuite(Test_Geospatial_data, 'test_set_geo_reference')
     suite = unittest.makeSuite(Test_Geospatial_data, 'test')
     runner = unittest.TextTestRunner()