From 28edfb0fb86f7a3ea407c6e2b7a66882028c42ca Mon Sep 17 00:00:00 2001 From: Peter Sadrozinski Date: Sat, 24 Jan 2015 15:08:11 -0500 Subject: [PATCH] update tg_nodes for usage with CGAL 4.5 --- src/Lib/terragear/tg_nodes.cxx | 2 ++ src/Lib/terragear/tg_nodes.hxx | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Lib/terragear/tg_nodes.cxx b/src/Lib/terragear/tg_nodes.cxx index 98a4a7cf..7a5a384e 100644 --- a/src/Lib/terragear/tg_nodes.cxx +++ b/src/Lib/terragear/tg_nodes.cxx @@ -81,9 +81,11 @@ bool TGNodes::get_geod_edge( const SGBucket& b, std::vector& north, std: // 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 +#if 0 My_point_property_map::reference get(My_point_property_map, My_point_property_map::key_type p) { return boost::get<0>(p); } +#endif // Build the k-d tree void TGNodes::init_spacial_query( void ) diff --git a/src/Lib/terragear/tg_nodes.hxx b/src/Lib/terragear/tg_nodes.hxx index 91e8c34b..0eb7e978 100644 --- a/src/Lib/terragear/tg_nodes.hxx +++ b/src/Lib/terragear/tg_nodes.hxx @@ -20,16 +20,19 @@ typedef Kernel::Point_2 Point; typedef boost::tuple Point_and_Elevation; //definition of the property map +#if 0 struct My_point_property_map{ typedef Point value_type; typedef const value_type& reference; typedef const Point_and_Elevation& key_type; typedef boost::readable_property_map_tag category; }; +#endif //typedef CGAL::Search_traits_2 Traits; typedef CGAL::Search_traits_2 Traits_base; -typedef CGAL::Search_traits_adapter Traits; +//typedef CGAL::Search_traits_adapter Traits; +typedef CGAL::Search_traits_adapter,Traits_base> Traits; typedef CGAL::Fuzzy_iso_box Fuzzy_bb; typedef CGAL::Kd_tree Tree;