Changeset 2594 for inundation/coordinate_transforms/geo_reference.py

Timestamp:

Mar 24, 2006, 6:07:58 PM (18 years ago)

Author:

ole

Message:

Duncan and Ole refactoring and dealing with georeferencing

File:

• inundation/coordinate_transforms/geo_reference.py (modified) (3 diffs)

inundation/coordinate_transforms/geo_reference.py

@@ -7 +7 @@
 
 import types, sys
-from Numeric import array,Float,ArrayType
+from Numeric import array,Float,ArrayType,reshape
+from utilities.numerical_tools import ensure_numeric
 
 DEFAULT_ZONE = sys.maxint
@@ -131 +132 @@
         If the points do not have a geo ref, assume 'absolute' values
         """
+
+        # FIXME: Use ensure_numeric
         
         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 point is being passed.  make it a list of lists
-                points = [points]
-        elif type(points) == ArrayType:
-            if len(points.shape) == 1:
-                points = [points]
-        
-        # FIXME: currently untested
-        # Always returns a list of lists
-        if points_geo_ref is self:
-            return points        
-            
-        #convert into array
-        points = array(points).astype(Float) 
-        #add point geo ref to points
-        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
-        points[:,0] -= self.xllcorner 
-        points[:,1] -= self.yllcorner
+
+        points = ensure_numeric(points)
+        if len(points.shape) == 1:
+            #One point has been passed
+            msg = 'Single point must have two elements'
+            assert len(points) == 2, msg
+            points = reshape(points, (1,2))
+
+            
+        if points_geo_ref is not self:
+            #add point geo ref to points
+            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
+            points[:,0] -= self.xllcorner 
+            points[:,1] -= self.yllcorner
+
+            
         if is_list:
             points = points.tolist()
+            
         return points
+    
     
     def get_absolute(self, points):
@@ -188 +191 @@
         return points
 
+
+    def reconcile_zones(self, other):
+
+        if self.zone == other.zone or self.zone == DEFAULT_ZONE and other.zone == DEFAULT_ZONE:
+            pass
+        elif self.zone == DEFAULT_ZONE:
+            self.zone = other.zone
+        elif other.zone == DEFAULT_ZONE:
+            other.zone = self.zone            
+        else:    
+            msg = 'Both geospatial_data objects must be in the same \
+            ZONE to allow reconciliation. I got zone %d and %d' %(self.zone, other.zone)
+            raise msg
     
     #def easting_northing2geo_reffed_point(self, x, y):