Changeset 2375 for inundation/utilities

Timestamp:

Feb 9, 2006, 2:37:57 PM (19 years ago)

Author:

ole

Message:

Added georeferencing to polygon_function and added test

Location:

inundation/utilities

Files:

• polygon.py (modified) (3 diffs)
• test_polygon.py (modified) (2 diffs)

inundation/utilities/polygon.py

@@ -333 +333 @@
     Note: If two polygons overlap, the one last in the list takes precedence
 
-    FIXME? : Currently, coordinates specified here are assumed to be relative to the origin (georeference) used by domain. This function is more general than domain so perhaps it'd be an idea to allow the optional argument georeference???
-
-    """
-
-    def __init__(self, regions, default = 0.0):
+    Coordinates specified in the call are assumed to be relative to the origin (georeference)
+    e.g. used by domain. By specifying the optional argument georeference, all points are made relative.
+
+    FIXME: This should really work with geo_spatial point sets.
+    """
+
+    def __init__(self, regions, default = 0.0, geo_reference = None):
 
         try:
@@ -355 +357 @@
         assert a == 2, 'Must have two component each: %s' %T
 
-        self.regions = regions
-        self.default = default
+
+        if geo_reference is None:
+            from coordinate_transforms.geo_reference import Geo_reference
+            geo_reference = Geo_reference()
+
+
+        self.default = default
+
+        #Make points in polygons relative to geo_reference
+        self.regions = []            
+        for polygon, value in regions:
+            P = geo_reference.change_points_geo_ref(polygon)            
+            self.regions.append( (P, value) )
+
+
 
 
@@ -392 +407 @@
 
 def read_polygon(filename):
-    """Read points assumed to form a polygon
-       There must be exactly two numbers in each line
+    """Read points assumed to form a polygon.
+       There must be exactly two numbers in each line separated by a comma.
+       No header.
     """
 

inundation/utilities/test_polygon.py

@@ -56 +56 @@
 
 
+    def test_polygon_function_georef(self):
+        """Check that georeferencing works
+        """
+
+        from coordinate_transforms.geo_reference import Geo_reference
+
+        geo = Geo_reference(56, 200, 1000)
+
+        #Make points 'absolute'
+        p1 = [[200,1000], [210,1000], [210,1010], [200,1010]]
+        p2 = [[200,1000], [210,1010], [215,1005], [220, 1010], [225,1000],
+              [230,1010], [240,990]]
+
+        f = Polygon_function( [(p1, 1.0)], geo_reference = geo )
+        z = f([5, 5, 27, 35], [5, 9, 8, -5]) #Two first inside p1
+
+        assert allclose(z, [1,1,0,0])
+
+
+        f = Polygon_function( [(p2, 2.0)], geo_reference = geo )
+        z = f([5, 5, 27, 35], [5, 9, 8, -5]) #First and last inside p2
+        assert allclose(z, [2,0,0,2])
+
+
+        #Combined
+        f = Polygon_function( [(p1, 1.0), (p2, 2.0)], geo_reference = geo )
+        z = f([5, 5, 27, 35], [5, 9, 8, -5])
+        assert allclose(z, [2,1,0,2])
+
+
+        #Check that it would fail without geo
+        f = Polygon_function( [(p1, 1.0), (p2, 2.0)])
+        z = f([5, 5, 27, 35], [5, 9, 8, -5])
+        assert not allclose(z, [2,1,0,2])        
+
+
+
     def test_polygon_function_callable(self):
         """Check that values passed into Polygon_function can be callable
@@ -84 +121 @@
         z = f([5, 5, 27, 35], [5, 9, 8, -5])
         assert allclose(z, [2,14,35,2])
+