Changeset 1406

Timestamp:

May 17, 2005, 11:43:14 AM (20 years ago)

Author:

duncan

Message:

increase flexibility

Location:

inundation/ga/storm_surge/pyvolution/coordinate_transforms

Files:

• geo_reference.py (modified) (5 diffs)
• test_geo_reference.py (modified) (1 diff)

inundation/ga/storm_surge/pyvolution/coordinate_transforms/geo_reference.py

@@ -6 +6 @@
 
 DEFAULT_ZONE = 56
+TITLE = '#geo reference' + "\n" #this title is referred to in the .xya format
 
 class Geo_reference:
@@ -17 +18 @@
                  xllcorner=None,
                  yllcorner=None,
-                 NetCDFObject = None,
-                 ASCIIFile = None):
+                 NetCDFObject=None,
+                 ASCIIFile=None,
+                 read_title=None):
+        """
+        input:
+        NetCDFObject - a handle to the netCDF file 
+        ASCIIFile - a handle to the text file
+        read_title - the title of the georeference text, if it was read in.
+        """
         if not xllcorner == None:
             self.xllcorner = xllcorner #Easting of lower left corner
@@ -28 +36 @@
         if not NetCDFObject == None:
             self.read_NetCDF(NetCDFObject)
-
-        #FIXME think if this should be here    
+  
         if not ASCIIFile == None:
-            self.read_ASCII(ASCIIFile)
+            self.read_ASCII(ASCIIFile,read_title=read_title)
 
     def get_xllcorner(self):
@@ -67 +74 @@
         
     def write_ASCII(self, fd):
-        fd.write('# Geo reference' + "\n")
+        fd.write(TITLE)
         fd.write(str(self.zone) + "\n") 
         fd.write(str(self.xllcorner) + "\n") 
         fd.write(str(self.yllcorner) + "\n")
 
-    def read_ASCII(self, fd):
-        fd.readline() # remove the title line
+    def read_ASCII(self, fd,read_title=None):
+        if read_title == None:
+            read_title = fd.readline() # remove the title line
+        if read_title[0:2] != TITLE[0:2]:
+            raise IOError
         self.zone = int(fd.readline())
         self.xllcorner = float(fd.readline())
@@ -85 +95 @@
         #false_easting = infile.false_easting[0]
         #false_northing = infile.false_northing[0]
-
+        
     def change_points_geo_ref(self, points,
                        points_geo_ref=None):

inundation/ga/storm_surge/pyvolution/coordinate_transforms/test_geo_reference.py

@@ -57 +57 @@
         self.failUnless(g == new_g, 'test_read_write_ASCII failed')  
     
+    def test_read_write_ASCII2(self):
+        from Scientific.IO.NetCDF import NetCDFFile
+        g = Geo_reference(56,1.9,1.9)
+        file_name = tempfile.mktemp(".geo_referenceTest")
+        fd = open(file_name,'w')
+        g.write_ASCII(fd)
+        fd.close()       
+        fd = open(file_name,'r')
+        line = fd.readline()
+        new_g = Geo_reference(ASCIIFile=fd, read_title=line)
+        fd.close()
+        os.remove(file_name)
+
+        self.failUnless(g == new_g, 'test_read_write_ASCII failed')
+        
+    def test_read_write_ASCII2(self):
+        from Scientific.IO.NetCDF import NetCDFFile
+        g = Geo_reference(56,1.9,1.9)
+        file_name = tempfile.mktemp(".geo_referenceTest")
+        fd = open(file_name,'w')
+        g.write_ASCII(fd)
+        fd.close()       
+        fd = open(file_name,'r')
+        line = fd.readline()
+        line = "fail !!"
+        try:
+            new_g = Geo_reference(ASCIIFile=fd, read_title=line)
+            fd.close()
+            os.remove(file_name)
+        except IOError:
+            fd.close()
+            os.remove(file_name)
+        else:
+            self.failUnless(0 ==1,
+                        'bad text file did not raise error!')
+            
     def test_change_points_geo_ref(self):
         x = 3.0