Changeset 1058

Timestamp:

Mar 10, 2005, 3:41:07 PM (20 years ago)

Author:

duncan

Message:

name change

Location:

inundation/ga/storm_surge/pyvolution/coordinate_transforms

Files:

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

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

@@ -74 +74 @@
         #false_northing = infile.false_northing[0]
 
-    def change_point_geo_ref(self, points,
-                       point_geo_ref=None):
+    def change_points_geo_ref(self, points,
+                       points_geo_ref=None):
         """
         Change the reference of a list or Numeric array of points.
@@ -95 +95 @@
         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 
+        if not points_geo_ref is None:
+            points[:,0] += points_geo_ref.xllcorner 
+            points[:,1] += points_geo_ref.yllcorner 
         
         #subtract primary geo ref from points

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

@@ -48 +48 @@
         self.failUnless(g == new_g, 'test_read_write_ASCII failed')  
     
-    def test_change_point_geo_ref(self):
+    def test_change_points_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)
+        new_lofl = g.change_points_geo_ref(lofl)
         #print "lofl",lofl 
         #print "new_lofl",new_lofl
@@ -63 +63 @@
             self.failUnless(point[1]-y==new_point[1], ' failed')
         
-    def test_change_point_geo_ref2(self):
+    def test_change_points_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)
+        new_lofl = g.change_points_geo_ref(lofl)
         #print "lofl",lofl 
         #print "new_lofl",new_lofl
@@ -78 +78 @@
             self.failUnless(point[1]-y==new_point[1], ' failed')
         
-    def test_change_point_geo_ref3(self):
+    def test_change_points_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)
+        new_lofl = g.change_points_geo_ref(lofl)
         #print "lofl",lofl 
         #print "new_lofl",new_lofl
@@ -94 +94 @@
         
     
-    def test_change_point_geo_ref4(self):
+    def test_change_points_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)
+        new_lofl = g.change_points_geo_ref(lofl)
         #print "4 lofl",lofl 
         #print "4 new_lofl",new_lofl
@@ -109 +109 @@
         assert allclose(lofl,new_lofl)
         
-    def test_change_point_geo_ref5(self):
+    def test_change_points_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)
+        new_lofl = g.change_points_geo_ref(lofl)
         #print "5 lofl",lofl 
         #print "5 new_lofl",new_lofl
@@ -124 +124 @@
             self.failUnless(point[1]-y==new_point[1], ' failed')
         
-    def test_change_point_geo_ref6(self):
+    def test_change_points_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)
+        new_lofl = g.change_points_geo_ref(lofl)
         #print "lofl",lofl 
         #print "new_lofl",new_lofl
@@ -139 +139 @@
             self.failUnless(point[1]-y==new_point[1], ' failed')
      
-    def test_change_point_geo_ref7(self):
+    def test_change_points_geo_ref7(self):
         x = 3.0
         y = 3.0
@@ -145 +145 @@
         point_y = -60.0
         g = Geo_reference(56,x,y)
-        point_geo_ref = Geo_reference(56,point_x,point_y)
+        points_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)
+        new_lofl = g.change_points_geo_ref(lofl,points_geo_ref=points_geo_ref)
         #print "lofl",lofl 
         #print "new_lofl",new_lofl