Changeset 3351


Ignore:
Timestamp:
Jul 18, 2006, 1:51:19 PM (18 years ago)
Author:
duncan
Message:

bug fix in ensure_geospatial

Location:
inundation
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • inundation/geospatial_data/geospatial_data.py

    r3320 r3351  
    792792        msg = "Use a Geospatial_data object or a mesh origin. Not both."
    793793        assert geo_reference == None, msg
    794            
     794        return points   
    795795    else:
    796796        points = ensure_numeric(points, Float)
     
    804804                                geo_reference[1],
    805805                                geo_reference[2])
    806         points = Geospatial_data(data_points=points, geo_reference=geo)       
     806    points = Geospatial_data(data_points=points, geo_reference=geo)       
    807807    return points
    808808             
  • inundation/geospatial_data/test_geospatial_data.py

    r3302 r3351  
    10731073                         [2.0, 0.0],[2.0, 2.0],
    10741074                         [1.0, 3.0],[2.0, 2.0]]
    1075         new_points = ensure_absolute(points)
    1076        
    1077         assert allclose(new_points, points)
     1075        new_points = ensure_geospatial(points)
     1076       
     1077        assert allclose(new_points.get_data_points(absolute = True), points)
    10781078
    10791079        points = array([[2.0, 0.0],[1.0, 1.0],
    10801080                         [2.0, 0.0],[2.0, 2.0],
    10811081                         [1.0, 3.0],[2.0, 2.0]])
    1082         new_points = ensure_absolute(points)
    1083        
    1084         assert allclose(new_points, points)
     1082        new_points = ensure_geospatial(points)
     1083       
     1084        assert allclose(new_points.get_data_points(absolute = True), points)
    10851085       
    10861086        ab_points = array([[2.0, 0.0],[1.0, 1.0],
     
    13451345if __name__ == "__main__":
    13461346
    1347     #suite = unittest.makeSuite(Test_Geospatial_data, 'test_lat_long')
     1347    #suite = unittest.makeSuite(Test_Geospatial_data, 'test_ensure_geospatial')
    13481348    suite = unittest.makeSuite(Test_Geospatial_data, 'test')
    13491349    runner = unittest.TextTestRunner()
  • inundation/pmesh/mesh.py

    r3193 r3351  
    637637        """
    638638        point_data = ensure_geospatial(point_data)
    639 
     639        #print "point_data",point_data
    640640        # get points relative to the mesh geo_ref
    641641        points = point_data.get_data_points(geo_reference=self.geo_reference)
    642         #FIXME finish....
    643642   
    644643        for point in points:
  • inundation/pmesh/test_mesh.py

    r3304 r3351  
    21422142                        'FAILED!')
    21432143
    2144        
     2144   
     2145    def test_add_vertices_more(self):
     2146        points = [[0.1,1],[0.4,.2],[7,5],[10,5]]
     2147        #spat = Geospatial_data(points)
     2148       
     2149        m = Mesh()
     2150        m.add_vertices(points)
     2151
     2152        vert = m.getUserVertices()
     2153        #print "vert",vert
     2154        self.failUnless(4==len(vert),
     2155                        'FAILED!')
     2156        vert= m.get_user_vertices(absolute=True)
     2157        self.failUnless(vert==points,
     2158                        'FAILED!')
     2159   
    21452160    def test_add_verticesII(self):
    21462161        points_lat_long = [[-33,152],[-35,152],[-35,150],[-33,150]]
     
    22142229#-------------------------------------------------------------
    22152230if __name__ == "__main__":
    2216     #suite = unittest.makeSuite(meshTestCase,'test')
    2217     suite = unittest.makeSuite(meshTestCase,'test_add_verticesII')
     2231    suite = unittest.makeSuite(meshTestCase,'test')
     2232    #suite = unittest.makeSuite(meshTestCase,'test_add_vertices_more')
    22182233    runner = unittest.TextTestRunner() #verbosity=2)
    22192234    runner.run(suite)
Note: See TracChangeset for help on using the changeset viewer.