From 31af14453a57cfbfe6d65bbedeff2a51ee70ce4a Mon Sep 17 00:00:00 2001 From: Barend Gehrels Date: Fri, 13 Jun 2014 20:26:33 +0200 Subject: [PATCH] [buffer] Move from extensions to algorithms/detail --- extensions/test/algorithms/Jamfile.v2 | 2 -- .../detail}/buffer/buffer_inserter.hpp | 8 ++++---- .../detail}/buffer/buffer_policies.hpp | 2 +- .../detail}/buffer/buffered_piece_collection.hpp | 10 +++++----- .../buffered_piece_collection_with_mapper.hpp | 2 +- .../detail}/buffer/buffered_ring.hpp | 2 +- .../detail}/buffer/get_piece_turns.hpp | 0 .../detail}/buffer/line_line_intersection.hpp | 0 .../detail}/buffer/multi_buffer_inserter.hpp | 2 +- .../detail}/buffer/remove_within_distance.hpp | 0 .../detail}/buffer/turn_in_piece_visitor.hpp | 0 .../strategies => strategies/agnostic}/buffer.hpp | 0 .../agnostic}/buffer_distance_asymmetric.hpp | 2 +- .../agnostic}/buffer_distance_symmetric.hpp | 2 +- .../agnostic}/buffer_end_flat.hpp | 2 +- .../agnostic}/buffer_end_round.hpp | 2 +- .../agnostic}/buffer_end_skip.hpp | 9 +-------- .../agnostic}/buffer_join_miter.hpp | 2 +- .../agnostic}/buffer_join_round.hpp | 2 +- .../agnostic}/buffer_join_round_by_divide.hpp | 2 +- .../agnostic}/buffer_side.hpp | 0 test/algorithms/Jamfile.v2 | 3 +++ .../test => test}/algorithms/buffer/Jamfile.v2 | 4 ++-- .../algorithms/buffer/aimes_linestring_buffer.cpp | 0 .../algorithms/buffer/linestring_buffer.cpp | 0 .../algorithms/buffer/multi_linestring_buffer.cpp | 2 +- .../algorithms/buffer/multi_point_buffer.cpp | 3 +-- .../algorithms/buffer/multi_polygon_buffer.cpp | 2 +- .../algorithms/buffer/point_buffer.cpp | 0 .../algorithms/buffer/polygon_buffer.cpp | 0 .../algorithms/buffer/test_buffer.hpp | 15 ++++++++++----- 31 files changed, 39 insertions(+), 41 deletions(-) rename include/boost/geometry/{extensions/algorithms => algorithms/detail}/buffer/buffer_inserter.hpp (98%) rename include/boost/geometry/{extensions/algorithms => algorithms/detail}/buffer/buffer_policies.hpp (98%) rename include/boost/geometry/{extensions/algorithms => algorithms/detail}/buffer/buffered_piece_collection.hpp (98%) rename include/boost/geometry/{extensions/algorithms => algorithms/detail}/buffer/buffered_piece_collection_with_mapper.hpp (99%) rename include/boost/geometry/{extensions/algorithms => algorithms/detail}/buffer/buffered_ring.hpp (98%) rename include/boost/geometry/{extensions/algorithms => algorithms/detail}/buffer/get_piece_turns.hpp (100%) rename include/boost/geometry/{extensions/algorithms => algorithms/detail}/buffer/line_line_intersection.hpp (100%) rename include/boost/geometry/{extensions/algorithms => algorithms/detail}/buffer/multi_buffer_inserter.hpp (98%) rename include/boost/geometry/{extensions/algorithms => algorithms/detail}/buffer/remove_within_distance.hpp (100%) rename include/boost/geometry/{extensions/algorithms => algorithms/detail}/buffer/turn_in_piece_visitor.hpp (100%) rename include/boost/geometry/{extensions/strategies => strategies/agnostic}/buffer.hpp (100%) rename include/boost/geometry/{extensions/strategies => strategies/agnostic}/buffer_distance_asymmetric.hpp (95%) rename include/boost/geometry/{extensions/strategies => strategies/agnostic}/buffer_distance_symmetric.hpp (95%) rename include/boost/geometry/{extensions/strategies => strategies/agnostic}/buffer_end_flat.hpp (97%) rename include/boost/geometry/{extensions/strategies => strategies/agnostic}/buffer_end_round.hpp (98%) rename include/boost/geometry/{extensions/strategies => strategies/agnostic}/buffer_end_skip.hpp (80%) rename include/boost/geometry/{extensions/strategies => strategies/agnostic}/buffer_join_miter.hpp (97%) rename include/boost/geometry/{extensions/strategies => strategies/agnostic}/buffer_join_round.hpp (98%) rename include/boost/geometry/{extensions/strategies => strategies/agnostic}/buffer_join_round_by_divide.hpp (98%) rename include/boost/geometry/{extensions/strategies => strategies/agnostic}/buffer_side.hpp (100%) rename {extensions/test => test}/algorithms/buffer/Jamfile.v2 (87%) rename {extensions/test => test}/algorithms/buffer/aimes_linestring_buffer.cpp (100%) rename {extensions/test => test}/algorithms/buffer/linestring_buffer.cpp (100%) rename {extensions/test => test}/algorithms/buffer/multi_linestring_buffer.cpp (97%) rename {extensions/test => test}/algorithms/buffer/multi_point_buffer.cpp (98%) rename {extensions/test => test}/algorithms/buffer/multi_polygon_buffer.cpp (99%) rename {extensions/test => test}/algorithms/buffer/point_buffer.cpp (100%) rename {extensions/test => test}/algorithms/buffer/polygon_buffer.cpp (100%) rename {extensions/test => test}/algorithms/buffer/test_buffer.hpp (93%) diff --git a/extensions/test/algorithms/Jamfile.v2 b/extensions/test/algorithms/Jamfile.v2 index 494a8f7be..991e45001 100644 --- a/extensions/test/algorithms/Jamfile.v2 +++ b/extensions/test/algorithms/Jamfile.v2 @@ -18,5 +18,3 @@ test-suite boost-geometry-extensions-algorithms [ run selected.cpp ] ; -build-project buffer - ; diff --git a/include/boost/geometry/extensions/algorithms/buffer/buffer_inserter.hpp b/include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp similarity index 98% rename from include/boost/geometry/extensions/algorithms/buffer/buffer_inserter.hpp rename to include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp index 3103c25d4..7b757b8a1 100644 --- a/include/boost/geometry/extensions/algorithms/buffer/buffer_inserter.hpp +++ b/include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp @@ -18,13 +18,13 @@ #include #include -#include -#include -#include +#include +#include +#include #ifdef BOOST_GEOMETRY_DEBUG_WITH_MAPPER -# include +# include #endif diff --git a/include/boost/geometry/extensions/algorithms/buffer/buffer_policies.hpp b/include/boost/geometry/algorithms/detail/buffer/buffer_policies.hpp similarity index 98% rename from include/boost/geometry/extensions/algorithms/buffer/buffer_policies.hpp rename to include/boost/geometry/algorithms/detail/buffer/buffer_policies.hpp index b0c5e7737..34ce05d38 100644 --- a/include/boost/geometry/extensions/algorithms/buffer/buffer_policies.hpp +++ b/include/boost/geometry/algorithms/detail/buffer/buffer_policies.hpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/include/boost/geometry/extensions/algorithms/buffer/buffered_piece_collection.hpp b/include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp similarity index 98% rename from include/boost/geometry/extensions/algorithms/buffer/buffered_piece_collection.hpp rename to include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp index 60e3fd05e..ff4a8bc03 100644 --- a/include/boost/geometry/extensions/algorithms/buffer/buffered_piece_collection.hpp +++ b/include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp @@ -21,12 +21,12 @@ #include #include -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/include/boost/geometry/extensions/algorithms/buffer/buffered_piece_collection_with_mapper.hpp b/include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection_with_mapper.hpp similarity index 99% rename from include/boost/geometry/extensions/algorithms/buffer/buffered_piece_collection_with_mapper.hpp rename to include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection_with_mapper.hpp index d8345ad28..1e70d669d 100644 --- a/include/boost/geometry/extensions/algorithms/buffer/buffered_piece_collection_with_mapper.hpp +++ b/include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection_with_mapper.hpp @@ -10,7 +10,7 @@ #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_BUFFERED_PIECE_COLLECTION_WM_HPP -#include +#include #include diff --git a/include/boost/geometry/extensions/algorithms/buffer/buffered_ring.hpp b/include/boost/geometry/algorithms/detail/buffer/buffered_ring.hpp similarity index 98% rename from include/boost/geometry/extensions/algorithms/buffer/buffered_ring.hpp rename to include/boost/geometry/algorithms/detail/buffer/buffered_ring.hpp index b67041a73..9efc08c46 100644 --- a/include/boost/geometry/extensions/algorithms/buffer/buffered_ring.hpp +++ b/include/boost/geometry/algorithms/detail/buffer/buffered_ring.hpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include diff --git a/include/boost/geometry/extensions/algorithms/buffer/get_piece_turns.hpp b/include/boost/geometry/algorithms/detail/buffer/get_piece_turns.hpp similarity index 100% rename from include/boost/geometry/extensions/algorithms/buffer/get_piece_turns.hpp rename to include/boost/geometry/algorithms/detail/buffer/get_piece_turns.hpp diff --git a/include/boost/geometry/extensions/algorithms/buffer/line_line_intersection.hpp b/include/boost/geometry/algorithms/detail/buffer/line_line_intersection.hpp similarity index 100% rename from include/boost/geometry/extensions/algorithms/buffer/line_line_intersection.hpp rename to include/boost/geometry/algorithms/detail/buffer/line_line_intersection.hpp diff --git a/include/boost/geometry/extensions/algorithms/buffer/multi_buffer_inserter.hpp b/include/boost/geometry/algorithms/detail/buffer/multi_buffer_inserter.hpp similarity index 98% rename from include/boost/geometry/extensions/algorithms/buffer/multi_buffer_inserter.hpp rename to include/boost/geometry/algorithms/detail/buffer/multi_buffer_inserter.hpp index 906ea8f33..87c80449d 100644 --- a/include/boost/geometry/extensions/algorithms/buffer/multi_buffer_inserter.hpp +++ b/include/boost/geometry/algorithms/detail/buffer/multi_buffer_inserter.hpp @@ -15,7 +15,7 @@ #include #include -#include +#include namespace boost { namespace geometry diff --git a/include/boost/geometry/extensions/algorithms/buffer/remove_within_distance.hpp b/include/boost/geometry/algorithms/detail/buffer/remove_within_distance.hpp similarity index 100% rename from include/boost/geometry/extensions/algorithms/buffer/remove_within_distance.hpp rename to include/boost/geometry/algorithms/detail/buffer/remove_within_distance.hpp diff --git a/include/boost/geometry/extensions/algorithms/buffer/turn_in_piece_visitor.hpp b/include/boost/geometry/algorithms/detail/buffer/turn_in_piece_visitor.hpp similarity index 100% rename from include/boost/geometry/extensions/algorithms/buffer/turn_in_piece_visitor.hpp rename to include/boost/geometry/algorithms/detail/buffer/turn_in_piece_visitor.hpp diff --git a/include/boost/geometry/extensions/strategies/buffer.hpp b/include/boost/geometry/strategies/agnostic/buffer.hpp similarity index 100% rename from include/boost/geometry/extensions/strategies/buffer.hpp rename to include/boost/geometry/strategies/agnostic/buffer.hpp diff --git a/include/boost/geometry/extensions/strategies/buffer_distance_asymmetric.hpp b/include/boost/geometry/strategies/agnostic/buffer_distance_asymmetric.hpp similarity index 95% rename from include/boost/geometry/extensions/strategies/buffer_distance_asymmetric.hpp rename to include/boost/geometry/strategies/agnostic/buffer_distance_asymmetric.hpp index b0567c4d8..5714beaf0 100644 --- a/include/boost/geometry/extensions/strategies/buffer_distance_asymmetric.hpp +++ b/include/boost/geometry/strategies/agnostic/buffer_distance_asymmetric.hpp @@ -12,7 +12,7 @@ // Buffer strategies -#include +#include namespace boost { namespace geometry diff --git a/include/boost/geometry/extensions/strategies/buffer_distance_symmetric.hpp b/include/boost/geometry/strategies/agnostic/buffer_distance_symmetric.hpp similarity index 95% rename from include/boost/geometry/extensions/strategies/buffer_distance_symmetric.hpp rename to include/boost/geometry/strategies/agnostic/buffer_distance_symmetric.hpp index 5c218f315..a13cefe1c 100644 --- a/include/boost/geometry/extensions/strategies/buffer_distance_symmetric.hpp +++ b/include/boost/geometry/strategies/agnostic/buffer_distance_symmetric.hpp @@ -12,7 +12,7 @@ // Buffer strategies -#include +#include namespace boost { namespace geometry diff --git a/include/boost/geometry/extensions/strategies/buffer_end_flat.hpp b/include/boost/geometry/strategies/agnostic/buffer_end_flat.hpp similarity index 97% rename from include/boost/geometry/extensions/strategies/buffer_end_flat.hpp rename to include/boost/geometry/strategies/agnostic/buffer_end_flat.hpp index 7e2cf0026..23deddce5 100644 --- a/include/boost/geometry/extensions/strategies/buffer_end_flat.hpp +++ b/include/boost/geometry/strategies/agnostic/buffer_end_flat.hpp @@ -18,7 +18,7 @@ #include #include -#include +#include diff --git a/include/boost/geometry/extensions/strategies/buffer_end_round.hpp b/include/boost/geometry/strategies/agnostic/buffer_end_round.hpp similarity index 98% rename from include/boost/geometry/extensions/strategies/buffer_end_round.hpp rename to include/boost/geometry/strategies/agnostic/buffer_end_round.hpp index b8d2fb4b1..c90747aa6 100644 --- a/include/boost/geometry/extensions/strategies/buffer_end_round.hpp +++ b/include/boost/geometry/strategies/agnostic/buffer_end_round.hpp @@ -18,7 +18,7 @@ #include #include -#include +#include diff --git a/include/boost/geometry/extensions/strategies/buffer_end_skip.hpp b/include/boost/geometry/strategies/agnostic/buffer_end_skip.hpp similarity index 80% rename from include/boost/geometry/extensions/strategies/buffer_end_skip.hpp rename to include/boost/geometry/strategies/agnostic/buffer_end_skip.hpp index c8f278baa..f623de3be 100644 --- a/include/boost/geometry/extensions/strategies/buffer_end_skip.hpp +++ b/include/boost/geometry/strategies/agnostic/buffer_end_skip.hpp @@ -12,14 +12,7 @@ // Buffer strategies -#include -#include -#include -#include -#include - -#include - +#include namespace boost { namespace geometry diff --git a/include/boost/geometry/extensions/strategies/buffer_join_miter.hpp b/include/boost/geometry/strategies/agnostic/buffer_join_miter.hpp similarity index 97% rename from include/boost/geometry/extensions/strategies/buffer_join_miter.hpp rename to include/boost/geometry/strategies/agnostic/buffer_join_miter.hpp index c2c67d001..9d811384b 100644 --- a/include/boost/geometry/extensions/strategies/buffer_join_miter.hpp +++ b/include/boost/geometry/strategies/agnostic/buffer_join_miter.hpp @@ -18,7 +18,7 @@ #include #include -#include +#include namespace boost { namespace geometry diff --git a/include/boost/geometry/extensions/strategies/buffer_join_round.hpp b/include/boost/geometry/strategies/agnostic/buffer_join_round.hpp similarity index 98% rename from include/boost/geometry/extensions/strategies/buffer_join_round.hpp rename to include/boost/geometry/strategies/agnostic/buffer_join_round.hpp index 3be70b406..af86f1dee 100644 --- a/include/boost/geometry/extensions/strategies/buffer_join_round.hpp +++ b/include/boost/geometry/strategies/agnostic/buffer_join_round.hpp @@ -18,7 +18,7 @@ #include #include -#include +#include diff --git a/include/boost/geometry/extensions/strategies/buffer_join_round_by_divide.hpp b/include/boost/geometry/strategies/agnostic/buffer_join_round_by_divide.hpp similarity index 98% rename from include/boost/geometry/extensions/strategies/buffer_join_round_by_divide.hpp rename to include/boost/geometry/strategies/agnostic/buffer_join_round_by_divide.hpp index d3aaccfc5..fe21501c8 100644 --- a/include/boost/geometry/extensions/strategies/buffer_join_round_by_divide.hpp +++ b/include/boost/geometry/strategies/agnostic/buffer_join_round_by_divide.hpp @@ -18,7 +18,7 @@ #include #include -#include +#include diff --git a/include/boost/geometry/extensions/strategies/buffer_side.hpp b/include/boost/geometry/strategies/agnostic/buffer_side.hpp similarity index 100% rename from include/boost/geometry/extensions/strategies/buffer_side.hpp rename to include/boost/geometry/strategies/agnostic/buffer_side.hpp diff --git a/test/algorithms/Jamfile.v2 b/test/algorithms/Jamfile.v2 index f1b4d6ae3..6deb92e61 100644 --- a/test/algorithms/Jamfile.v2 +++ b/test/algorithms/Jamfile.v2 @@ -75,6 +75,9 @@ test-suite boost-geometry-algorithms build-project overlay ; + +build-project buffer + ; build-project detail ; diff --git a/extensions/test/algorithms/buffer/Jamfile.v2 b/test/algorithms/buffer/Jamfile.v2 similarity index 87% rename from extensions/test/algorithms/buffer/Jamfile.v2 rename to test/algorithms/buffer/Jamfile.v2 index d469cbca7..8b3b129ba 100644 --- a/extensions/test/algorithms/buffer/Jamfile.v2 +++ b/test/algorithms/buffer/Jamfile.v2 @@ -6,13 +6,13 @@ # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) -project bgeab +project boost-geometry-algorithms-buffer : requirements . ; -test-suite boost-geometry-extensions-algorithms-buffer +test-suite boost-geometry-algorithms-buffer : [ run point_buffer.cpp ] [ run linestring_buffer.cpp ] diff --git a/extensions/test/algorithms/buffer/aimes_linestring_buffer.cpp b/test/algorithms/buffer/aimes_linestring_buffer.cpp similarity index 100% rename from extensions/test/algorithms/buffer/aimes_linestring_buffer.cpp rename to test/algorithms/buffer/aimes_linestring_buffer.cpp diff --git a/extensions/test/algorithms/buffer/linestring_buffer.cpp b/test/algorithms/buffer/linestring_buffer.cpp similarity index 100% rename from extensions/test/algorithms/buffer/linestring_buffer.cpp rename to test/algorithms/buffer/linestring_buffer.cpp diff --git a/extensions/test/algorithms/buffer/multi_linestring_buffer.cpp b/test/algorithms/buffer/multi_linestring_buffer.cpp similarity index 97% rename from extensions/test/algorithms/buffer/multi_linestring_buffer.cpp rename to test/algorithms/buffer/multi_linestring_buffer.cpp index 3822e26aa..2e824613c 100644 --- a/extensions/test/algorithms/buffer/multi_linestring_buffer.cpp +++ b/test/algorithms/buffer/multi_linestring_buffer.cpp @@ -17,7 +17,7 @@ #include // TODO: more specific #include -#include +#include static std::string const simplex = "MULTILINESTRING((0 0,4 5),(5 4,10 0))"; diff --git a/extensions/test/algorithms/buffer/multi_point_buffer.cpp b/test/algorithms/buffer/multi_point_buffer.cpp similarity index 98% rename from extensions/test/algorithms/buffer/multi_point_buffer.cpp rename to test/algorithms/buffer/multi_point_buffer.cpp index 5873550a6..72b8f82c0 100644 --- a/extensions/test/algorithms/buffer/multi_point_buffer.cpp +++ b/test/algorithms/buffer/multi_point_buffer.cpp @@ -23,9 +23,8 @@ #include -#include // TODO: more specific #include -#include +#include static std::string const simplex = "MULTIPOINT((5 5),(7 7))"; diff --git a/extensions/test/algorithms/buffer/multi_polygon_buffer.cpp b/test/algorithms/buffer/multi_polygon_buffer.cpp similarity index 99% rename from extensions/test/algorithms/buffer/multi_polygon_buffer.cpp rename to test/algorithms/buffer/multi_polygon_buffer.cpp index f75347396..292eb7125 100644 --- a/extensions/test/algorithms/buffer/multi_polygon_buffer.cpp +++ b/test/algorithms/buffer/multi_polygon_buffer.cpp @@ -19,7 +19,7 @@ #include // TODO: more specific #include -#include +#include diff --git a/extensions/test/algorithms/buffer/point_buffer.cpp b/test/algorithms/buffer/point_buffer.cpp similarity index 100% rename from extensions/test/algorithms/buffer/point_buffer.cpp rename to test/algorithms/buffer/point_buffer.cpp diff --git a/extensions/test/algorithms/buffer/polygon_buffer.cpp b/test/algorithms/buffer/polygon_buffer.cpp similarity index 100% rename from extensions/test/algorithms/buffer/polygon_buffer.cpp rename to test/algorithms/buffer/polygon_buffer.cpp diff --git a/extensions/test/algorithms/buffer/test_buffer.hpp b/test/algorithms/buffer/test_buffer.hpp similarity index 93% rename from extensions/test/algorithms/buffer/test_buffer.hpp rename to test/algorithms/buffer/test_buffer.hpp index e18b848a1..d8e174f4c 100644 --- a/extensions/test/algorithms/buffer/test_buffer.hpp +++ b/test/algorithms/buffer/test_buffer.hpp @@ -34,12 +34,17 @@ #include #include -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include