Changeset 2306 for inundation/geospatial_data

Timestamp:

Jan 31, 2006, 3:34:13 PM (19 years ago)

Author:

ole

Message:

Maps to and from geospatial_data object to points_dictionary and unit tests

Location:

inundation/geospatial_data

Files:

• geospatial_data.py (modified) (1 diff)
• test_geospatial_data.py (modified) (1 diff)

inundation/geospatial_data/geospatial_data.py

@@ -109 +109 @@
 
 
-def geospatial_data2points_dictionary2(geospatial_data):
+def geospatial_data2points_dictionary(geospatial_data):
     """Convert geospatial data to points_dictionary
     """
-    pass
+
+    points_dictionary = {}
+    points_dictionary['pointlist'] = geospatial_data.data_points
+
+    points_dictionary['attributelist'] = {}
+
+    for attribute_name in geospatial_data.attributes.keys():
+        val = geospatial_data.attributes[attribute_name]
+        points_dictionary['attributelist'][attribute_name] = val
+
+    points_dictionary['geo_reference'] = geospatial_data.geo_reference
+
+    return points_dictionary
+
+    
+    
+
+
+
 
 def points_dictionary2geospatial_data(points_dictionary):
     """Convert points_dictionary to geospatial data object
     """
-    pass
 
+    msg = 'Points dictionary must have key pointlist' 
+    assert points_dictionary.has_key('pointlist'), msg
+
+    msg = 'Points dictionary must have key attributelist'     
+    assert points_dictionary.has_key('attributelist'), msg        
+
+    if points_dictionary.has_key('geo_reference'):
+        geo = points_dictionary['geo_reference']
+    else:
+        geo = None
+    
+    return Geospatial_data(points_dictionary['pointlist'],
+                           points_dictionary['attributelist'],
+                           geo_reference = geo)
+
+    
 
             

inundation/geospatial_data/test_geospatial_data.py

@@ -108 +108 @@
             raise 'Should have raised exception' 
 
+
+    def test_conversions_to_points_dict(self):
+        """test conversions to points_dict
+        """
+        
+        from coordinate_transforms.geo_reference import Geo_reference
+        points = [[1.0, 2.1], [3.0, 5.3]]
+        attributes = {'a0': [0, 0], 'a1': [2, 4], 'a2': [79.4, -7]}
+        G = Geospatial_data(points, attributes,
+                            geo_reference = Geo_reference(56, 100, 200),
+                            default_attribute_name = 'a1')
+
+
+        points_dict = geospatial_data2points_dictionary(G)
+
+        assert points_dict.has_key('pointlist')
+        assert points_dict.has_key('attributelist')        
+        assert points_dict.has_key('geo_reference')
+
+        assert allclose( points_dict['pointlist'], points )
+
+        A = points_dict['attributelist']
+        assert A.has_key('a0')
+        assert A.has_key('a1')
+        assert A.has_key('a2')        
+
+        assert allclose( A['a0'], [0, 0] )
+        assert allclose( A['a1'], [2, 4] )        
+        assert allclose( A['a2'], [79.4, -7] )
+
+
+        geo = points_dict['geo_reference']
+        assert geo is G.geo_reference
+
+
+    def test_conversions_from_points_dict(self):
+        """test conversions from points_dict
+        """
+
+        from coordinate_transforms.geo_reference import Geo_reference
+        
+        points = [[1.0, 2.1], [3.0, 5.3]]
+        attributes = {'a0': [0, 0], 'a1': [2, 4], 'a2': [79.4, -7]}
+
+        points_dict = {}
+        points_dict['pointlist'] = points
+        points_dict['attributelist'] = attributes
+        points_dict['geo_reference'] = Geo_reference(56, 100, 200)
         
 
+        G = points_dictionary2geospatial_data(points_dict)
+
+        P = G.get_data_points()
+        assert allclose(P, [[1.0, 2.1], [3.0, 5.3]])        
+        
+        #V = G.get_attribute_values() #Get default attribute
+        #assert allclose(V, [2, 4])
+
+        V = G.get_attribute_values('a0') #Get by name
+        assert allclose(V, [0, 0])
+
+        V = G.get_attribute_values('a1') #Get by name
+        assert allclose(V, [2, 4])
+
+        V = G.get_attribute_values('a2') #Get by name
+        assert allclose(V, [79.4, -7])
+
+
+        
+
+
+        
 
 if __name__ == "__main__":