Changeset 3071

Timestamp:

Jun 5, 2006, 12:02:15 PM (19 years ago)

Author:

ole

Message:

Prettified and added input test for dimensions

File:

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

inundation/coordinate_transforms/geo_reference.py

@@ -146 +146 @@
         """
 
-        # FIXME: Use ensure_numeric
-        
         is_list = False
         if type(points) == types.ListType:
@@ -160 +158 @@
             points = reshape(points, (1,2))
 
+        msg = 'Input must be an N x 2 array or list of (x,y) values. '
+        msg += 'I got an %d x %d array' %points.shape    
+        assert points.shape[1] == 2, msg                
+
             
         if points_geo_ref is not self:
@@ -183 +185 @@
         return the points as 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 point 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
-        points = array(points).astype(Float) 
-        # add primary geo ref from points
+
+        points = ensure_numeric(points, Float)
+        
+        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))
+
+
+        msg = 'Input must be an N x 2 array or list of (x,y) values. '
+        msg += 'I got an %d x %d array' %points.shape    
+        assert points.shape[1] == 2, msg    
+            
+
+        # Old code    
+        #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]       
+            
+        ## convert into array
+        #points = array(points).astype(Float)
+
+        
+        # Add primary geo ref from points
+
+
+        
         points[:,0] += self.xllcorner 
         points[:,1] += self.yllcorner
+
+        
         if is_list:
             points = points.tolist()
@@ -208 +237 @@
     def reconcile_zones(self, other):
 
-        if self.zone == other.zone or self.zone == DEFAULT_ZONE and other.zone == DEFAULT_ZONE:
+        if self.zone == other.zone or\
+               self.zone == DEFAULT_ZONE and other.zone == DEFAULT_ZONE:
             pass
         elif self.zone == DEFAULT_ZONE:
@@ -216 +246 @@
         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)
+            ZONE to allow reconciliation. I got zone %d and %d'\
+            %(self.zone, other.zone)
             raise ANUGAError, msg