Changeset 4640

Timestamp:

Jul 25, 2007, 1:52:26 PM (17 years ago)

Author:

nick

Message:

added the functionality to get_data_points as_lat_long in the northern hemisphere. Plus added a test

Location:

anuga_core/source/anuga/geospatial_data

Files:

• geospatial_data.py (modified) (3 diffs)
• test_geospatial_data.py (modified) (2 diffs)

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -360 +360 @@
        
     def get_data_points(self, absolute=True, geo_reference=None,
-                        as_lat_long=False):
+                        as_lat_long=False,isSH=True):
         """Get coordinates for all data points as an Nx2 array
 
@@ -369 +369 @@
         If a geo_reference is passed the points are returned relative
         to that geo_reference.
+        
+        isSH (isSouthHemisphere) is only used when getting data 
+        points "as_lat_long" is True and if FALSE will return lats and 
+        longs valid for the Northern Hemisphere.
 
         Default: absolute is True.
@@ -380 +384 @@
             for point in self.get_data_points(True):
                 ### UTMtoLL(northing, easting, zone,
-                lat_calced, long_calced = UTMtoLL(point[1],point[0], zone)
+                lat_calced, long_calced = UTMtoLL(point[1],point[0], 
+                                                  zone, isSH)
                 lats_longs.append((lat_calced, long_calced)) # to hash
             return lats_longs

anuga_core/source/anuga/geospatial_data/test_geospatial_data.py

@@ -210 +210 @@
         assert allclose(seg_lat_long[0][0], lat_result)#lat
         assert allclose(seg_lat_long[0][1], long_result)#long
+
+
+    def test_get_data_points_lat_longIII(self):
+        # x,y  North,east long,lat
+        #for northern hemisphere
+        boundary_polygon = [[419944.8, 918642.4]]
+        zone = 47
+        
+        geo_reference = Geo_reference(zone=zone)
+        geo = Geospatial_data(boundary_polygon,geo_reference=geo_reference)
+        seg_lat_long = geo.get_data_points(as_lat_long=True,isSH=False)
+        lat_result = degminsec2decimal_degrees(8.31,0,0)
+        long_result = degminsec2decimal_degrees(98.273,0,0)
+        #print "seg_lat_long", seg_lat_long [0]
+        #print "lat_result",lat_result 
+        assert allclose(seg_lat_long[0][0], lat_result)#lat
+        assert allclose(seg_lat_long[0][1], long_result)#long
+
 
               
@@ -2348 +2366 @@
 
     #suite = unittest.makeSuite(Test_Geospatial_data, 'test_write_csv_attributes_lat_long')
-    #suite = unittest.makeSuite(Test_Geospatial_data, 'test_export_xya_file')
+    #suite = unittest.makeSuite(Test_Geospatial_data, 'test_get_data_points_lat_longIII')
     suite = unittest.makeSuite(Test_Geospatial_data, 'test')
     runner = unittest.TextTestRunner()