Changeset 3745

Timestamp:

Oct 11, 2006, 12:23:30 PM (18 years ago)

Author:

ole

Message:

A few minor changes to convert_from_latlon_to_UTM to make run_karratha work

Location:

anuga_core/source/anuga

Files:

• coordinate_transforms/redfearn.py (modified) (2 diffs)
• coordinate_transforms/test_redfearn.py (modified) (3 diffs)
• geospatial_data/geospatial_data.py (modified) (2 diffs)

anuga_core/source/anuga/coordinate_transforms/redfearn.py

@@ -164 +164 @@
 
 
-def convert_from_latlon_to_utm(latitudes=None,
+def convert_from_latlon_to_utm(points=None,
+                               latitudes=None,
                                longitudes=None,
-                               points=None,
                                false_easting=None,
                                false_northing=None):
@@ -195 +195 @@
     utm_points = []
     if points == None:
-        
         assert len(latitudes) == len(longitudes)
         points =  map(None, latitudes, longitudes)
+        
     for point in points:
         zone, easting, northing = redfearn(float(point[0]),

anuga_core/source/anuga/coordinate_transforms/test_redfearn.py

@@ -156 +156 @@
         lats = [lat_gong, lat_2]
         longs = [lon_gong, lon_2]
-        points, zone = convert_from_latlon_to_utm(lats, longs)
+        points, zone = convert_from_latlon_to_utm(latitudes=lats, longitudes=longs)
 
         assert allclose(points[0][0], 308728.009)
@@ -183 +183 @@
         
         try:
-            points, zone = convert_from_latlon_to_utm(lats, longs)
+            points, zone = convert_from_latlon_to_utm(latitudes=lats, longitudes=longs)
         except ANUGAError:
             pass
@@ -206 +206 @@
         longs = [lon_gong, lon_2]
         try:
-            points, zone  = convert_from_latlon_to_utm(lats, longs)
+            points, zone  = convert_from_latlon_to_utm(latitudes=lats, longitudes=longs)
         except ANUGAError:
             pass

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -295 +295 @@
                             data_points,
                             points_are_lats_longs):
+        
         if geo_reference is not None:
             msg = """A georeference is specified yet latitude and longitude
             are also specified!"""
             raise ValueError, msg
+        
         if data_points is not None and not points_are_lats_longs:
             msg = """Data points are specified yet latitude and
@@ -324 +326 @@
             raise ValueError, msg
         
-        data_points, zone  = convert_from_latlon_to_utm(latitudes, longitudes)
+        data_points, zone  = convert_from_latlon_to_utm(latitudes=latitudes,
+                                                        longitudes=longitudes)
         
         return data_points, Geo_reference(zone=zone)