Changeset 3320

Timestamp:

Jul 12, 2006, 5:43:01 PM (19 years ago)

Author:

duncan

Message:

using tip from Ole

File:

• inundation/geospatial_data/geospatial_data.py (modified) (3 diffs)

inundation/geospatial_data/geospatial_data.py

@@ -5 +5 @@
 
 from os import access, F_OK, R_OK
-from Numeric import concatenate, array, Float, shape, reshape
+from Numeric import concatenate, array, Float, shape, reshape, ravel
+
 
 from utilities.numerical_tools import ensure_numeric
@@ -210 +211 @@
                             points_are_lats_longs):
         if geo_reference is not None:
-            msg = """A georeference is specified yet latitude and longitude are also specified!"""
+            msg = """A georeference is specified yet latitude and longitude
+            are also specified!"""
             raise ValueError, msg
         if data_points is not None and not points_are_lats_longs:
-            msg = """Data points are specified yet latitude and longitude are also specified!"""
+            msg = """Data points are specified yet latitude and
+            longitude are also specified!"""
             raise ValueError, msg
         
@@ -221 +224 @@
                 raise ValueError, msg
             lats_longs = ensure_numeric(data_points)
-            latitudes = lats_longs[:,0:1]
-            latitudes = reshape(latitudes,(latitudes.shape[0],))
-            longitudes = lats_longs[:,1:]
-            longitudes = reshape(longitudes,(longitudes.shape[0],))
+            latitudes = ravel(lats_longs[:,0:1])
+            longitudes = ravel(lats_longs[:,1:])
             
         if latitudes is None and longitudes is None: