Changeset 3177 for inundation/geospatial_data

Timestamp:

Jun 19, 2006, 10:30:57 AM (19 years ago)

Author:

duncan

Message:

added function to pmesh.mesh for adding vertices by passing in a geospatial instance.

Location:

inundation/geospatial_data

Files:

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

inundation/geospatial_data/geospatial_data.py

@@ -175 +175 @@
         # represent the new geo-ref
         if  self.geo_reference is not None:
-            #print "self.geo_reference",self.geo_reference 
-            #print "geo_reference",geo_reference
             #FIXME: Maybe put out a warning here...
             self.data_points = self.get_data_points \
                                (geo_reference=geo_reference)
-            #self.data_points = geo_reference.change_points_geo_ref \
-            #                   (self.data_points, 
-            #                    self.geo_reference)
             
         self.geo_reference = geo_reference
@@ -205 +200 @@
         returned coordinates are relative to the internal georeference's
         xll and yll corners.
+
+        If a geo_reference is passed the points are returned relative
+        to that geo_reference.
 
         Default: absolute is True.

inundation/geospatial_data/test_geospatial_data.py

@@ -921 +921 @@
         '''
 
-        #FIXME (Ole): I changed the georeference arbitrarily, but the test still passes.
-        
         # create files
         att_dict1 = {}
@@ -934 +932 @@
         att_dict2['elevation'] = array([1.0, 15.0, 1.4])
         att_dict2['brightness'] = array([14.0, 1.0, -12.4])
-        geo_reference2 = Geo_reference(56, 1.0, 2.0) #FIXME (Ole): I changed this, why does it still pass
-        #OK - it fails now, after the fix revealed by test_create_from_pts_file_with_geo')
+        geo_reference2 = Geo_reference(56, 1.0, 2.0) 
 
         G1 = Geospatial_data(pointlist1, att_dict1, geo_reference1)