From 17d027ec2d7ebb2a775c6b807feae96552c58880 Mon Sep 17 00:00:00 2001 From: Barend Gehrels Date: Mon, 9 Jun 2014 11:51:01 +0200 Subject: [PATCH] [buffer] remove now unused functionality --- .../algorithms/detail/occupation_info.hpp | 7 ---- .../algorithms/buffer/buffer_policies.hpp | 2 -- .../buffer/buffered_piece_collection.hpp | 35 ------------------- 3 files changed, 44 deletions(-) diff --git a/include/boost/geometry/algorithms/detail/occupation_info.hpp b/include/boost/geometry/algorithms/detail/occupation_info.hpp index c37e68f36..440a34fb0 100644 --- a/include/boost/geometry/algorithms/detail/occupation_info.hpp +++ b/include/boost/geometry/algorithms/detail/occupation_info.hpp @@ -90,15 +90,10 @@ public : std::vector > turns; int m_count; -private : - bool m_occupied; - bool m_calculated; public : inline occupation_info() : m_count(0) - , m_occupied(false) - , m_calculated(false) {} template @@ -136,8 +131,6 @@ public : } detail::left_turns::turn_angle_info turn(seg_id, incoming_point, outgoing_point); turns.push_back(turn); - - m_calculated = false; } template diff --git a/include/boost/geometry/extensions/algorithms/buffer/buffer_policies.hpp b/include/boost/geometry/extensions/algorithms/buffer/buffer_policies.hpp index fe1823887..f6f65c7db 100644 --- a/include/boost/geometry/extensions/algorithms/buffer/buffer_policies.hpp +++ b/include/boost/geometry/extensions/algorithms/buffer/buffer_policies.hpp @@ -142,8 +142,6 @@ struct buffer_turn_info int count_on_uu; #endif - std::set piece_indices_to_skip; - #ifdef BOOST_GEOMETRY_DEBUG_WITH_MAPPER std::string debug_string; #endif diff --git a/include/boost/geometry/extensions/algorithms/buffer/buffered_piece_collection.hpp b/include/boost/geometry/extensions/algorithms/buffer/buffered_piece_collection.hpp index 90995ed01..789882de8 100644 --- a/include/boost/geometry/extensions/algorithms/buffer/buffered_piece_collection.hpp +++ b/include/boost/geometry/extensions/algorithms/buffer/buffered_piece_collection.hpp @@ -318,15 +318,6 @@ struct buffered_piece_collection return; } - // Don't check against a piece of which is was preferred in the "situations" for multi - map - if (turn.piece_indices_to_skip.count(pc.index) > 0) - { - return; - } - - segment_identifier seg_id = pc.first_seg_id; - BOOST_ASSERT(seg_id.segment_index >= 0); - int const geometry_code = detail::within::point_in_geometry(turn.robust_point, pc.robust_ring); if (geometry_code == 1) @@ -387,32 +378,6 @@ struct buffered_piece_collection } } - - struct cluster_info - { - inline cluster_info(int i, point_type p, buffer_turn_operation_type op) - : turn_index(i) - , point(p) - , operation(op) - {} - - inline cluster_info() - : turn_index(-1) - {} - - int turn_index; - point_type point; - buffer_turn_operation_type operation; - }; - - struct clustered_info - { - int piece_index; - std::set intersecting_ids; - std::vector intersecting_segments; - }; - - inline void get_occupation() { // 1: Add all intersection points to occupation map