Changeset 3154

Timestamp:

Jun 13, 2006, 5:10:24 PM (19 years ago)

Author:

duncan

Message:

more flexibility..

Location:

inundation/geospatial_data

Files:

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

inundation/geospatial_data/geospatial_data.py

@@ -178 +178 @@
             #print "geo_reference",geo_reference
             #FIXME: Maybe put out a warning here...
-            self.data_points = geo_reference.change_points_geo_ref \
-                               (self.data_points, 
-                                self.geo_reference)
+            self.data_points = self.get_data_points \
+                               (geo_reference=geo_reference)
+            #self.data_points = geo_reference.change_points_geo_ref \
+            #                   (self.data_points, 
+            #                    self.geo_reference)
             
         self.geo_reference = geo_reference
@@ -197 +199 @@
         return self.geo_reference
        
-    def get_data_points(self, absolute = True):
+    def get_data_points(self, absolute = True, geo_reference=None):
         """Get coordinates for all data points as an Nx2 array
 
@@ -207 +209 @@
         """
 
-        if absolute is True:
+        if absolute is True and geo_reference is None:
             return self.geo_reference.get_absolute(self.data_points)
-        else: 
-            return self.data_points        
+        elif geo_reference is not None:
+            return geo_reference.change_points_geo_ref \
+                               (self.data_points, 
+                                self.geo_reference)
+        else:
+            return self.data_points
         
     

inundation/geospatial_data/test_geospatial_data.py

@@ -113 +113 @@
             raise 'Should have raised exception' 
 
+    def test_get_data_points(self):
+        points_ab = [[12.5,34.7],[-4.5,-60.0]]
+        x_p = -10
+        y_p = -40
+        geo_ref = Geo_reference(56, x_p, y_p)
+        points_rel = geo_ref.change_points_geo_ref(points_ab)
+        
+        spatial = Geospatial_data(points_rel, geo_reference=geo_ref)
+
+        results = spatial.get_data_points(absolute=False)
+        
+        assert allclose(results, points_rel)
+        
+        x_p = -1770
+        y_p = 4.01
+        geo_ref = Geo_reference(56, x_p, y_p)
+        points_rel = geo_ref.change_points_geo_ref(points_ab)
+        results = spatial.get_data_points \
+                  ( geo_reference=geo_ref)
+        
+        assert allclose(results, points_rel)
+
+        
     def test_set_geo_reference(self):
         points_ab = [[12.5,34.7],[-4.5,-60.0]]
@@ -1091 +1114 @@
 
         results = Geospatial_data(fileName)
-        
-        assert allclose(results.get_data_points(absolute=False), [[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
-        assert allclose(results.get_attributes(attribute_name='elevation'), [10.0, 0.0, 10.4])
-        assert allclose(results.get_attributes(attribute_name='speed'), [0.0, 10.0, 40.0])
+        assert allclose(results.get_data_points(absolute=False), \
+                        [[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        assert allclose(results.get_attributes(attribute_name='elevation'), \
+                        [10.0, 0.0, 10.4])
+        assert allclose(results.get_attributes(attribute_name='speed'), \
+                        [0.0, 10.0, 40.0])
 
         os.remove(fileName)
@@ -1190 +1215 @@
 
 if __name__ == "__main__":
-    #suite = unittest.makeSuite(Test_Geospatial_data, 'test_set_geo_reference')
+
+    #suite = unittest.makeSuite(Test_Geospatial_data, 'test_isinstance')
     suite = unittest.makeSuite(Test_Geospatial_data, 'test')
     runner = unittest.TextTestRunner()