fly/terragear
1
0
Fork 0
Code Activity

update tg_nodes for usage with CGAL 4.5

Browse source
This commit is contained in:
Peter Sadrozinski 2015-01-24 15:08:11 -05:00
parent d8d6f1ace1
commit 28edfb0fb8
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Lib/terragear/tg_nodes.cxx
View file

@ -81,9 +81,11 @@ bool TGNodes::get_geod_edge( const SGBucket& b, std::vector<SGGeod>& north, std:
// Three dimensional queries is a bit overkill, but the code, although faster, is slightly more cumbersome // Three dimensional queries is a bit overkill, but the code, although faster, is slightly more cumbersome
// get function for the property map - needed for cgal trait extension // get function for the property map - needed for cgal trait extension
#if 0
My_point_property_map::reference get(My_point_property_map, My_point_property_map::key_type p) { My_point_property_map::reference get(My_point_property_map, My_point_property_map::key_type p) {
return boost::get<0>(p); return boost::get<0>(p);
} }
#endif
// Build the k-d tree // Build the k-d tree
void TGNodes::init_spacial_query( void ) void TGNodes::init_spacial_query( void )

5
src/Lib/terragear/tg_nodes.hxx
View file

@ -20,16 +20,19 @@ typedef Kernel::Point_2 Point;
typedef boost::tuple<Point, double> Point_and_Elevation; typedef boost::tuple<Point, double> Point_and_Elevation;
//definition of the property map //definition of the property map
#if 0
struct My_point_property_map{ struct My_point_property_map{
typedef Point value_type; typedef Point value_type;
typedef const value_type& reference; typedef const value_type& reference;
typedef const Point_and_Elevation& key_type; typedef const Point_and_Elevation& key_type;
typedef boost::readable_property_map_tag category; typedef boost::readable_property_map_tag category;
}; };
#endif
//typedef CGAL::Search_traits_2<Kernel> Traits; //typedef CGAL::Search_traits_2<Kernel> Traits;
typedef CGAL::Search_traits_2<Kernel> Traits_base; typedef CGAL::Search_traits_2<Kernel> Traits_base;
typedef CGAL::Search_traits_adapter<Point_and_Elevation, My_point_property_map, Traits_base> Traits; //typedef CGAL::Search_traits_adapter<Point_and_Elevation, My_point_property_map, Traits_base> Traits;
typedef CGAL::Search_traits_adapter<Point_and_Elevation,CGAL::Nth_of_tuple_property_map<0, Point_and_Elevation>,Traits_base> Traits;
typedef CGAL::Fuzzy_iso_box<Traits> Fuzzy_bb; typedef CGAL::Fuzzy_iso_box<Traits> Fuzzy_bb;
typedef CGAL::Kd_tree<Traits> Tree; typedef CGAL::Kd_tree<Traits> Tree;