Changeset 3351 for inundation/geospatial_data

Timestamp:

Jul 18, 2006, 1:51:19 PM (19 years ago)

Author:

duncan

Message:

bug fix in ensure_geospatial

Location:

inundation/geospatial_data

Files:

• geospatial_data.py (modified) (2 diffs)
• test_geospatial_data.py (modified) (2 diffs)

inundation/geospatial_data/geospatial_data.py

@@ -792 +792 @@
         msg = "Use a Geospatial_data object or a mesh origin. Not both."
         assert geo_reference == None, msg
-            
+        return points    
     else:
         points = ensure_numeric(points, Float)
@@ -804 +804 @@
                                 geo_reference[1],
                                 geo_reference[2])
-        points = Geospatial_data(data_points=points, geo_reference=geo)        
+    points = Geospatial_data(data_points=points, geo_reference=geo)        
     return points
              

inundation/geospatial_data/test_geospatial_data.py

@@ -1073 +1073 @@
                          [2.0, 0.0],[2.0, 2.0],
                          [1.0, 3.0],[2.0, 2.0]]
-        new_points = ensure_absolute(points)
-        
-        assert allclose(new_points, points)
+        new_points = ensure_geospatial(points)
+        
+        assert allclose(new_points.get_data_points(absolute = True), points)
 
         points = array([[2.0, 0.0],[1.0, 1.0],
                          [2.0, 0.0],[2.0, 2.0],
                          [1.0, 3.0],[2.0, 2.0]])
-        new_points = ensure_absolute(points)
-        
-        assert allclose(new_points, points)
+        new_points = ensure_geospatial(points)
+        
+        assert allclose(new_points.get_data_points(absolute = True), points)
         
         ab_points = array([[2.0, 0.0],[1.0, 1.0],
@@ -1345 +1345 @@
 if __name__ == "__main__":
 
-    #suite = unittest.makeSuite(Test_Geospatial_data, 'test_lat_long')
+    #suite = unittest.makeSuite(Test_Geospatial_data, 'test_ensure_geospatial')
     suite = unittest.makeSuite(Test_Geospatial_data, 'test')
     runner = unittest.TextTestRunner()