Changeset 3739

Timestamp:

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

Author:

duncan

Message:

resolved convert lat longs

Location:

anuga_core/source/anuga

Files:

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

anuga_core/source/anuga/coordinate_transforms/redfearn.py

@@ -164 +164 @@
 
 
-def convert_points_from_latlon_to_utm(points,
-                                      false_easting=None,
-                                      false_northing=None):
-    """Convert a list of points given in latitude and longitude to UTM
+def convert_from_latlon_to_utm(latitudes=None,
+                               longitudes=None,
+                               points=None,
+                               false_easting=None,
+                               false_northing=None):
+    """Convert latitude and longitude data to UTM as a list of coordinates.
 
 
     Input
 
-    points: list of points given in decimal degrees (latitude, longitude)
+    points: list of points given in decimal degrees (latitude, longitude) or
+    latitudes: list of latitudes   and
+    longitudes: list of longitudes 
     false_easting (optional)
     false_northing (optional)
@@ -185 +189 @@
 
     Assume the false_easting and false_northing are the same for each list.
-    If points end up belonging to different UTM zones, an ANUGAerror is thrown.
-
-    
-    
+    If points end up belonging to different UTM zones, an ANUGAerror is thrown.    
     """
 
     old_geo = Geo_reference()    
     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]),
@@ -198 +203 @@
                                            false_easting=false_easting,
                                            false_northing=false_northing)
-
         new_geo = Geo_reference(zone)
-        old_geo.reconcile_zones(new_geo)
-        
+        old_geo.reconcile_zones(new_geo)        
         utm_points.append([easting, northing])
 
-
     return utm_points, old_geo.get_zone()
-
-
-    
-
-
-# FIXME (Ole): Is this not supersedede by the above?
-def convert_lats_longs(latitudes,
-                       longitudes,
-                       false_easting=None,
-                       false_northing=None):
-    """
-    Redfearn a list of latitudes and longitudes.
-
-    Assume the false_easting and false_northing are the same for each list.
-
-    Note, if a zone turns out to be different, an ANUGAerror is thrown.
-    """
-    # Using geo_ref so there is only one point in the code where zones
-    # are checked.
-    old_geo = Geo_reference()
-    points = []
-    for lat, long in map(None, latitudes, longitudes,):
-        zone, easting, northing = redfearn(float(lat),
-                                           float(long),
-                                           false_easting=false_easting,
-                                           false_northing=false_northing)
-        new_geo = Geo_reference(zone)
-        old_geo.reconcile_zones(new_geo)
-        #print "old_geo.get_zone()", old_geo.get_zone()
-        points.append([easting, northing])
-        
-    return old_geo.get_zone(), points

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()

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -11 +11 @@
 from anuga.utilities.numerical_tools import ensure_numeric
 from anuga.coordinate_transforms.geo_reference import Geo_reference, TitleError
-from anuga.coordinate_transforms.redfearn import convert_lats_longs
+from anuga.coordinate_transforms.redfearn import convert_from_latlon_to_utm
 
         
@@ -324 +324 @@
             raise ValueError, msg
         
-        zone, data_points = convert_lats_longs(latitudes, longitudes)
+        data_points, zone  = convert_from_latlon_to_utm(latitudes, longitudes)
         
         return data_points, Geo_reference(zone=zone)