Changeset 3398

Timestamp:

Jul 21, 2006, 2:26:18 PM (18 years ago)

Author:

duncan

Message:

if csv files don't have lat.long, check for x,y

Location:

inundation/pyvolution

Files:

• data_manager.py (modified) (3 diffs)
• test_data_manager.py (modified) (1 diff)

inundation/pyvolution/data_manager.py

@@ -729 +729 @@
 class Exposure_csv:
     def __init__(self,file_name, latitude_title=LAT_TITLE,
-                 longitude_title=LONG_TITLE, is_x_y_locations=False,
+                 longitude_title=LONG_TITLE, is_x_y_locations=None,
                  x_title=X_TITLE, y_title=Y_TITLE,
                  refine_polygon=None):
@@ -777 +777 @@
         except KeyError:
             # maybe a warning..
+            #Let's see if this works..
+            if False != is_x_y_locations:
+                is_x_y_locations = True
             pass
         else:
@@ -782 +785 @@
                  longitudes = longs)
 
-        if is_x_y_locations:
+        if is_x_y_locations is True:
             if self._geospatial is not None:
                 pass #fixme throw an error

inundation/pyvolution/test_data_manager.py

@@ -4913 +4913 @@
 
         os.remove(file_name)
+
+           
+    def test_exposure_csv_loading_x_y2(self):
+        
+        csv_file = tempfile.mktemp(".csv")
+        fd = open(csv_file,'wb')
+        writer = csv.writer(fd)
+        writer.writerow(['x','y','STR_VALUE','C_VALUE','ROOF_TYPE','WALLS', 'SHORE_DIST'])
+        writer.writerow([5.5,0.5,'199770','130000','Metal','Timber',20])
+        writer.writerow([4.5,1.0,'150000','76000','Metal','Double Brick',20])
+        writer.writerow([4.5,1.5,'150000','76000','Metal','Brick Veneer',20])
+        fd.close()
+
+        e1 = Exposure_csv(csv_file)
+        gsd = e1.get_location()
+        
+        points = gsd.get_data_points(absolute=True)
+        assert allclose(points[0][0], 5.5)
+        assert allclose(points[0][1], 0.5)
+        assert allclose(points[1][0], 4.5)
+        assert allclose(points[1][1], 1.0)
+        assert allclose(points[2][0], 4.5)
+        assert allclose(points[2][1], 1.5)
+        self.failUnless(gsd.get_geo_reference().get_zone() == -1,
+                        'Bad zone error!')
+
+        os.remove(csv_file)
         
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    #suite = unittest.makeSuite(Test_Data_Manager,'test_exposure_csv_loadiny')
+    #suite = unittest.makeSuite(Test_Data_Manager,'test_exposure_csv_loading_x_y2')
     suite = unittest.makeSuite(Test_Data_Manager,'test')
     runner = unittest.TextTestRunner()
     runner.run(suite)
 
+