Changeset 2942

Timestamp:

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

Author:

duncan

Message:

changing errors thrown by geo_ref. adding tests to geospatial

Location:

inundation

Files:

• coordinate_transforms/geo_reference.py (modified) (2 diffs)
• geospatial_data/geospatial_data.py (modified) (2 diffs)
• geospatial_data/test_geospatial_data.py (modified) (6 diffs)
• utilities/anuga_exceptions.py (modified) (1 diff)

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

inundation/geospatial_data/geospatial_data.py

@@ -458 +458 @@
     line = fd.readline()
     numbers = clean_line(line,delimiter)
-    #print 'read xya numbers', numbers
-    while len(numbers) > 1:
+    
+    while len(numbers) > 1 and line[0] <> '#':
         if numbers != []:
             try:
@@ -481 +481 @@
         line = fd.readline()
         numbers = clean_line(line,delimiter)
+    
     if line == '':
-            # end of file
         geo_reference = None
-        
     else:
         geo_reference = Geo_reference(ASCIIFile=fd,read_title=line)

inundation/geospatial_data/test_geospatial_data.py

@@ -10 +10 @@
 from geospatial_data import *
 
-from coordinate_transforms.geo_reference import Geo_reference
+from coordinate_transforms.geo_reference import Geo_reference, TitleError
 
 class Test_Geospatial_data(unittest.TestCase):
@@ -1040 +1040 @@
             raise msg        
 
-    def xxx_test_check_geo_reference(self):
+    def test_check_geo_reference(self):
         """
         checks geo reference details are OK. eg can be called '#geo reference'
@@ -1052 +1052 @@
 0.0 1.0 0.0\n\
 1.0 0.0 10.4\n\
-#geo reference\n\
+#ge oreference\n\
 56\n\
 1.1\n\
@@ -1062 +1062 @@
         assert allclose(results.get_geo_reference().get_yllcorner(), 1.0)
 
-    def xxx_test_check_geo_reference1(self):
+        fileName = tempfile.mktemp(".xya")
+        file = open(fileName,"w")
+        file.write("  elevation  \n\
+1.0 0.0 10.0\n\
+0.0 1.0 0.0\n\
+1.0 0.0 10.4\n")
+
+        file.close()
+        results = Geospatial_data(fileName)
+       
+    def test_check_geo_reference1(self):
         """
         checks geo reference details are OK. eg can be called '#geo reference'
@@ -1074 +1084 @@
 0.0 1.0 0.0\n\
 1.0 0.0 10.4\n\
-#geo reference\n\
+#geo t t\n\
 56\n\
 1.1\n"
@@ -1080 +1090 @@
         file.close()
 
-#        try:
-        results = Geospatial_data(fileName)
-#        except ValueError or SyntaxError:
-#            pass
-#        else:
-#            msg = 'Geo reference data format is incorrect'
-#            raise msg        
-
-
-
-        assert allclose(results.get_geo_reference().get_xllcorner(), 1.1)
-        assert allclose(results.get_geo_reference().get_yllcorner(), 1.0)
-        
+        try:
+            results = Geospatial_data(fileName, delimiter = " ")
+        except IOError:
+            pass
+        else:
+            msg = 'Geo reference data format is incorrect'
+            raise msg        
+
+
 
 
 if __name__ == "__main__":
-    #suite = unittest.makeSuite(Test_Geospatial_data, 'test_ensure_absolute')
+    #suite = unittest.makeSuite(Test_Geospatial_data, 'test_check_geo_reference1')
     suite = unittest.makeSuite(Test_Geospatial_data, 'test')
     runner = unittest.TextTestRunner()

inundation/utilities/anuga_exceptions.py

@@ -1 +1 @@
 """Exceptions used by ANUGA
 """
+
+import exceptions
+class TitleError(exceptions.IOError): pass
+class ParsingError(exceptions.IOError): pass