Changeset 2584

Timestamp:

Mar 23, 2006, 5:07:33 PM (17 years ago)

Author:

nick

Message:

add_points_files

Location:

inundation/geospatial_data

Files:

• geospatial_data.py (modified) (9 diffs)
• test_geospatial_data.py (modified) (4 diffs)

inundation/geospatial_data/geospatial_data.py

@@ -158 +158 @@
         if file_name is None:
             self.file_name = None
-#        else:
-#            if access(self.file_name, F_OK) == 0 :
-#                msg = 'Geospatial_data object needs have either data_points \n'
-#                msg += ' or a file with data points'
-#                raise msg
+
         else:    
             self.file_name = file_name
             self = self.import_points_file(file_name)
-#            print 'data points from set self file name', self.data_points
-#            print 'attributes from set self file name', self.attributes
-#            print 'geo_ref from set self file name', self.geo_reference
         return self
             
@@ -230 +223 @@
         zone2 = geo_ref2.get_zone()
         
-        geo_ref = Geo_reference(zone1, xll, yll)
-        
         if zone1 == zone2:
             a_rel_points = self.get_data_points()
@@ -241 +232 @@
                                     b_rel_points-[xll, yll]), axis = 0)
 
-            new_dictionary = {}
+            new_attributes = {}
             for x in self.attributes.keys():
                 if other.attributes.has_key(x):
@@ -247 +238 @@
                     a_attrib = self.attributes[x]
                     b_attrib = other.attributes[x]
-                    new_dictionary[x] = concatenate((a_attrib, b_attrib))
+                    new_attributes[x] = concatenate((a_attrib, b_attrib))
 
                 else:
@@ -253 +244 @@
                     msg += 'attributes to allow addition.'
                     raise msg
- 
-            return Geospatial_data(c_points, new_dictionary, geo_ref)
+                
+            geo_ref = Geo_reference(zone1, xll, yll)
+            return Geospatial_data(c_points, new_attributes, geo_ref)
             
         else:
@@ -263 +255 @@
       
     
-    ###
-    #  IMPORT/EXPORT POINTS FILES
-    ###
-    '''
-    def export_points_file(ofile, point_dict):
-        """
-        write a points file, ofile, as a binary (.xya) or text (.pts) file
-
-        ofile is the file name, including the extension
-
-        The point_dict is defined at the top of this file.
-        """
-        #this was done for all keys in the mesh file.
-        #if not mesh_dict.has_key('points'):
-        #    mesh_dict['points'] = []
-        if (ofile[-4:] == ".xya"):
-            _write_xya_file(ofile, point_dict)
-        elif (ofile[-4:] == ".pts"):
-            _write_pts_file(ofile, point_dict)
-        else:
-            msg = 'Unknown file type %s ' %ofile
-        raise IOError, msg 
-
-    '''       
+###
+#  IMPORT/EXPORT POINTS FILES
+###
+
 def import_points_file( ofile, delimiter = None, verbose = False):
     """ load an .xya or .pts file
@@ -312 +284 @@
             msg = 'Could not open file %s ' %ofile
             raise IOError, msg
-        except IOError:
+        except IOError, e:
             # Catch this to add an error message
-            msg = 'Could not open file %s ' %ofile
+            msg = 'Could not open file or incorrect file format %s:%s' %(ofile, e)
             raise IOError, msg
             
@@ -416 +388 @@
     line = fd.readline()
     numbers = clean_line(line,delimiter)
+    print 'read xya numbers', numbers
     while len(numbers) > 1:
         if numbers != []:
@@ -608 +581 @@
     return numbers
             
-#def add_points_files(file):            
-        
+def add_points_files(add_file1, add_file2, results_file):
+    ''' adds the points and attruibutes of 2 pts or xya files and
+    writes it to a pts file
+    
+    NOTE will add the function to check and remove points from one set
+    that are shared. This will require some work and maybe __subtract__ function 
+    '''
+#    print 'load %s' %add_file1
+#    if access(add_file1,F_OK) == 1 :
+#        print'file1', add_file1
+
+#    print'file1 again', add_file1
+#    print'file2 again', add_file2
+    print 'create G1'
+    G1 = Geospatial_data(file_name = add_file1)
+    
+#    print 'G1 dict'
+ #   G1_points_dict = geospatial_data2points_dictionary(G1)
+
+#    print 'G1 xya file'
+#    export_points_file("v:\inundation\onslow_tsunami_scenario_2006\\topographies\onshore.xya", G1_points_dict)
+
+    print 'create G2'
+#    print 'load %s' %add_file2
+#    if access(add_file2,F_OK) == 1 :
+#        print'file2', add_file2
+    G2 = Geospatial_data(file_name = add_file2)
+    print 'G2 dict'
+#    G2_points_dict = geospatial_data2points_dictionary(G2)
+
+    new_add_file2 = add_file2[:-4] + '.pts' 
+    print 'G2 pts file', new_add_file2
+    
+#    export_points_file(new_add_file2, G2_points_dict)
+    print 'G1+g2'    
+    G = G1 + G2
+    #FIXME remove dependance on points to dict in export only!
+    G_points_dict = geospatial_data2points_dictionary(G)
+    
+    export_points_file(results_file, G_points_dict)
+    
+    
+     
+        

inundation/geospatial_data/test_geospatial_data.py

@@ -190 +190 @@
         G2 = Geospatial_data(points, attributes1) 
         
-#        print 'G1 depth=', G1.get_attributes('depth')
-#        print 'G1 attrib keys=', G1.attributes.keys() 
-        g3 = geospatial_data2points_dictionary(G1)
+#        g3 = geospatial_data2points_dictionary(G1)
 #        print 'g3=', g3
         
         G = G1 + G2
 
-#        g = geospatial_data2points_dictionary(G)
-#        print 'G=', g
-#        print 'G points =', G.get_data_points()
-#        print 'G attrib keys =', G.attributes.keys()
-#        print 'G test =', G.get_attributes('elevation')
         assert G.attributes.has_key('depth')
         assert G.attributes.has_key('elevation')
@@ -239 +232 @@
         """
 
-        from load_mesh.loadASCII import export_points_file
-        
-
         points = [[1.0, 2.1], [3.0, 5.3], [5.0, 6.1], [6.0, 3.3]]
         attributes = [2, 4, 5, 76]
@@ -352 +342 @@
                         'bad points file extension did not raise error!')
 
-    def Xtest_read_write_points_file_bad2(self):
+    def test_read_write_points_file_bad2(self):
         dict = {}
         att_dict = {}
@@ -682 +672 @@
         assert allclose(G.get_attributes(), [10.0, 0.0, 10.4])
         os.remove(FN)
+        
+    def test_add_points_files(self):
+        '''adds an xya and pts files and checks resulting file is correct
+        '''
+        
+        # create files
+        dict1 = {}
+        att_dict1 = {}
+        dict1['pointlist'] = array([[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        att_dict1['elevation'] = array([-10.0, 0.0, 10.4])
+        att_dict1['brightness'] = array([10.0, 0.0, 10.4])
+        dict1['attributelist'] = att_dict1
+        dict1['geo_reference'] = Geo_reference(56,1.9,1.9)
+        
+        dict2 = {}
+        att_dict2 = {}
+        dict2['pointlist'] = array([[2.0, 1.0],[1.0, 2.0],[2.0, 1.0]])
+        att_dict2['elevation'] = array([1.0, 15.0, 1.4])
+        att_dict2['brightness'] = array([14.0, 1.0, -12.4])
+        dict2['attributelist'] = att_dict2
+        dict2['geo_reference'] = Geo_reference(56,1.9,1.9)
+        
+        fileName1 = tempfile.mktemp(".xya")
+        fileName2 = tempfile.mktemp(".pts")
+
+        export_points_file(fileName1, dict1)
+        export_points_file(fileName2, dict2)
+#        export_points_file('hello.xya', dict1)
+#        export_points_file('hello.pts', dict2)
+        
+        results_file = 'resulting_points.pts'
+        
+        # add files
+        add_points_files(fileName1, fileName2, results_file )
+#        add_points_files('hello.xya', 'hello.pts', results_file )
+        
+        #read results
+        results_dict = import_points_file(results_file)
+        
+        assert allclose(results_dict['pointlist'],[[1.0, 0.0],[0.0, 1.0],[1.0, 0.0],[2.0, 1.0],[1.0, 2.0],[2.0, 1.0]])
+        assert allclose(results_dict['attributelist']['elevation'], [-10.0, 0.0, 10.4, 1.0, 15.0, 1.4])
+        answer = [10.0, 0.0, 10.4, 14.0, 1.0, -12.4]
+        assert allclose(results_dict['attributelist']['brightness'], answer)
+        #print "dict2['geo_reference']",dict2['geo_reference'] 
+        self.failUnless(results_dict['geo_reference'] == dict2['geo_reference'],
+                         'test_writepts failed. Test geo_reference')
+                         
+        os.remove(fileName1)
+        os.remove(fileName2)
+        os.remove(results_file)
 
 if __name__ == "__main__":