Changeset 2590 for inundation/geospatial_data/test_geospatial_data.py

Timestamp:

Mar 24, 2006, 2:43:10 PM (18 years ago)

Author:

ole

Message:

Clean up

File:

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

inundation/geospatial_data/test_geospatial_data.py

@@ -202 +202 @@
                                               [1.0, 2.1], [3.0, 5.3]])
         
-    def test_add1 (self):
+    def test_add_with_geo (self):
         """
         Difference in Geo_reference resolved
@@ -208 +208 @@
         points1 = [[1.0, 2.1], [3.0, 5.3]]
         points2 = [[5.0, 6.1], [6.0, 3.3]]
-        attributes1= [2, 4]
+        attributes1 = [2, 4]
         attributes2 = [5, 76]
         geo_ref1= Geo_reference(55, 1.0, 2.0)
-        geo_ref2 = Geo_reference(zone = 55, xllcorner = 0.1,
-                                 yllcorner = 3.0, datum = 'wgs84',
-                                 projection = 'UTM', units = 'm')
+        geo_ref2 = Geo_reference(zone=55,
+                                 xllcorner=0.1,
+                                 yllcorner=3.0,
+                                 datum='wgs84',
+                                 projection='UTM',
+                                 units='m')
                                 
         G1 = Geospatial_data(points1, attributes1, geo_ref1)
         G2 = Geospatial_data(points2, attributes2, geo_ref2)
 
+        #Check that absolute values are as expected
+        P1 = G1.get_data_points(absolute=True)
+        assert allclose(P1, [[2.0, 4.1], [4.0, 7.3]])
+
+        P2 = G2.get_data_points(absolute=True)
+        assert allclose(P2, [[5.1, 9.1], [6.1, 6.3]])        
+        
         G = G1 + G2
         
         assert allclose(G.get_geo_reference().get_xllcorner(), 0.1)
         assert allclose(G.get_geo_reference().get_yllcorner(), 2.0)
-#        print 'G data points=', G.get_data_points()
-        assert allclose(G.get_data_points(), [[2.0, 4.1], [4.0, 7.3], [5.1, 9.1], [6.1, 6.3]])                             
-
+
+        P = G.get_data_points(absolute=True)
+        assert allclose(P, concatenate( (P1,P2) ))
+
+        P_relative = G.get_data_points(absolute=False)
+        assert allclose(P_relative, P - [0.1, 2.0])                      
+        assert allclose(P, [[2.0, 4.1], [4.0, 7.3],
+                            [5.1, 9.1], [6.1, 6.3]])