Changeset 4154 for anuga_core/source

Timestamp:

Jan 9, 2007, 4:15:45 PM (18 years ago)

Author:

duncan

Message:

added export of .txt files

Location:

anuga_core/source/anuga/geospatial_data

Files:

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

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -608 +608 @@
                 
         elif (file_name[-4:] == ".txt"):
-            _write_xya_file(file_name,
+            msg = "ERROR: trying to write a .txt file with relative data."
+            assert absolute, msg
+            _write_csv_file(file_name,
                             self.get_data_points(absolute=True), 
                             self.get_all_attributes())
@@ -1009 +1011 @@
 
 
+def _write_csv_file(file_name,
+                    write_data_points,
+                    write_attributes=None, 
+                    delimiter=','):
+    """
+    export a file, file_name, with the xya format
+    
+    """
+    points = write_data_points 
+    pointattributes = write_attributes
+    
+    fd = open(file_name,'w')
+    titlelist = "x" + delimiter + "y"  + delimiter
+    if pointattributes is not None:    
+        for title in pointattributes.keys():
+            titlelist = titlelist + title + delimiter
+        titlelist = titlelist[0:-len(delimiter)] # remove the last delimiter
+    fd.write(titlelist+"\n")
+    
+    #<vertex #> <x> <y> [attributes]
+    for i, vert in enumerate( points):
+
+
+        if pointattributes is not None:            
+            attlist = ","
+            for att in pointattributes.keys():
+                attlist = attlist + str(pointattributes[att][i])+ delimiter
+            attlist = attlist[0:-len(delimiter)] # remove the last delimiter
+            attlist.strip()
+        else:
+            attlist = ''
+
+        fd.write(str(vert[0]) + delimiter +
+                 str(vert[1]) + attlist + "\n")
+
+    fd.close()
     
 def _point_atts2array(point_atts):

anuga_core/source/anuga/geospatial_data/test_geospatial_data.py

@@ -1169 +1169 @@
                          'test_writepts failed. Test geo_reference')
 
+    def test_write_csv_attributes(self):
+        #test_write : Test that storage of x,y,attributes works
+        
+        att_dict = {}
+        pointlist = array([[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        att_dict['elevation'] = array([10.0, 0.0, 10.4])
+        att_dict['brightness'] = array([10.0, 0.0, 10.4])
+        geo_reference=Geo_reference(56,0,0)
+        # Test xya format
+        fileName = tempfile.mktemp(".txt")
+        G = Geospatial_data(pointlist, att_dict, geo_reference)
+        G.export_points_file(fileName)
+        #print "fileName", fileName 
+        results = Geospatial_data(file_name=fileName)
+        os.remove(fileName)
+        assert allclose(results.get_data_points(False),[[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        assert allclose(results.get_attributes('elevation'), [10.0, 0.0, 10.4])
+        answer = [10.0, 0.0, 10.4]
+        assert allclose(results.get_attributes('brightness'), answer)
+        
+        
     def test_writepts_no_attributes(self):
 
@@ -1204 +1225 @@
                          'test_writepts failed. Test geo_reference')
 
-        
+       
+    def test_write_csv_no_attributes(self):
+        #test_write xya _no_attributes: Test that storage of x,y alone works
+        
+        att_dict = {}
+        pointlist = array([[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        geo_reference=Geo_reference(56,0,0)
+        # Test xya format
+        fileName = tempfile.mktemp(".txt")
+        G = Geospatial_data(pointlist, None, geo_reference)
+        G.export_points_file(fileName)
+        results = Geospatial_data(file_name=fileName)
+        os.remove(fileName)
+        assert allclose(results.get_data_points(False),[[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+
+         
         
  ########################## BAD .PTS ##########################