Changeset 3266 for inundation/geospatial_data

Timestamp:

Jul 3, 2006, 11:07:07 AM (19 years ago)

Author:

duncan

Message:

comments and testing.

Location:

inundation/geospatial_data

Files:

• geospatial_data.py (modified) (1 diff)
• test_geospatial_data.py (modified) (1 diff)

inundation/geospatial_data/geospatial_data.py

@@ -690 +690 @@
     Inputed formats are;
     points: List or numeric array of coordinate pairs [xi, eta] of
-              points or geospatial object
+              points or geospatial object or points file name
 
     mesh_origin: A geo_reference object or 3-tuples consisting of

inundation/geospatial_data/test_geospatial_data.py

@@ -462 +462 @@
         assert allclose(results.get_attributes(attribute_name='speed'), [0.0, 10.0, 40.0])
 
+    def BADtest_loadxya4(self):
+        """
+        comma delimited
+        """
+        fileName = tempfile.mktemp(".xya")
+        file = open(fileName,"w")
+        file.write("elevation  , speed \n\
+1.0, 0.0, splat, 0.0\n\
+0.0, 1.0, 0.0, 10.0\n\
+1.0, 0.0, 10.4, 40.0\n")
+        file.close()
+        results = Geospatial_data(fileName, delimiter=',')
+        os.remove(fileName)
+#        print 'data', results.get_data_points()
+        assert allclose(results.get_data_points(), [[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        assert allclose(results.get_attributes(attribute_name='elevation'), ["splat", 0.0, 10.4])
+        assert allclose(results.get_attributes(attribute_name='speed'), [0.0, 10.0, 40.0])
+        
     def test_read_write_points_file_bad2(self):
         att_dict = {}