Changeset 2465

Timestamp:

Mar 2, 2006, 3:36:17 PM (19 years ago)

Author:

nick

Message:

Continued development of "add" function for geospatial_data
still requires some tests

Location:

inundation/geospatial_data

Files:

• geospatial_data.py (modified) (7 diffs)
• test_geospatial_data.py (modified) (6 diffs)

inundation/geospatial_data/geospatial_data.py

@@ -1 @@
-"""Class Geospatial_data - Manipulation of locations on the planet and associated attributes.
-
+"""Class Geospatial_data - Manipulation of locations on the planet and 
+associated attributes.
 
 """
@@ -6 +6 @@
 
 from utilities.numerical_tools import ensure_numeric
+
+from Numeric import concatenate
         
 class Geospatial_data:
@@ -83 +85 @@
             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 \
+                    object or None.'
             raise msg
 
@@ -94 +97 @@
         return self.geo_reference
         
-    def get_data_points(self):
-        return self.data_points
+    def get_data_points(self, absolute = True):
+        if absolute is True:
+            xll = self.geo_reference.xllcorner
+            yll = self.geo_reference.yllcorner
+            return self.data_points + [xll, yll]
+            
+        else: 
+            return self.data_points
 
     def get_attributes(self, attribute_name = None):
@@ -107 +116 @@
                 attribute_name = self.default_attribute_name
             else:
-                attribute_name = self.attributes.keys()[0] #Take the first one from keys
+                attribute_name = self.attributes.keys()[0] 
+                # above line takes the first one from keys
                 
 
@@ -114 +124 @@
 
         return self.attributes[attribute_name]
+
+    def __add__(self,other):
+        """ 
+        returns the addition of 2 geospatical objects,
+        objects are concatencated to the end of each other
+            
+        NOTE: doesn't add if objects contain different 
+        attributes test (yet) if attributes of different kinds
+        are added to each other, this could be a problem 
+        """
+
+        a_points = self.get_data_points()
+        b_points = other.get_data_points()
+        
+        a_attribute_keys = self.attributes.keys()
+        b_attribute_keys = other.attributes.keys()
+        
+        geo_ref1 = self.get_geo_reference()
+        zone1 = geo_ref1.get_zone()
+        
+        geo_ref2 = other.get_geo_reference()
+        zone2 = geo_ref2.get_zone()
+        
+        if zone1 == zone2:  # and some more checks to add
+           
+            c_points = concatenate((a_points, b_points), 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))
+
+                else:
+                    msg = 'Both geospatial_data objects must have the same \
+                    attributes to allow addition.'
+                    raise msg
+ 
+            return Geospatial_data(c_points, new_dictionary)
+            
+        else:
+            msg = 'Both geospatial_data objects must be in the same \
+            ZONE to allow addition.'
+            raise msg
+
+
+#        else:
+#            print 'zones are not the same'
+            
+        
+
+   
+     
         
 
@@ -159 +223 @@
                            geo_reference = geo)
 
-    
-
-            
-            
-        
+
+            
+            
+        

inundation/geospatial_data/test_geospatial_data.py

@@ -3 +3 @@
 
 import unittest
-from Numeric import zeros, array, allclose
+from Numeric import zeros, array, allclose, concatenate
 from math import sqrt, pi
 
-
 from geospatial_data import *
+
+from coordinate_transforms.geo_reference import Geo_reference
 
 class Test_Geospatial_data(unittest.TestCase):
@@ -64 +65 @@
 
 
-        P = G.get_data_points()
+        P = G.get_data_points(absolute = False)
         assert allclose(P, [[1.0, 2.1], [3.0, 5.3]])        
-        
+
+        P = G.get_data_points(absolute = True)
+        assert allclose(P, [[101.0, 202.1], [103.0, 205.3]])        
+
         V = G.get_attributes() #Simply get them
         assert allclose(V, [2, 4])
@@ -72 +76 @@
         V = G.get_attributes('attribute') #Get by name
         assert allclose(V, [2, 4])
-
 
     def test_get_attributes_2(self):
@@ -86 +89 @@
 
 
-        P = G.get_data_points()
+        P = G.get_data_points(absolute = False)
         assert allclose(P, [[1.0, 2.1], [3.0, 5.3]])        
         
@@ -160 +163 @@
         G = points_dictionary2geospatial_data(points_dict)
 
-        P = G.get_data_points()
+        P = G.get_data_points(absolute = False)
         assert allclose(P, [[1.0, 2.1], [3.0, 5.3]])        
         
@@ -175 +178 @@
         assert allclose(V, [79.4, -7])
 
-    def xtest_add(self):
-        points = [[1.0, 2.1], [3.0, 5.3]]
-        attributes = [2, 4]
+    def test_add(self):
+        """ test the addition of two geospatical objects
+            no geo_reference see next test
+        """
+        points = [[1.0, 2.1], [3.0, 5.3]]
+        attributes = {'depth':[2, 4], 'elevation':[6.1, 5]}
+        attributes1 = {'depth':[2, 4], 'elevation':[2.5, 1]}
         G1 = Geospatial_data(points, attributes)        
-        G2 = Geospatial_data(points, attributes)        
+        G2 = Geospatial_data(points, attributes1) 
+        
+#        print 'G1 depth=', G1.get_attributes('depth')
+#        print 'G1 attrib keys=', G1.attributes.keys() 
+        g3 = geospatial_data2points_dictionary(G1)
+#        print 'g3=', g3
+        
         G = G1 + G2
-        
-        assert G.attributes.keys()[0] == 'attribute'
-        assert allclose(G.attributes.values()[0], [2, 4, 2, 4])
+
+#        g = geospatial_data2points_dictionary(G)
+#        print 'G=', g
+#        print 'G points =', G.get_data_points()
+#        print 'G attrib keys =', G.attributes.keys()
+#        print 'G test =', G.get_attributes('elevation')
+        assert G.attributes.has_key('depth')
+        assert G.attributes.has_key('elevation')
+        assert allclose(G.attributes['depth'], [2, 4, 2, 4])
+        assert allclose(G.attributes['elevation'], [6.1, 5, 2.5, 1])
         assert allclose(G.get_data_points(), [[1.0, 2.1], [3.0, 5.3],
                                               [1.0, 2.1], [3.0, 5.3]])
         
-
-
+    def xtest_add1 (self):
+        """
+        difference in Geo_reference resolved
+        """
+        points = [[1.0, 2.1], [3.0, 5.3]]
+        points1 = [[5.0, 6.1], [6.0, 3.3]]
+        attributes = [2, 4]
+        attributes1 = [5, 76]
+        geo_ref = Geo_reference(55, 1.0, 2.0)
+        geo_ref1 = Geo_reference(zone = 55, xllcorner = 0.1,
+                                yllcorner = 3.0, datum = 'wgs84',
+                                projection = 'UTM', units = 'm')
+                                
+        G1 = Geospatial_data(points, attributes, geo_ref)
+        G2 = Geospatial_data(points1, attributes1, geo_ref1)
+
+        G = G1 + G2
+        
+        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]])                             
+