Changeset 2643

Timestamp:

Mar 31, 2006, 4:18:50 PM (19 years ago)

Author:

nick

Message:

add comments to geospatial_data.py

Location:

inundation/geospatial_data

Files:

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

inundation/geospatial_data/geospatial_data.py

@@ -23 +23 @@
                  absolute = True):
 
-        """Create instance from data points and associated attributes
+        
+        """
+        Create instance from data points and associated attributes
 
 
@@ -45 +47 @@
         If None, the default is the 'first'
         
-        file_name: Name of input file.....
-        
-        absolute: is the data point absolute or relative to a xll and yll 
-        in a zone
-        
-        """
+        file_name: Name of input netCDF file or xya file. netCDF file must 
+        have dimensions "points" etc.
+        xya file is a CVS file with lats(x), longs(y) and elevation(a). 
+        first line must be attribute name eg elevation  
+        
+        absolute: Return data points that are absolute or relative to
+        to a xll and yll in a zone
+        
+        """
+        
 
         if file_name is None:
@@ -60 +66 @@
             self.set_default_attribute_name(default_attribute_name)
             self.set_absolute(absolute)
-            
         
         else:
@@ -71 +76 @@
                 # if file name then all provided info will be removed!
                 self.file_name = file_name
-                data = import_points_file(self.file_name)
+                self.new_import_points_file(file_name)
                 
-                # print 'data: point in init', data['pointlist']
-                # print 'attrib: point in init', data['attributelist']
-                # print 'geo_ref: point in init', data['geo_reference']
-                
-                data_points = data['pointlist']
-                attributes = data['attributelist']
-                geo_reference = data['geo_reference']
-                
-                self.check_data_points(data_points)
-                self.set_attributes(attributes)
-                self.set_geo_reference(geo_reference)
+#                print'data: point in init',self.data_points
+#                print'attrib: point in init',self.attributes
+#                print'geo_ref: point in init',self.geo_reference
+                self.check_data_points(self.data_points)
+                self.set_attributes(self.attributes)
+                self.set_geo_reference(self.geo_reference)
                 self.set_default_attribute_name(default_attribute_name)
 
@@ -366 +366 @@
         """
         
-        all_data = {}
+        attributes = {}
         if ofile[-4:]== ".xya":
             try:
@@ -372 +372 @@
                     try:
                         fd = open(ofile)
-                        all_data = _read_xya_file(fd, ',')
+#                        all_data = _read_xya_file(fd, ',')
+                        data_points, attributes, geo_reference = _new_read_xya_file(fd, ',')
                     except SyntaxError:
                         fd.close()
                         fd = open(ofile)
-                        all_data = _read_xya_file(fd, ' ')
+#                        all_data = _read_xya_file(fd, ' ')
+                        data_points, attributes, geo_reference = _new_read_xya_file(fd, ' ')
                 else:
                     fd = open(ofile)
-                    all_data = _read_xya_file(fd, delimiter)
+#                    all_data = _read_xya_file(fd, delimiter)
+                    data_points, attributes, geo_reference = _new_read_xya_file(fd, delimiter)
                 fd.close()
             except (IndexError,ValueError,SyntaxError):
@@ -393 +396 @@
             try:
     #            print 'hi from import_points_file'
-                all_data = _read_pts_file(ofile, verbose)
+#                all_data = _read_pts_file(ofile, verbose)
+                data_points, attributes, geo_reference = _new_read_pts_file(ofile, verbose)
     #            print 'hi1 from import_points_file', all_data
             except IOError, e:    
@@ -401 +405 @@
             msg = 'Extension %s is unknown' %ofile[-4:]
             raise IOError, msg
-    
-        return all_data
+        
+#        print'in import data_points', data_points
+#        print'in import attributes', attributes
+#        print'in import data_points', geo_reference
+        self.data_points = data_points
+        self.attributes = attributes
+        self.geo_reference = geo_reference
+    
+#        return all_data
     
     def new_export_points_file(self, ofile):
@@ -491 +502 @@
         raise IOError, msg 
 '''
-def _read_pts_file(file_name, verbose = False):
+
+
+def _new_read_pts_file(file_name, verbose = False):
     """Read .pts NetCDF file
     
@@ -516 +529 @@
     fid = NetCDFFile(file_name, 'r') 
     
-    point_atts = {}  
+#    point_atts = {}  
         # Get the variables
-    point_atts['pointlist'] = array(fid.variables['points'])
+#    point_atts['pointlist'] = array(fid.variables['points'])
+    pointlist = array(fid.variables['points'])
     keys = fid.variables.keys()
     if verbose: print 'Got %d variables: %s' %(len(keys), keys)
@@ -534 +548 @@
         attributes[key] = array(fid.variables[key])
     
-    point_atts['attributelist'] = attributes
+#    point_atts['attributelist'] = attributes
     
     try:
         geo_reference = Geo_reference(NetCDFObject=fid)
-        point_atts['geo_reference'] = geo_reference
+#        point_atts['geo_reference'] = geo_reference
     except AttributeError, e:
         #geo_ref not compulsory 
-        point_atts['geo_reference'] = None
+#        point_atts['geo_reference'] = None
+        geo_reference = None
     
     fid.close()
-    return point_atts
-
-
-def _read_xya_file( fd, delimiter):
+    
+    return pointlist, attributes, geo_reference
+
+
+def _new_read_xya_file( fd, delimiter):
 #    print 'hello from read xya data'
     points = []
@@ -591 +607 @@
         geo_reference = Geo_reference(ASCIIFile=fd,read_title=line)
     
+#    xya_dict = {}
+#    xya_dict['pointlist'] = array(points).astype(Float)
+    pointlist = array(points).astype(Float)
+    
+    for key in att_dict.keys():
+        att_dict[key] = array(att_dict[key]).astype(Float)
+#    xya_dict['attributelist'] = att_dict
+    
+#    xya_dict['geo_reference'] = geo_reference
+    #print "xya_dict",xya_dict 
+    return pointlist, att_dict, geo_reference
+
+
+def _read_pts_file(file_name, verbose = False):
+    """Read .pts NetCDF file
+    
+    Return a dic of array of points, and dic of array of attribute
+    eg
+    dic['points'] = [[1.0,2.0],[3.0,5.0]]
+    dic['attributelist']['elevation'] = [[7.0,5.0]
+    """    
+    #FIXME: (DSG) This format has issues.
+    # There can't be an attribute called points 
+    # consider format change
+
+#    print 'hi for read points file'
+    from Scientific.IO.NetCDF import NetCDFFile
+    
+    if verbose: print 'Reading ', file_name
+    
+        
+    # see if the file is there.  Throw a QUIET IO error if it isn't
+    fd = open(file_name,'r')
+    fd.close()
+    
+    #throws prints to screen if file not present
+    fid = NetCDFFile(file_name, 'r') 
+    
+    point_atts = {}  
+        # Get the variables
+    point_atts['pointlist'] = array(fid.variables['points'])
+    keys = fid.variables.keys()
+    if verbose: print 'Got %d variables: %s' %(len(keys), keys)
+    try:
+        keys.remove('points')
+    except IOError, e:       
+        fid.close()    
+        msg = 'Expected keyword "points" but could not find it'
+        raise IOError, msg
+    
+    attributes = {}
+    for key in keys:
+        if verbose: print "reading attribute '%s'" %key
+            
+        attributes[key] = array(fid.variables[key])
+    
+    point_atts['attributelist'] = attributes
+    
+    try:
+        geo_reference = Geo_reference(NetCDFObject=fid)
+        point_atts['geo_reference'] = geo_reference
+    except AttributeError, e:
+        #geo_ref not compulsory 
+        point_atts['geo_reference'] = None
+    
+    fid.close()
+    return point_atts
+
+
+def _read_xya_file( fd, delimiter):
+#    print 'hello from read xya data'
+    points = []
+    pointattributes = []
+    title = fd.readline()
+    att_names = clean_line(title,delimiter)
+    
+    att_dict = {}
+    line = fd.readline()
+    numbers = clean_line(line,delimiter)
+    #print 'read xya numbers', numbers
+    while len(numbers) > 1:
+        if numbers != []:
+            try:
+                x = float(numbers[0])
+                y = float(numbers[1])
+                points.append([x,y])
+                numbers.pop(0)
+                numbers.pop(0)
+                #attributes = []
+                #print "att_names",att_names
+                #print "numbers",numbers 
+                if len(att_names) != len(numbers):
+                    fd.close()
+                    # It might not be a problem with the title
+                    #raise TitleAmountError
+                    raise IOError
+                for i,num in enumerate(numbers):
+                    num.strip()
+                    if num != '\n' and num != '':
+                        #attributes.append(float(num))
+                        att_dict.setdefault(att_names[i],[]).append(float(num))
+                        
+            except ValueError:
+                raise SyntaxError
+        line = fd.readline()
+        numbers = clean_line(line,delimiter)
+    
+    if line == '':
+            # end of file
+        geo_reference = None
+    else:
+        geo_reference = Geo_reference(ASCIIFile=fd,read_title=line)
+    
     xya_dict = {}
     xya_dict['pointlist'] = array(points).astype(Float)

inundation/geospatial_data/test_geospatial_data.py

@@ -337 +337 @@
         file.close()
         #print fileName
+        dict = import_points_file(fileName,delimiter = ',')
         dict = import_points_file(fileName,delimiter = ',')
         os.remove(fileName)