Changeset 3723

Timestamp:

Oct 10, 2006, 12:10:07 PM (18 years ago)

Author:

ole

Message:

Fixed ticket:95

Location:

anuga_core/source/anuga/geospatial_data

Files:

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

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -376 +376 @@
 
         # sets xll and yll as the smallest from self and other
-        # FIXME (Duncan and Ole): use lower left corner derived from absolute coordinates
+        # FIXME (Duncan and Ole): use lower left corner derived from
+        # absolute coordinates
         if self.geo_reference.xllcorner <= other.geo_reference.xllcorner:
             xll = self.geo_reference.xllcorner
@@ -394 +395 @@
 
         
-        new_relative_points1 = new_geo_ref.change_points_geo_ref(relative_points1, geo_ref1)
-        new_relative_points2 = new_geo_ref.change_points_geo_ref(relative_points2, geo_ref2)
-        
-        #Now both point sets are relative to new_geo_ref and zones have been reconciled
+        new_relative_points1 = new_geo_ref.\
+                               change_points_geo_ref(relative_points1,
+                                                     geo_ref1)
+        new_relative_points2 = new_geo_ref.\
+                               change_points_geo_ref(relative_points2,
+                                                     geo_ref2)
+        
+        # Now both point sets are relative to new_geo_ref and
+        # zones have been reconciled
 
         # Concatenate points
@@ -404 +410 @@
                                   axis = 0)
       
-        # Concatenate attributes
-        new_attributes = {}
-        for x in self.attributes.keys():
-            if other.attributes.has_key(x):
-
-                attrib1 = self.attributes[x]
-                attrib2 = other.attributes[x]
-                new_attributes[x] = concatenate((attrib1, attrib2))
-
-            else:
+        # Concatenate attributes if any
+        if self.attributes is None:
+            if other.attributes is not None:
                 msg = 'Both geospatial_data objects must have the same \n'
                 msg += 'attributes to allow addition.'
-                raise msg
+                raise Exception, msg
+            
+            new_attributes = None
+        else:    
+            new_attributes = {}
+            for x in self.attributes.keys():
+                if other.attributes.has_key(x):
+
+                    attrib1 = self.attributes[x]
+                    attrib2 = other.attributes[x]
+                    new_attributes[x] = concatenate((attrib1, attrib2))
+
+                else:
+                    msg = 'Both geospatial_data objects must have the same \n'
+                    msg += 'attributes to allow addition.'
+                    raise Exception, msg
 
         # Instantiate new data object and return    

anuga_core/source/anuga/geospatial_data/test_geospatial_data.py

@@ -476 +476 @@
 
 
-    def no_test_clip1_inside_outside(self):
+    def test_clip1_inside_outside(self):
         """test_clip1_inside_outside(self):
         
@@ -487 +487 @@
         points = [[-1, 4], [0.2, 0.5], [1.0, 2.1], [0.4, 0.3], [3.0, 5.3],
                   [0, 0], [2.4, 3.3]]
+
         G = Geospatial_data(points)
 
@@ -492 +493 @@
         U = Geospatial_data([[0,0], [1,0], [1,1], [0,1]]) 
         G1 = G.clip(U)
+        assert allclose(G1.get_data_points(),[[0.2, 0.5], [0.4, 0.3], [0, 0]])
+        
         G2 = G.clip_outside(U)
-
-        assert allclose((G1+G2).get_data_points(),points)
+        assert allclose(G2.get_data_points(),[[-1, 4], [1.0, 2.1],
+                                              [3.0, 5.3], [2.4, 3.3]])
+
+        
+        # New ordering
+        new_points = [[0.2, 0.5], [0.4, 0.3], [0, 0]] +\
+                     [[-1, 4], [1.0, 2.1], [3.0, 5.3], [2.4, 3.3]]
+        
+        assert allclose((G1+G2).get_data_points(), new_points)
+        
 
     def test_create_from_xya_file(self):