Changeset 6428 for branches/numpy/anuga/coordinate_transforms/geo_reference.py

Timestamp:

Feb 27, 2009, 11:54:09 AM (15 years ago)

Author:

rwilson

Message:

numpy changes

File:

• branches/numpy/anuga/coordinate_transforms/geo_reference.py (modified) (5 diffs)

branches/numpy/anuga/coordinate_transforms/geo_reference.py

@@ -101 +101 @@
             self.read_ASCII(ASCIIFile, read_title=read_title)
 
-#    # Might be better to have this method instead of the following 3.
-#    def get_origin(self):
-#        return (self.zone, self.xllcorner, self.yllcorner)
-
     ##
     # @brief Get the X coordinate of the origin of this georef.
@@ -238 +234 @@
 ################################################################################
 
+    ##
+    # @brief Change points to be absolute wrt new georef 'points_geo_ref'.
+    # @param points The points to change.
+    # @param points_geo_ref The new georef to make points absolute wrt.
+    # @return The changed points.
+    # @note If 'points' is a list then a changed list is returned.
+    # @note The input points data is changed.
     def change_points_geo_ref(self, points, points_geo_ref=None):
+        """Change the geo reference of a list or numeric array of points to
+        be this reference.(The reference used for this object)
+        If the points do not have a geo ref, assume 'absolute' input values
         """
-        Change the geo reference of a list or numeric array of points to
-        be this reference.(The reference used for this object)
-        If the points do not have a geo ref, assume 'absolute' values
-        """
-
-        is_list = False
-        if type(points) == types.ListType:
-            is_list = True
+
+        # remember if we got a list
+        is_list = isinstance(points, list)
 
         points = ensure_numeric(points, num.float)
 
+        # sanity checks
         if len(points.shape) == 1:
             # One point has been passed
@@ -288 +290 @@
     # @return True if ???
     def is_absolute(self):
-        """Return True if xllcorner==yllcorner==0
-        indicating that points in question are absolute.
-        """
+        """Return True if xllcorner==yllcorner==0"""
 
         return num.allclose([self.xllcorner, self.yllcorner], 0)
@@ -298 +298 @@
     # @param points
     # @return
-    # @note
+    # @note This method changes the input points!
     def get_absolute(self, points):
-        """Given a set of points geo referenced to this instance,
+        """Given a set of points geo referenced to this instance
+
         return the points as absolute values.
         """
 
-        #if self.is_absolute:
-        #    return points
-
         # remember if we got a list
-        is_list = False
-        if type(points) == types.ListType:
-            is_list = True
-
+        is_list = isinstance(points, list)
+
+        # convert to numeric array
         points = ensure_numeric(points, num.float)
+
+        # sanity checks
         if len(points.shape) == 1:
             #One point has been passed
@@ -326 +325 @@
 
         # Add geo ref to points
-        #if not self.is_absolute:
         if not self.is_absolute():
             points[:,0] += self.xllcorner