Changeset 3735

Timestamp:

Oct 10, 2006, 4:54:34 PM (18 years ago)

Author:

ole

Message:

This fixes ticket:96 plus a few cosmetic things

Location:

anuga_core/source/anuga/geospatial_data

Files:

• geospatial_data.py (modified) (6 diffs)
• test_geospatial_data.py (modified) (5 diffs)

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -511 +511 @@
         if (file_name[-4:] == ".xya"):
             if absolute is True:         
-                _write_xya_file(file_name, self.get_data_points(absolute=True), 
-                                   self.get_all_attributes())
+                _write_xya_file(file_name,
+                                self.get_data_points(absolute=True), 
+                                self.get_all_attributes())
             else:
-                _write_xya_file(file_name, self.get_data_points(absolute=False), 
-                                   self.get_all_attributes(),
-                                   self.get_geo_reference())
+                _write_xya_file(file_name,
+                                self.get_data_points(absolute=False), 
+                                self.get_all_attributes(),
+                                self.get_geo_reference())
                                     
         elif (file_name[-4:] == ".pts"):
             if absolute is True:
-                _write_pts_file(file_name, self.get_data_points(absolute), 
-                                   self.get_all_attributes())
+                _write_pts_file(file_name,
+                                self.get_data_points(absolute), 
+                                self.get_all_attributes())
             else:
-                _write_pts_file(file_name, self.get_data_points(absolute), 
-                                   self.get_all_attributes(),
-                                   self.get_geo_reference())
+                _write_pts_file(file_name,
+                                self.get_data_points(absolute), 
+                                self.get_all_attributes(),
+                                self.get_geo_reference())
         else:
             msg = 'Unknown file type %s ' %file_name
@@ -632 +636 @@
     return pointlist, att_dict, geo_reference
 
-def _write_pts_file(file_name, write_data_points,
-                                   write_attributes, 
-                                   write_geo_reference = None):
+def _write_pts_file(file_name,
+                    write_data_points,
+                    write_attributes=None, 
+                    write_geo_reference=None):
     """
     Write .pts NetCDF file   
@@ -659 +664 @@
     outfile.institution = 'Geoscience Australia'
     outfile.description = 'NetCDF format for compact and portable storage ' +\
-                      'of spatial point data'
+                          'of spatial point data'
     
     # dimension definitions
@@ -673 +678 @@
     outfile.variables['points'][:] = write_data_points #.astype(Float32)
 
-    for key in write_attributes.keys():
-        outfile.createVariable(key, Float, ('number_of_points',))
-        outfile.variables[key][:] = write_attributes[key] #.astype(Float32)
+    if write_attributes is not None:
+        for key in write_attributes.keys():
+            outfile.createVariable(key, Float, ('number_of_points',))
+            outfile.variables[key][:] = write_attributes[key] #.astype(Float32)
         
     if write_geo_reference is not None:
@@ -684 +690 @@
 
 
-def _write_xya_file( file_name, write_data_points,
-                                    write_attributes, 
-                                    write_geo_reference = None, 
-                                    delimiter = ','):
+def _write_xya_file(file_name,
+                    write_data_points,
+                    write_attributes=None, 
+                    write_geo_reference=None, 
+                    delimiter = ','):
     """
     export a file, file_name, with the xya format
@@ -697 +704 @@
     fd = open(file_name,'w')
     titlelist = ""
-    for title in pointattributes.keys():
-        titlelist = titlelist + title + delimiter
-    titlelist = titlelist[0:-len(delimiter)] # remove the last 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):
-        
-        attlist = ","
-        for att in pointattributes.keys():
-            attlist = attlist + str(pointattributes[att][i])+ delimiter
-        attlist = attlist[0:-len(delimiter)] # remove the last delimiter
-        attlist.strip()
-        fd.write( str(vert[0]) + delimiter
-                  + str(vert[1])
-                  + attlist + "\n")
+    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")
 
     if  write_geo_reference is not None:

anuga_core/source/anuga/geospatial_data/test_geospatial_data.py

@@ -476 +476 @@
 
 
-    def no_test_clip1_inside_outside(self):
+    def test_clip1_inside_outside(self):
         """test_clip1_inside_outside(self):
         
@@ -509 +509 @@
         FN = 'test_combine.pts'
         G.export_points_file(FN)
+
+
+        # Read it back in
+        G3 = Geospatial_data(FN)
+
+
+        # Check result
+        assert allclose(G3.get_data_points(), new_points)        
+        
+        
         os.remove(FN)
 
@@ -972 +982 @@
         
     def test_writepts(self):
+        """test_writepts: Test that storage of x,y,attributes works
+        """
         att_dict = {}
         pointlist = array([[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
@@ -977 +989 @@
         att_dict['brightness'] = array([10.0, 0.0, 10.4])
         geo_reference=Geo_reference(56,1.9,1.9)
-        
+
+        # Test pts format
         fileName = tempfile.mktemp(".pts")
-        
         G = Geospatial_data(pointlist, att_dict, geo_reference)
-        
         G.export_points_file(fileName, False)
-        
-        results = Geospatial_data(file_name = fileName)
-
+        results = Geospatial_data(file_name=fileName)
         os.remove(fileName)
 
@@ -992 +1001 @@
         answer = [10.0, 0.0, 10.4]
         assert allclose(results.get_attributes('brightness'), answer)
-
-        
         self.failUnless(geo_reference == geo_reference,
                          'test_writepts failed. Test geo_reference')
+
+        # Test xya format
+        fileName = tempfile.mktemp(".xya")
+        G = Geospatial_data(pointlist, att_dict, geo_reference)
+        G.export_points_file(fileName, False)
+        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)
+        self.failUnless(geo_reference == geo_reference,
+                         'test_writepts failed. Test geo_reference')
+
+    def test_writepts_no_attributes(self):
+        """test_writepts_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,1.9,1.9)
+
+        # Test pts format
+        fileName = tempfile.mktemp(".pts")
+        G = Geospatial_data(pointlist, None, geo_reference)
+        G.export_points_file(fileName, False)
+        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]])
+        self.failUnless(geo_reference == geo_reference,
+                         'test_writepts failed. Test geo_reference')
+
+        # Test xya format
+        fileName = tempfile.mktemp(".xya")
+        G = Geospatial_data(pointlist, None, geo_reference)
+        G.export_points_file(fileName, False)
+        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]])
+        self.failUnless(geo_reference == geo_reference,
+                         'test_writepts failed. Test geo_reference')
+
+        
         
  ########################## BAD .PTS ##########################