Changeset 3336

Timestamp:

Jul 14, 2006, 4:47:35 PM (18 years ago)

Author:

duncan

Message:

exposure csv class can now have x, y location info

Location:

inundation/pyvolution

Files:

• data_manager.py (modified) (2 diffs)
• test_data_manager.py (modified) (2 diffs)

inundation/pyvolution/data_manager.py

@@ -725 +725 @@
 LAT_TITLE = 'LATITUDE'
 LONG_TITLE = 'LONGITUDE'
+X_TITLE = 'x'
+Y_TITLE = 'y'
 class Exposure_csv:
     def __init__(self,file_name, latitude_title=LAT_TITLE,
-                 longitude_title=LONG_TITLE, refine_polygon=None):
+                 longitude_title=LONG_TITLE, is_x_y_locations=False,
+                 x_title=X_TITLE, y_title=Y_TITLE,
+                 refine_polygon=None):
         """
         This class is for handling the exposure csv file.
@@ -777 +781 @@
             self._geospatial = Geospatial_data(latitudes = lats,
                  longitudes = longs)
+
+        if is_x_y_locations:
+            if self._geospatial is not None:
+                pass #fixme throw an error
+            try:
+                xs = self._attribute_dic[x_title]
+                ys = self._attribute_dic[y_title]
+                points = [[float(i),float(j)] for i,j in map(None,xs,ys)]
+            except KeyError:
+                # maybe a warning..
+                raise TitleValueError, msg
+            else:
+                self._geospatial = Geospatial_data(data_points=points)
             
         # create a list of points that are in the refining_polygon

inundation/pyvolution/test_data_manager.py

@@ -4659 +4659 @@
 
 
-
+########## testing nbed class ##################
     def test_exposure_csv_loading(self):
         
@@ -4887 +4887 @@
         else:
             self.failUnless(0 ==1,  'Error not thrown error!')
+            
+    def test_exposure_csv_loading_x_y(self):
         
+
+        file_name = tempfile.mktemp(".xya")
+        file = open(file_name,"w")
+        file.write("x, y ,sound  , speed \n\
+115.0, 7, splat, 0.0\n\
+114.0, 8.0, pow, 10.0\n\
+114.5, 9., bang, 40.0\n")
+        file.close()
+        e1 = Exposure_csv(file_name, is_x_y_locations=True)
+        gsd = e1.get_location()
+        
+        points = gsd.get_data_points(absolute=True)
+        
+        assert allclose(points[0][0], 115)
+        assert allclose(points[0][1], 7)
+        assert allclose(points[1][0], 114)
+        assert allclose(points[1][1], 8)
+        assert allclose(points[2][0], 114.5)
+        assert allclose(points[2][1], 9)
+        self.failUnless(gsd.get_geo_reference().get_zone() == -1,
+                        'Bad zone error!')
+
+        os.remove(file_name)
         
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    #suite = unittest.makeSuite(Test_Data_Manager,'test_exposure_csv')
+    #suite = unittest.makeSuite(Test_Data_Manager,'test_exposure_csv_loadiny')
     suite = unittest.makeSuite(Test_Data_Manager,'test')
     runner = unittest.TextTestRunner()