Changeset 3739 for anuga_core/source/anuga/coordinate_transforms/test_redfearn.py

Timestamp:

Oct 11, 2006, 10:43:29 AM (17 years ago)

Author:

duncan

Message:

resolved convert lat longs

File:

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

anuga_core/source/anuga/coordinate_transforms/test_redfearn.py

@@ -156 +156 @@
         lats = [lat_gong, lat_2]
         longs = [lon_gong, lon_2]
-        zone, points = convert_lats_longs(lats, longs)
+        points, zone = convert_from_latlon_to_utm(lats, longs)
 
         assert allclose(points[0][0], 308728.009)
@@ -183 +183 @@
         
         try:
-            zone, points = convert_lats_longs(lats, longs)
+            points, zone = convert_from_latlon_to_utm(lats, longs)
         except ANUGAError:
             pass
@@ -206 +206 @@
         longs = [lon_gong, lon_2]
         try:
-            zone, points = convert_lats_longs(lats, longs)
+            points, zone  = convert_from_latlon_to_utm(lats, longs)
         except ANUGAError:
             pass
@@ -213 +213 @@
                             'Error not thrown error!')
 
-    # Similar test for alternative interface        
     def test_convert_latlon_to_UTM1(self):
 
@@ -229 +228 @@
         
         points = [[lat_gong, lon_gong], [lat_2, lon_2]]
-        points, zone = convert_points_from_latlon_to_utm(points)
-
+        points, zone = convert_from_latlon_to_utm(points=points)
+        #print "points",points 
         assert allclose(points[0][0], 308728.009)
         assert allclose(points[0][1], 6180432.601)
@@ -255 +254 @@
 
         try:
-            points, zone = convert_points_from_latlon_to_utm(points)           
+            points, zone = convert_from_latlon_to_utm(points=points)           
         except ANUGAError:
             pass
@@ -277 +276 @@
 
         try:
-            points, zone = convert_points_from_latlon_to_utm(points)           
+            points, zone = convert_from_latlon_to_utm(points=points)           
         except ANUGAError:
             pass
@@ -287 +286 @@
 if __name__ == "__main__":
 
+    #mysuite = unittest.makeSuite(TestCase,'test_convert_latlon_to_UTM1')
     mysuite = unittest.makeSuite(TestCase,'test')
     runner = unittest.TextTestRunner()