Changeset 3149 for inundation/geospatial_data/geospatial_data.py

Timestamp:

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

Author:

duncan

Message:

made geospatial.set_geo_reference more flexible.

File:

• inundation/geospatial_data/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