Changeset 1057

Timestamp:

Mar 10, 2005, 1:32:08 PM (20 years ago)

Author:

duncan

Message:

added point transformation from different geo refs

Location:

inundation/ga/storm_surge/pyvolution/coordinate_transforms

Files:

• geo_reference.py (modified) (2 diffs)
• test_geo_reference.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/coordinate_transforms/geo_reference.py

@@ -3 +3 @@
 
 import types
+from Numeric import array,Float,ArrayType
 
 class Geo_reference:
@@ -73 +74 @@
         #false_northing = infile.false_northing[0]
 
-    def change_geo_ref(self, primary_geo_ref,
-                       secondary_geo_ref, secondary_points):
+    def change_point_geo_ref(self, points,
+                       point_geo_ref=None):
+        """
+        Change the reference of a list or Numeric array of points.
+        If the points do not have ageo ref, assume 'absolute' values
+        """
+        is_list = False
+        if type(points) == types.ListType:
+            is_list = True
+            if len(points)>0 and type(points[0]) not in [types.ListType,types.TupleType]:
+                #a single pont is being passed.  make it a list of lists
+                points = [points]
+        elif type(points) == ArrayType:
+            if len(points.shape) == 1:
+                points = [points]
+                
+            
+            
         #convert into array
-        #add secondary geo ref to points
-        #subtract secondary geo ref from points
+        points = array(points).astype(Float) 
+        #add point geo ref to points
+        if not point_geo_ref is None:
+            points[:,0] += point_geo_ref.xllcorner 
+            points[:,1] += point_geo_ref.yllcorner 
+        
+        #subtract primary geo ref from points
+        points[:,0] -= self.xllcorner 
+        points[:,1] -= self.yllcorner
+        if is_list:
+            points = points.tolist()
         # return points
-        pass
+        return points
 
+    
+    #def easting_northing2geo_reffed_point(self, x, y):
+    #    return [x-self.xllcorner, y - self.xllcorner]
+
+    #def easting_northing2geo_reffed_points(self, x, y):
+    #    return [x-self.xllcorner, y - self.xllcorner]
+    
     def __repr__(self):
         return "(%f,%f, %i)" % (self.xllcorner,self.yllcorner, self.zone)

inundation/ga/storm_surge/pyvolution/coordinate_transforms/test_geo_reference.py

@@ -7 +7 @@
 
 from geo_reference import *
+from Numeric import allclose,array
 
 class geo_referenceTestCase(unittest.TestCase):
@@ -46 +47 @@
 
         self.failUnless(g == new_g, 'test_read_write_ASCII failed')  
+    
+    def test_change_point_geo_ref(self):
+        x = 3.0
+        y = 3.0
+        g = Geo_reference(56,x,y)
+        lofl = [[3.0,3.0], [6.0,6.0]]
+        new_lofl = g.change_point_geo_ref(lofl)
+        #print "lofl",lofl 
+        #print "new_lofl",new_lofl
+
+        self.failUnless(type(new_lofl) == types.ListType, ' failed')
+        self.failUnless(type(new_lofl) == type(lofl), ' failed')
+        for point,new_point in map(None,lofl,new_lofl):
+            self.failUnless(point[0]-x==new_point[0], ' failed')
+            self.failUnless(point[1]-y==new_point[1], ' failed')
         
+    def test_change_point_geo_ref2(self):
+        x = 3.0
+        y = 3.0
+        g = Geo_reference(56,x,y)
+        lofl = [[3.0,3.0]]
+        new_lofl = g.change_point_geo_ref(lofl)
+        #print "lofl",lofl 
+        #print "new_lofl",new_lofl
+
+        self.failUnless(type(new_lofl) == types.ListType, ' failed')
+        self.failUnless(type(new_lofl) == type(lofl), ' failed')
+        for point,new_point in map(None,lofl,new_lofl):
+            self.failUnless(point[0]-x==new_point[0], ' failed')
+            self.failUnless(point[1]-y==new_point[1], ' failed')
+        
+    def test_change_point_geo_ref3(self):
+        x = 3.0
+        y = 3.0
+        g = Geo_reference(56,x,y)
+        lofl = [3.0,3.0]
+        new_lofl = g.change_point_geo_ref(lofl)
+        #print "lofl",lofl 
+        #print "new_lofl",new_lofl
+
+        self.failUnless(type(new_lofl) == types.ListType, ' failed')
+        self.failUnless(type(new_lofl) == type(lofl), ' failed')
+        for point,new_point in map(None,[lofl],new_lofl):
+            self.failUnless(point[0]-x==new_point[0], ' failed')
+            self.failUnless(point[1]-y==new_point[1], ' failed')
+        
+    
+    def test_change_point_geo_ref4(self):
+        x = 3.0
+        y = 3.0
+        g = Geo_reference(56,x,y)
+        lofl = array([[3.0,3.0], [6.0,6.0]])
+        new_lofl = g.change_point_geo_ref(lofl)
+        #print "4 lofl",lofl 
+        #print "4 new_lofl",new_lofl
+
+        self.failUnless(type(new_lofl) == ArrayType, ' failed')
+        self.failUnless(type(new_lofl) == type(lofl), ' failed')
+        lofl[:,0] -= x
+        lofl[:,1] -= y
+        assert allclose(lofl,new_lofl)
+        
+    def test_change_point_geo_ref5(self):
+        x = 3.0
+        y = 3.0
+        g = Geo_reference(56,x,y)
+        lofl = array([[3.0,3.0]])
+        new_lofl = g.change_point_geo_ref(lofl)
+        #print "5 lofl",lofl 
+        #print "5 new_lofl",new_lofl
+
+        self.failUnless(type(new_lofl) == ArrayType, ' failed')
+        self.failUnless(type(new_lofl) == type(lofl), ' failed')
+        for point,new_point in map(None,lofl,new_lofl):
+            self.failUnless(point[0]-x==new_point[0], ' failed')
+            self.failUnless(point[1]-y==new_point[1], ' failed')
+        
+    def test_change_point_geo_ref6(self):
+        x = 3.0
+        y = 3.0
+        g = Geo_reference(56,x,y)
+        lofl = array([3.0,3.0])
+        new_lofl = g.change_point_geo_ref(lofl)
+        #print "lofl",lofl 
+        #print "new_lofl",new_lofl
+
+        self.failUnless(type(new_lofl) == ArrayType, ' failed')
+        self.failUnless(type(new_lofl) == type(lofl), ' failed')
+        for point,new_point in map(None,[lofl],new_lofl):
+            self.failUnless(point[0]-x==new_point[0], ' failed')
+            self.failUnless(point[1]-y==new_point[1], ' failed')
+     
+    def test_change_point_geo_ref7(self):
+        x = 3.0
+        y = 3.0
+        point_x = 9.0
+        point_y = -60.0
+        g = Geo_reference(56,x,y)
+        point_geo_ref = Geo_reference(56,point_x,point_y)
+        lofl = [[3.0,3.0], [6.0,6.0]]
+        new_lofl = g.change_point_geo_ref(lofl,point_geo_ref=point_geo_ref)
+        #print "lofl",lofl 
+        #print "new_lofl",new_lofl
+
+        self.failUnless(type(new_lofl) == types.ListType, ' failed')
+        self.failUnless(type(new_lofl) == type(lofl), ' failed')
+        for point,new_point in map(None,lofl,new_lofl):
+            self.failUnless(point[0]+point_x-x==new_point[0], ' failed')
+            self.failUnless(point[1]+point_y-y==new_point[1], ' failed')
+               
     def test___cmp__(self):
         g = Geo_reference(56,1.9,1.9,)