Changeset 2942 for inundation/coordinate_transforms

Timestamp:

May 23, 2006, 10:50:19 AM (19 years ago)

Author:

duncan

Message:

changing errors thrown by geo_ref. adding tests to geospatial

File:

• inundation/coordinate_transforms/geo_reference.py (modified) (2 diffs)

inundation/coordinate_transforms/geo_reference.py

@@ -9 +9 @@
 from Numeric import array, Float, ArrayType, reshape
 from utilities.numerical_tools import ensure_numeric
-from utilities.anuga_exceptions import ANUGAError
-
-import exceptions
-class TitleError(exceptions.IOError): pass
+from utilities.anuga_exceptions import ANUGAError, TitleError, ParsingError 
+
+
+#import exceptions
+#class TitleError(exceptions.IOError): pass
+#class ParsingError(exceptions.IOError): pass
 
 DEFAULT_ZONE = -1
@@ -107 +109 @@
 
     def read_ASCII(self, fd,read_title=None):
-        if read_title == None:
-            read_title = fd.readline() # remove the title line
-        #print "gr read_title[0:2].upper()",read_title[0:2].upper()
-        #print "gr TITLE[0:2].upper()",TITLE[0:2].upper() 
-        if read_title[0:2].upper() != TITLE[0:2].upper():
-            msg = 'File error.  Expecting line: %s.  Got this line: %s' \
-                  %(TITLE, read_title)
-            raise TitleError, msg 
-        self.zone = int(fd.readline())
-        self.xllcorner = float(fd.readline())
-        self.yllcorner = float(fd.readline())
+        try:
+            if read_title == None:
+                read_title = fd.readline() # remove the title line
+            if read_title[0:2].upper() != TITLE[0:2].upper():
+                msg = 'File error.  Expecting line: %s.  Got this line: %s' \
+                      %(TITLE, read_title)
+                raise TitleError, msg 
+            self.zone = int(fd.readline())
+            self.xllcorner = float(fd.readline())
+            self.yllcorner = float(fd.readline())
+        except SyntaxError:
+                msg = 'File error.  Got syntax error while parsing geo reference' 
+                raise ParsingError, msg
             
         # Fix some assertion failures