Changeset 3262 for inundation/geospatial_data

Timestamp:

Jun 30, 2006, 3:19:05 PM (19 years ago)

Author:

duncan

Message:

using/expanding ensure_absolute

Location:

inundation/geospatial_data

Files:

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

inundation/geospatial_data/geospatial_data.py

@@ -697 +697 @@
                  relative to their respective origins.
     """
+    if isinstance(points,type('')):
+        #It's a string
+        #assume it is a point file
+        points = Geospatial_data(file_name = points)
+        
     if isinstance(points,Geospatial_data):
         points = points.get_data_points( \
@@ -733 +738 @@
     """
     if isinstance(points,Geospatial_data):
-        #points = points.get_data_points( \
-        #        absolute = True)
         msg = "Use a Geospatial_data object or a mesh origin. Not both."
         assert geo_reference == None, msg
@@ -741 +744 @@
         points = ensure_numeric(points, Float)
     if geo_reference is None:
-        geo = None #Geo_reference()
+        geo = None
     else:
         if isinstance(geo_reference, Geo_reference):
@@ -749 +752 @@
                                 geo_reference[1],
                                 geo_reference[2])
-        points = Geospatial_data(data_points=points, geo_reference=geo)
-        #points = geo.get_absolute(points)
+        points = Geospatial_data(data_points=points, geo_reference=geo)        
     return points
              

inundation/geospatial_data/test_geospatial_data.py

@@ -1031 +1031 @@
         assert allclose(new_points, ab_points)
 
+       
+        fileName = tempfile.mktemp(".xya")
+        file = open(fileName,"w")
+        file.write("  elevation   speed \n\
+1.0 0.0 10.0 0.0\n\
+0.0 1.0 0.0 10.0\n\
+1.0 0.0 10.4 40.0\n\
+#geocrap\n\
+56\n\
+10\n\
+20\n")
+        file.close()
+        
+        ab_points = ensure_absolute(fileName)
+        actual =  [[11, 20.0],[10.0, 21.0],[11.0, 20.0]]
+        assert allclose(ab_points, actual)
+        os.remove(fileName)
+
         
     def test_ensure_geospatial(self):