Changeset 3056 for inundation/geospatial_data

Timestamp:

Jun 2, 2006, 3:10:48 PM (19 years ago)

Author:

duncan

Message:

Fixing mesh_interface tests. geospatial_data.py now has ensure_geospatial.

Location:

inundation/geospatial_data

Files:

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

inundation/geospatial_data/geospatial_data.py

@@ -704 +704 @@
     return points
      
-        
+
+def ensure_geospatial(points, geo_reference = None):
+    """
+    This function inputs several formats and
+    outputs one format. - a geospatial_data instance.
+
+    Inputed formats are;
+    points: List or numeric array of coordinate pairs [xi, eta] of
+              points or geospatial object
+
+    mesh_origin: A geo_reference object or 3-tuples consisting of
+                 UTM zone, easting and northing.
+                 If specified vertex coordinates are assumed to be
+                 relative to their respective origins.
+    """
+    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
+            
+    else:
+        points = ensure_numeric(points, Float)
+    if geo_reference is None:
+        geo = None #Geo_reference()
+    else:
+        if isinstance(geo_reference, Geo_reference):
+            geo = geo_reference
+        else:
+            geo = Geo_reference(geo_reference[0],
+                                geo_reference[1],
+                                geo_reference[2])
+        points = Geospatial_data(data_points=points, geo_reference=geo)
+        #points = geo.get_absolute(points)
+    return points
+             

inundation/geospatial_data/test_geospatial_data.py

@@ -990 +990 @@
            
         assert allclose(new_points, ab_points)
+
+        
+    def test_ensure_geospatial(self):
+        points = [[2.0, 0.0],[1.0, 1.0],
+                         [2.0, 0.0],[2.0, 2.0],
+                         [1.0, 3.0],[2.0, 2.0]]
+        new_points = ensure_absolute(points)
+        
+        assert allclose(new_points, points)
+
+        points = array([[2.0, 0.0],[1.0, 1.0],
+                         [2.0, 0.0],[2.0, 2.0],
+                         [1.0, 3.0],[2.0, 2.0]])
+        new_points = ensure_absolute(points)
+        
+        assert allclose(new_points, points)
+        
+        ab_points = array([[2.0, 0.0],[1.0, 1.0],
+                         [2.0, 0.0],[2.0, 2.0],
+                         [1.0, 3.0],[2.0, 2.0]])
+        
+        mesh_origin = (56, 290000, 618000) #zone, easting, northing
+
+        data_points = zeros((ab_points.shape), Float)
+        #Shift datapoints according to new origins
+        for k in range(len(ab_points)):
+            data_points[k][0] = ab_points[k][0] - mesh_origin[1]
+            data_points[k][1] = ab_points[k][1] - mesh_origin[2]
+        #print "data_points",data_points     
+        new_geospatial = ensure_geospatial(data_points,
+                                             geo_reference=mesh_origin)
+        new_points = new_geospatial.get_data_points(absolute=True)
+        #print "new_points",new_points
+        #print "ab_points",ab_points
+           
+        assert allclose(new_points, ab_points)
+
+        geo = Geo_reference(56,67,-56)
+
+        data_points = geo.change_points_geo_ref(ab_points)   
+        new_geospatial = ensure_geospatial(data_points,
+                                             geo_reference=geo)
+        new_points = new_geospatial.get_data_points(absolute=True)
+        #print "new_points",new_points
+        #print "ab_points",ab_points
+           
+        assert allclose(new_points, ab_points)
+
+
+        geo_reference = Geo_reference(56, 100, 200)
+        ab_points = [[1.0, 2.1], [3.0, 5.3]]
+        points = geo_reference.change_points_geo_ref(ab_points)
+        attributes = [2, 4]
+        #print "geo in points", points
+        G = Geospatial_data(points, attributes,
+                            geo_reference=geo_reference)
+          
+        new_geospatial  = ensure_geospatial(G)
+        new_points = new_geospatial.get_data_points(absolute=True)
+        #print "new_points",new_points
+        #print "ab_points",ab_points
+           
+        assert allclose(new_points, ab_points)
         
     def test_isinstance(self):