Changeset 4452

Timestamp:

May 16, 2007, 2:53:14 PM (18 years ago)

Author:

duncan

Message:

This revision is unstable. Don't check in to this revision.

File:

• anuga_core/source/anuga/geospatial_data/geospatial_data.py (modified) (8 diffs)

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -11 +11 @@
                         size, shape
 from random import randint
+from copy import deepcopy
+
 #from MA import tolist
 
@@ -17 +19 @@
 from anuga.utilities.numerical_tools import ensure_numeric
 from anuga.coordinate_transforms.geo_reference import Geo_reference, \
-     TitleError, DEFAULT_ZONE
+     TitleError, DEFAULT_ZONE, ensure_geo_reference, write_NetCDF_georeference
 from anuga.coordinate_transforms.redfearn import convert_from_latlon_to_utm
 from anuga.utilities.anuga_exceptions import ANUGAError
@@ -220 +222 @@
 
     def set_geo_reference(self, geo_reference):
-
+        """
+        Set's the georeference of geospatial.
+        It can also be used to change the georeference
+        """
         from anuga.coordinate_transforms.geo_reference import Geo_reference
 
         if geo_reference is None:
             geo_reference = Geo_reference() # Use default
+        geo_reference = ensure_geo_reference(geo_reference)
         if not isinstance(geo_reference, Geo_reference):
             msg = 'Argument geo_reference must be a valid Geo_reference \n'
@@ -564 +570 @@
         The point_dict is defined at the top of this file.
         
-        If absolute is True data points at returned added to the xll and yll 
-        and geo_reference as None
+        If absolute is True data the xll and yll are added to the points value 
+        and the xll and yll of the geo_reference are set to 0.
         
         If absolute is False data points at returned as relative to the xll 
@@ -579 +585 @@
             msg = '.xya format is deprecated.  Please use .txt.'
             warn(msg, DeprecationWarning)
-            if absolute is True:         
+            if absolute is True:     
+                geo_ref = deepcopy(self.geo_reference)
+                geo_ref.xllcorner = 0
+                geo_ref.yllcorner = 0    
                 _write_xya_file(file_name,
                                 self.get_data_points(absolute=True), 
-                                self.get_all_attributes())
+                                self.get_all_attributes(),
+                                geo_ref)
             else:
                 _write_xya_file(file_name,
@@ -591 +601 @@
         elif (file_name[-4:] == ".pts"):
             if absolute is True:
+                geo_ref = deepcopy(self.geo_reference)
+                geo_ref.xllcorner = 0
+                geo_ref.yllcorner = 0
                 _write_pts_file(file_name,
                                 self.get_data_points(absolute), 
-                                self.get_all_attributes())
+                                self.get_all_attributes(),
+                                geo_ref)
             else:
                 _write_pts_file(file_name,
@@ -1151 +1165 @@
         
     if write_geo_reference is not None:
-        write_geo_reference.write_NetCDF(outfile)
+        write_NetCDF_georeference(write_geo_reference, outfile)
         
     outfile.close() 
@@ -1194 +1208 @@
 
     if  write_geo_reference is not None:
+        write_geo_reference = ensure_geo_reference(write_geo_reference)
         write_geo_reference.write_ASCII(fd)
     fd.close()