Changeset 4641 for anuga_core/source

Timestamp:

Jul 26, 2007, 9:09:55 AM (18 years ago)

Author:

nick

Message:

updated geospatial_data.export_data_points_file so it will write data "as_lat_long" in the northern hemisphere to csv and txt files.

Plus change parameter name to be more logical

and corrected a verbose=True in test_geospatial_data.py, Dunc and i didn't know why it was there...

Location:

anuga_core/source/anuga/geospatial_data

Files:

• geospatial_data.py (modified) (6 diffs)
• test_geospatial_data.py (modified) (3 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,isSH=True):
+                        as_lat_long=False,isSouthHemisphere=True):
         """Get coordinates for all data points as an Nx2 array
 
@@ -385 +385 @@
                 ### UTMtoLL(northing, easting, zone,
                 lat_calced, long_calced = UTMtoLL(point[1],point[0], 
-                                                  zone, isSH)
+                                                  zone, isSouthHemisphere)
                 lats_longs.append((lat_calced, long_calced)) # to hash
             return lats_longs
@@ -594 +594 @@
 #        return all_data
     
-    def export_points_file(self, file_name, absolute=True, as_lat_long=False):
+    def export_points_file(self, file_name, absolute=True, 
+                           as_lat_long=False, isSouthHemisphere=True):
         
         """
@@ -606 +607 @@
         If absolute is False data points at returned as relative to the xll 
         and yll and geo_reference remains uneffected
+        
+        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.
+        
         """
 
@@ -650 +656 @@
             _write_csv_file(file_name,
                             self.get_data_points(absolute=True,
-                                                 as_lat_long=as_lat_long), 
+                                                 as_lat_long=as_lat_long,
+                                  isSouthHemisphere=isSouthHemisphere), 
                             self.get_all_attributes(),
                             as_lat_long=as_lat_long)
@@ -658 +665 @@
             assert absolute, msg
             _write_urs_file(file_name,
-                            self.get_data_points(as_lat_long=True))
+                            self.get_data_points(as_lat_long=True,
+                                  isSouthHemisphere=isSouthHemisphere))
                                                           
         else:

anuga_core/source/anuga/geospatial_data/test_geospatial_data.py

@@ -219 +219 @@
         
         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)
+        geo = Geospatial_data(boundary_polygon,
+                              geo_reference=geo_reference)
+                              
+        seg_lat_long = geo.get_data_points(as_lat_long=True,
+                                           isSouthHemisphere=False)
+                                           
         lat_result = degminsec2decimal_degrees(8.31,0,0)
         long_result = degminsec2decimal_degrees(98.273,0,0)
@@ -1064 +1068 @@
 #            dict = import_points_file(fileName,delimiter=' ')
 #            results = Geospatial_data()
-            results = Geospatial_data(fileName, delimiter=' ', verbose=True)
+            results = Geospatial_data(fileName, delimiter=' ', verbose=False)
 #            results.import_points_file(fileName, delimiter=' ')
         except IOError:
@@ -2368 +2372 @@
     #suite = unittest.makeSuite(Test_Geospatial_data, 'test_get_data_points_lat_longIII')
     suite = unittest.makeSuite(Test_Geospatial_data, 'test')
-    runner = unittest.TextTestRunner()
+    runner = unittest.TextTestRunner() #verbosity=2)
     runner.run(suite)