Changeset 2489

Timestamp:

Mar 7, 2006, 11:33:08 AM (19 years ago)

Author:

nick

Message:

Geospatial_data addition finished

Location:

inundation/geospatial_data

Files:

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

inundation/geospatial_data/geospatial_data.py

@@ -8 +8 @@
 
 from Numeric import concatenate
+
+from coordinate_transforms.geo_reference import Geo_reference
         
 class Geospatial_data:
@@ -85 +87 @@
             self.geo_reference = geo_reference
         else:
-            msg = 'Argument geo_reference must be a valid Geo_reference \
-                    object or None.'
+            msg = 'Argument geo_reference must be a valid Geo_reference \n'
+            msg += 'object or None.'
             raise msg
 
@@ -134 +136 @@
         """
 
-        a_points = self.get_data_points()
-        b_points = other.get_data_points()
-        
-        a_attribute_keys = self.attributes.keys()
-        b_attribute_keys = other.attributes.keys()
-        
+        # sets xll and yll as the smallest from self and other
+        if self.geo_reference.xllcorner <= other.geo_reference.xllcorner:
+            xll = self.geo_reference.xllcorner
+        else:
+            xll = other.geo_reference.xllcorner
+
+        if self.geo_reference.yllcorner <= other.geo_reference.yllcorner:
+            yll = self.geo_reference.yllcorner
+        else:
+            yll = other.geo_reference.yllcorner
+
+        # find objects zone and checks if the same
         geo_ref1 = self.get_geo_reference()
         zone1 = geo_ref1.get_zone()
@@ -146 +154 @@
         zone2 = geo_ref2.get_zone()
         
-        if zone1 == zone2:  # and some more checks to add
-           
-            c_points = concatenate((a_points, b_points), axis = 0)
+        geo_ref = Geo_reference(zone1, xll, yll)
+        
+        if zone1 == zone2:  
+            a_rel_points = self.get_data_points()
+            b_rel_points = other.get_data_points()
+            
+            # subtracts xll and yll from self's and other's
+            # reletive data point and concatenates
+            c_points = concatenate((a_rel_points-[xll, yll],
+                                    b_rel_points-[xll, yll]), axis = 0)
+
             new_dictionary = {}
             for x in self.attributes.keys():
                 if other.attributes.has_key(x):
 
-                    attrib_a = self.attributes[x]
-                    attrib_b = other.attributes[x]
-                    new_dictionary[x] = concatenate((attrib_a, attrib_b))
+                    a_attrib = self.attributes[x]
+                    b_attrib = other.attributes[x]
+                    new_dictionary[x] = concatenate((a_attrib, b_attrib))
 
                 else:
                     msg = 'Both geospatial_data objects must have the same \n'
-#                    msg += 'attributes to allow addition.'
+                    msg += 'attributes to allow addition.'
                     raise msg
  
-            return Geospatial_data(c_points, new_dictionary)
+            return Geospatial_data(c_points, new_dictionary, geo_ref)
             
         else:
@@ -168 +184 @@
             ZONE to allow addition.'
             raise msg
-
-
-#        else:
-#            print 'zones are not the same'
-            
-        
-
-   
-     
-        
+      
 
 

inundation/geospatial_data/test_geospatial_data.py

@@ -208 +208 @@
                                               [1.0, 2.1], [3.0, 5.3]])
         
-    def xtest_add1 (self):
+    def test_add1 (self):
         """
         difference in Geo_reference resolved
@@ -228 +228 @@
         assert allclose(G.get_geo_reference().get_xllcorner(), 0.1)
         assert allclose(G.get_geo_reference().get_yllcorner(), 2.0)
-        assert allclose(G.get_data_points(), [[2.0, 4.1], [4.0, 7.3], [5.1, 9.3], [6.1, 6.3]])                             
+#        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]])                             
 
     def xtest_create_from_file(self):