From c1b1b4a6c725d98a3eed33f6b5be99a026ab786f Mon Sep 17 00:00:00 2001 From: Barend Gehrels Date: Sat, 12 Mar 2011 23:53:18 +0000 Subject: [PATCH] Moved wkt (used in nearly all tests) from extension to domains tree for release [SVN r69906] --- doc/acknowledgments.qbk | 26 ++++++ .../doxygen_input/sourcecode/doxygen_1.cpp | 2 +- .../doxygen_input/sourcecode/doxygen_4.cpp | 2 +- doc/geometry.qbk | 52 ++--------- doc/imports.qbk | 53 +++++++++++ .../implementation_status.hpp | 2 +- doc/src/examples/algorithms/area.cpp | 2 +- .../algorithms/area_with_strategy.cpp | 2 +- doc/src/examples/algorithms/difference.cpp | 2 +- .../algorithms/difference_inserter.cpp | 2 +- doc/src/examples/algorithms/envelope.cpp | 2 +- .../examples/algorithms/for_each_point.cpp | 2 +- .../algorithms/for_each_point_const.cpp | 2 +- .../algorithms/intersection_ls_ls_point.cpp | 2 +- .../algorithms/intersection_poly_poly.cpp | 2 +- .../algorithms/intersection_segment.cpp | 2 +- .../algorithms/intersects_linestring.cpp | 2 +- .../algorithms/intersects_segment.cpp | 2 +- doc/src/examples/algorithms/length.cpp | 2 +- .../examples/algorithms/num_geometries.cpp | 2 +- .../algorithms/num_interior_rings.cpp | 2 +- doc/src/examples/algorithms/num_points.cpp | 2 +- .../simplify_inserter_with_strategy.cpp | 4 +- .../examples/algorithms/sym_difference.cpp | 2 +- doc/src/examples/algorithms/union.cpp | 2 +- example/06_b_transformation_example.cpp | 2 +- example/07_a_graph_route_example.cpp | 4 +- example/07_b_graph_route_example.cpp | 4 +- example/experimental/geometry_of.cpp | 2 +- .../extensions/gis/io/shapelib/shapelib.cpp | 2 +- .../projections/p01_projection_example.cpp | 2 +- .../projections/p02_projfactory_example.cpp | 2 +- .../gis/projections/p03_projmap_example.cpp | 2 +- example/with_external_libs/x02_gd_example.cpp | 2 +- .../with_external_libs/x03_a_soci_example.cpp | 2 +- .../with_external_libs/x03_b_soci_example.cpp | 2 +- .../with_external_libs/x03_c_soci_example.cpp | 2 +- .../with_external_libs/x03_d_soci_example.cpp | 2 +- .../x04_wxwidgets_world_mapper.cpp | 4 +- .../x05_shapelib_example.cpp | 2 +- .../x06_qt_world_mapper.cpp | 2 +- test/algorithms/correct.cpp | 4 +- .../detail/sections/range_by_section.cpp | 2 +- .../detail/sections/sectionalize.cpp | 4 +- test/algorithms/disjoint.cpp | 2 +- test/algorithms/make.cpp | 2 +- test/algorithms/overlay/assemble.cpp | 10 +-- test/algorithms/overlay/ccw_traverse.cpp | 2 +- test/algorithms/overlay/dissolver.cpp | 2 +- test/algorithms/overlay/overlay_common.hpp | 4 +- .../overlay/robustness/interior_triangles.cpp | 2 +- .../overlay/robustness/recursive_polygons.cpp | 4 +- .../overlay/robustness/star_comb.cpp | 2 +- .../overlay/robustness/test_overlay_p_q.hpp | 10 +-- .../overlay/self_intersection_points.cpp | 4 +- test/algorithms/overlay/split_rings.cpp | 4 +- test/algorithms/overlay/traverse_gmp.cpp | 2 +- test/algorithms/test_area.hpp | 6 +- test/algorithms/test_centroid.hpp | 2 +- test/algorithms/test_combine.hpp | 2 +- test/algorithms/test_convex_hull.hpp | 4 +- test/algorithms/test_difference.hpp | 6 +- test/algorithms/test_distance.hpp | 2 +- test/algorithms/test_envelope.hpp | 2 +- test/algorithms/test_equals.hpp | 2 +- test/algorithms/test_for_each.hpp | 2 +- test/algorithms/test_intersection.hpp | 6 +- test/algorithms/test_intersects.hpp | 2 +- test/algorithms/test_length.hpp | 2 +- test/algorithms/test_overlaps.hpp | 2 +- test/algorithms/test_perimeter.hpp | 2 +- test/algorithms/test_reverse.hpp | 2 +- test/algorithms/test_simplify.hpp | 2 +- test/algorithms/test_union.hpp | 2 +- test/algorithms/test_unique.hpp | 2 +- test/algorithms/test_within.hpp | 2 +- test/algorithms/transform.cpp | 2 +- test/algorithms/union.cpp | 18 ++++ test/core/ring.cpp | 2 +- .../algorithms/buffer/test_buffer.hpp | 90 +++++++++---------- test/extensions/algorithms/connect.cpp | 2 +- test/extensions/algorithms/dissolve.cpp | 16 +++- .../{ => extensions}/algorithms/is_convex.cpp | 6 +- .../algorithms/is_convex.vcproj | 0 test/extensions/algorithms/mark_spikes.cpp | 4 +- test/extensions/algorithms/midpoints.cpp | 2 +- test/extensions/algorithms/offset.cpp | 2 +- .../extensions/algorithms/remove_holes_if.cpp | 2 +- test/extensions/algorithms/selected.cpp | 2 +- test/extensions/gis/io/wkb/read_wkb.cpp | 2 +- test/extensions/gis/io/wkt/multi_wkt.cpp | 4 +- test/extensions/gis/io/wkt/wkt.cpp | 4 +- test/extensions/gis/latlong/point_ll.cpp | 2 +- test/extensions/nsphere/within.cpp | 2 +- test/geometries/boost_polygon.cpp | 18 ++-- test/geometries/boost_polygon_overlay.cpp | 14 +-- test/geometries/boost_range.cpp | 12 +-- test/iterators/box_iterator.cpp | 2 +- test/iterators/circular_iterator.cpp | 2 +- test/iterators/closing_iterator.cpp | 2 +- test/iterators/ever_circling_iterator.cpp | 2 +- test/iterators/segment_range_iterator.cpp | 2 +- test/iterators/segment_returning_iterator.cpp | 2 +- test/multi/algorithms/multi_area.cpp | 2 +- test/multi/algorithms/multi_centroid.cpp | 2 +- test/multi/algorithms/multi_convex_hull.cpp | 4 +- test/multi/algorithms/multi_correct.cpp | 2 +- test/multi/algorithms/multi_difference.cpp | 2 +- test/multi/algorithms/multi_distance.cpp | 4 +- test/multi/algorithms/multi_envelope.cpp | 2 +- test/multi/algorithms/multi_equals.cpp | 2 +- test/multi/algorithms/multi_for_each.cpp | 2 +- test/multi/algorithms/multi_intersection.cpp | 2 +- test/multi/algorithms/multi_length.cpp | 2 +- .../multi/algorithms/multi_num_geometries.cpp | 2 +- .../algorithms/multi_num_interior_rings.cpp | 2 +- test/multi/algorithms/multi_num_points.cpp | 2 +- test/multi/algorithms/multi_perimeter.cpp | 2 +- test/multi/algorithms/multi_reverse.cpp | 2 +- test/multi/algorithms/multi_simplify.cpp | 2 +- test/multi/algorithms/multi_transform.cpp | 24 ++--- test/multi/algorithms/multi_union.cpp | 2 +- test/multi/algorithms/multi_unique.cpp | 2 +- test/multi/algorithms/multi_within.cpp | 2 +- .../overlay/multi_overlay_common.hpp | 2 +- .../algorithms/overlay/multi_traverse.cpp | 2 +- test/ranges/box_range.cpp | 2 +- test/ranges/segment_range.cpp | 2 +- test/strategies/projected_point.cpp | 10 +-- test/strategies/within.cpp | 2 +- test/util/as_range.cpp | 2 +- test/util/write_dsv.cpp | 2 +- test/views/closeable_view.cpp | 2 +- test/views/reversible_closeable.cpp | 2 +- test/views/reversible_view.cpp | 2 +- 135 files changed, 353 insertions(+), 290 deletions(-) create mode 100644 doc/acknowledgments.qbk create mode 100644 doc/imports.qbk rename test/{ => extensions}/algorithms/is_convex.cpp (94%) rename test/{ => extensions}/algorithms/is_convex.vcproj (100%) diff --git a/doc/acknowledgments.qbk b/doc/acknowledgments.qbk new file mode 100644 index 000000000..2b6521e23 --- /dev/null +++ b/doc/acknowledgments.qbk @@ -0,0 +1,26 @@ +[/============================================================================ + Boost.Geometry (aka GGL, Generic Geometry Library) + + Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands. + Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net) + Copyright (c) 2009-2011 Bruno Lalande, Paris, France. + + Use, modification and distribution is subject to the Boost Software License, + Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at + http://www.boost.org/LICENSE_1_0.txt) +=============================================================================/] + +[section Acknowledgments] + +We like to thank all the people who helped in a way to develop this library. + +First of all we are grateful to Hartmut Kaiser for managing the formal review of this library. Hartmut was a very good review manager, who intervented when necessary and produced the review report quickly. He has also supported the library by subscribing to the GGL mailing list and participating actively on it. + +We thank the 14 reviewers of our library, reviewed from November 5, 2009 to November 22, 2009. Reviews have been written by: Brandon Kohn, Christophe Henry, Fabio Fracassi, Gordon Woodhull, Joachim Faulhaber, Jonathan Franklin, Jose, Lucanus Simonson, Michael Caisse, Michael Fawcett, Paul Bristow, Phil Endecott, Thomas Klimpel, Tom Brinkman + +We also thank all people who discussed on the list about Boost.Geometry, in preview stage or in review stage or after that. We cannot mention all those names, but we like to mention those who, sometimes with a short message, did have a major influence on our design: Dave Abrahams (for the hint on tag dispatching when we were lost in SFINAE), John Fem.... TODO (for the hint on the set of metafunctions for traits), and Mathias Gaunard (for the hint on ranges instead of iterators). + +Finally I (Barend) would like to thank my former employer, Geodan, I've worked there for 16 years, started a geographic library in 1995 which after a number of incarnations, redesigns, refactorings, previews, a review and even more refactorings have led to the now released Boost.Geometry. [/And with them I want to thank those who were initially involved in the library, Maarten Hilfering, Valik, Anne Blankert, and later on Sjoerd Schreuder, Steven Fruitier and Paul den Dulk.] + +[endsect] + diff --git a/doc/doxy/doxygen_input/sourcecode/doxygen_1.cpp b/doc/doxy/doxygen_input/sourcecode/doxygen_1.cpp index 9bae713bc..2838b00f5 100644 --- a/doc/doxy/doxygen_input/sourcecode/doxygen_1.cpp +++ b/doc/doxy/doxygen_input/sourcecode/doxygen_1.cpp @@ -22,7 +22,7 @@ OBSOLETE #include #include -#include +#include // All functions below are referred to in the documentation of Boost.Geometry diff --git a/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp b/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp index 2cb69af98..4c9a7b9da 100644 --- a/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp +++ b/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp @@ -16,7 +16,7 @@ OBSOLETE #include -#include +#include #include #include diff --git a/doc/geometry.qbk b/doc/geometry.qbk index 1171e9465..b88eff880 100644 --- a/doc/geometry.qbk +++ b/doc/geometry.qbk @@ -63,54 +63,16 @@ All algorithms in Boost.Geometry will check any geometry arguments against the c [def __boost_geometry__ Boost.Geometry] [def __boost_gil__ [@http://www.boost.org/libs/gil/ Boost.GIL]] +[heading Contributions] -[*In progress] +Boost.Geometry contains contributions by: -Examples of documentation: -Area algorithm [link geometry.reference.algorithms.area.area_1 here] -Simplify algorithm [link geometry.reference.algorithms.simplify.simplify_3 here] +* Akira Takahashi (adaption of Boost.Fusion) +* Alfredo Correa (adaption of Boost.Array) +* Adam Wulkiewicz (spatial indexes) [footnote Currently an extension] +* Federico Fern\u00E1ndez (spatial indexes) [footnote Currently an extension] -[import src/examples/quick_start.cpp] -[import src/examples/algorithms/area.cpp] -[import src/examples/algorithms/area_with_strategy.cpp] -[import src/examples/algorithms/append.cpp] -[import src/examples/algorithms/assign_2d_point.cpp] -[import src/examples/algorithms/assign_3d_point.cpp] -[import src/examples/algorithms/assign_box_corners.cpp] -[import src/examples/algorithms/assign_inverse.cpp] -[import src/examples/algorithms/assign_with_range.cpp] -[import src/examples/algorithms/assign_point_to_index.cpp] -[import src/examples/algorithms/assign_point_from_index.cpp] -[import src/examples/algorithms/difference.cpp] -[import src/examples/algorithms/difference_inserter.cpp] -[import src/examples/algorithms/envelope.cpp] -[import src/examples/algorithms/for_each_point.cpp] -[import src/examples/algorithms/for_each_point_const.cpp] -[import src/examples/algorithms/for_each_segment_const.cpp] -[import src/examples/algorithms/length.cpp] -[import src/examples/algorithms/length_with_strategy.cpp] -[import src/examples/algorithms/make_2d_point.cpp] -[import src/examples/algorithms/make_3d_point.cpp] -[import src/examples/algorithms/make_envelope.cpp] -[import src/examples/algorithms/make_inverse.cpp] -[import src/examples/algorithms/make_with_range.cpp] -[import src/examples/algorithms/intersection_ls_ls_point.cpp] -[import src/examples/algorithms/intersection_segment.cpp] -[import src/examples/algorithms/intersection_poly_poly.cpp] -[import src/examples/algorithms/intersects_linestring.cpp] -[import src/examples/algorithms/num_geometries.cpp] -[import src/examples/algorithms/num_interior_rings.cpp] -[import src/examples/algorithms/num_points.cpp] -[import src/examples/algorithms/simplify.cpp] -[import src/examples/algorithms/simplify_inserter.cpp] -[import src/examples/algorithms/sym_difference.cpp] -[import src/examples/algorithms/union.cpp] -[import src/examples/core/get_point.cpp] -[import src/examples/core/get_box.cpp] -[import src/examples/core/set_point.cpp] -[import src/examples/core/set_box.cpp] -[import src/examples/geometries/point.cpp] -[import src/examples/geometries/register/point.cpp] +[include imports.qbk] [include introduction.qbk] [include quickstart.qbk] diff --git a/doc/imports.qbk b/doc/imports.qbk new file mode 100644 index 000000000..04d457bb8 --- /dev/null +++ b/doc/imports.qbk @@ -0,0 +1,53 @@ +[/============================================================================ + Boost.Geometry (aka GGL, Generic Geometry Library) + + Copyright (c) 2009-2011 Barend Gehrels, Geodan, Amsterdam, the Netherlands. + Copyright (c) 2009-2011 Mateusz Loskot (mateusz@loskot.net) + Copyright (c) 2009-2011 Bruno Lalande, Paris, France. + + Use, modification and distribution is subject to the Boost Software License, + Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at + http://www.boost.org/LICENSE_1_0.txt) +=============================================================================/] + +[import src/examples/quick_start.cpp] +[import src/examples/algorithms/area.cpp] +[import src/examples/algorithms/area_with_strategy.cpp] +[import src/examples/algorithms/append.cpp] +[import src/examples/algorithms/assign_2d_point.cpp] +[import src/examples/algorithms/assign_3d_point.cpp] +[import src/examples/algorithms/assign_box_corners.cpp] +[import src/examples/algorithms/assign_inverse.cpp] +[import src/examples/algorithms/assign_with_range.cpp] +[import src/examples/algorithms/assign_point_to_index.cpp] +[import src/examples/algorithms/assign_point_from_index.cpp] +[import src/examples/algorithms/difference.cpp] +[import src/examples/algorithms/difference_inserter.cpp] +[import src/examples/algorithms/envelope.cpp] +[import src/examples/algorithms/for_each_point.cpp] +[import src/examples/algorithms/for_each_point_const.cpp] +[import src/examples/algorithms/for_each_segment_const.cpp] +[import src/examples/algorithms/length.cpp] +[import src/examples/algorithms/length_with_strategy.cpp] +[import src/examples/algorithms/make_2d_point.cpp] +[import src/examples/algorithms/make_3d_point.cpp] +[import src/examples/algorithms/make_envelope.cpp] +[import src/examples/algorithms/make_inverse.cpp] +[import src/examples/algorithms/make_with_range.cpp] +[import src/examples/algorithms/intersection_ls_ls_point.cpp] +[import src/examples/algorithms/intersection_segment.cpp] +[import src/examples/algorithms/intersection_poly_poly.cpp] +[import src/examples/algorithms/intersects_linestring.cpp] +[import src/examples/algorithms/num_geometries.cpp] +[import src/examples/algorithms/num_interior_rings.cpp] +[import src/examples/algorithms/num_points.cpp] +[import src/examples/algorithms/simplify.cpp] +[import src/examples/algorithms/simplify_inserter.cpp] +[import src/examples/algorithms/sym_difference.cpp] +[import src/examples/algorithms/union.cpp] +[import src/examples/core/get_point.cpp] +[import src/examples/core/get_box.cpp] +[import src/examples/core/set_point.cpp] +[import src/examples/core/set_box.cpp] +[import src/examples/geometries/point.cpp] +[import src/examples/geometries/register/point.cpp] diff --git a/doc/src/docutils/tools/implementation_status/implementation_status.hpp b/doc/src/docutils/tools/implementation_status/implementation_status.hpp index 778f3661f..1c52fd3dd 100644 --- a/doc/src/docutils/tools/implementation_status/implementation_status.hpp +++ b/doc/src/docutils/tools/implementation_status/implementation_status.hpp @@ -8,5 +8,5 @@ #include #include #include -#include +#include diff --git a/doc/src/examples/algorithms/area.cpp b/doc/src/examples/algorithms/area.cpp index 6b17df31b..501cde1b4 100644 --- a/doc/src/examples/algorithms/area.cpp +++ b/doc/src/examples/algorithms/area.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include namespace bg = boost::geometry; /*< Convenient namespace alias >*/ diff --git a/doc/src/examples/algorithms/area_with_strategy.cpp b/doc/src/examples/algorithms/area_with_strategy.cpp index 8acd6fb97..a1369f019 100644 --- a/doc/src/examples/algorithms/area_with_strategy.cpp +++ b/doc/src/examples/algorithms/area_with_strategy.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include namespace bg = boost::geometry; /*< Convenient namespace alias >*/ diff --git a/doc/src/examples/algorithms/difference.cpp b/doc/src/examples/algorithms/difference.cpp index 65d968805..1a59c7a39 100644 --- a/doc/src/examples/algorithms/difference.cpp +++ b/doc/src/examples/algorithms/difference.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include /*<-*/ #include "create_svg_overlay.hpp" /*->*/ diff --git a/doc/src/examples/algorithms/difference_inserter.cpp b/doc/src/examples/algorithms/difference_inserter.cpp index 8928b3951..6f954ed47 100644 --- a/doc/src/examples/algorithms/difference_inserter.cpp +++ b/doc/src/examples/algorithms/difference_inserter.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include /*<-*/ #include "create_svg_overlay.hpp" /*->*/ diff --git a/doc/src/examples/algorithms/envelope.cpp b/doc/src/examples/algorithms/envelope.cpp index 74730c9e3..be9acc3d2 100644 --- a/doc/src/examples/algorithms/envelope.cpp +++ b/doc/src/examples/algorithms/envelope.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include /*<-*/ #include "create_svg_two.hpp" /*->*/ diff --git a/doc/src/examples/algorithms/for_each_point.cpp b/doc/src/examples/algorithms/for_each_point.cpp index 02f7205ac..35291af55 100644 --- a/doc/src/examples/algorithms/for_each_point.cpp +++ b/doc/src/examples/algorithms/for_each_point.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include diff --git a/doc/src/examples/algorithms/for_each_point_const.cpp b/doc/src/examples/algorithms/for_each_point_const.cpp index 3115d2ff7..cb04c35df 100644 --- a/doc/src/examples/algorithms/for_each_point_const.cpp +++ b/doc/src/examples/algorithms/for_each_point_const.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include template diff --git a/doc/src/examples/algorithms/intersection_ls_ls_point.cpp b/doc/src/examples/algorithms/intersection_ls_ls_point.cpp index f422be239..f11d1e683 100644 --- a/doc/src/examples/algorithms/intersection_ls_ls_point.cpp +++ b/doc/src/examples/algorithms/intersection_ls_ls_point.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include /*< Adapts std::vector to linestring concept >*/ #include diff --git a/doc/src/examples/algorithms/intersection_poly_poly.cpp b/doc/src/examples/algorithms/intersection_poly_poly.cpp index c4e09d206..e47e9adef 100644 --- a/doc/src/examples/algorithms/intersection_poly_poly.cpp +++ b/doc/src/examples/algorithms/intersection_poly_poly.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include /*<-*/ #include "create_svg_overlay.hpp" /*->*/ diff --git a/doc/src/examples/algorithms/intersection_segment.cpp b/doc/src/examples/algorithms/intersection_segment.cpp index a473b99bf..4547e21a3 100644 --- a/doc/src/examples/algorithms/intersection_segment.cpp +++ b/doc/src/examples/algorithms/intersection_segment.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include /*< Adapts std::vector to linestring concept >*/ #include diff --git a/doc/src/examples/algorithms/intersects_linestring.cpp b/doc/src/examples/algorithms/intersects_linestring.cpp index 5cefad0fc..2f7d0e249 100644 --- a/doc/src/examples/algorithms/intersects_linestring.cpp +++ b/doc/src/examples/algorithms/intersects_linestring.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include int main() { diff --git a/doc/src/examples/algorithms/intersects_segment.cpp b/doc/src/examples/algorithms/intersects_segment.cpp index c8e09045c..a77e0266a 100644 --- a/doc/src/examples/algorithms/intersects_segment.cpp +++ b/doc/src/examples/algorithms/intersects_segment.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include int main() { diff --git a/doc/src/examples/algorithms/length.cpp b/doc/src/examples/algorithms/length.cpp index 9d6e51183..a26cdc863 100644 --- a/doc/src/examples/algorithms/length.cpp +++ b/doc/src/examples/algorithms/length.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include int main() diff --git a/doc/src/examples/algorithms/num_geometries.cpp b/doc/src/examples/algorithms/num_geometries.cpp index 4ce57a3cf..c1e2c1b08 100644 --- a/doc/src/examples/algorithms/num_geometries.cpp +++ b/doc/src/examples/algorithms/num_geometries.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include int main() diff --git a/doc/src/examples/algorithms/num_interior_rings.cpp b/doc/src/examples/algorithms/num_interior_rings.cpp index ce129729c..e62e2acc5 100644 --- a/doc/src/examples/algorithms/num_interior_rings.cpp +++ b/doc/src/examples/algorithms/num_interior_rings.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include int main() diff --git a/doc/src/examples/algorithms/num_points.cpp b/doc/src/examples/algorithms/num_points.cpp index 719f5bc8f..ce2c73f70 100644 --- a/doc/src/examples/algorithms/num_points.cpp +++ b/doc/src/examples/algorithms/num_points.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include int main() diff --git a/doc/src/examples/algorithms/simplify_inserter_with_strategy.cpp b/doc/src/examples/algorithms/simplify_inserter_with_strategy.cpp index 97e44aa88..68aa1f3b7 100644 --- a/doc/src/examples/algorithms/simplify_inserter_with_strategy.cpp +++ b/doc/src/examples/algorithms/simplify_inserter_with_strategy.cpp @@ -12,8 +12,8 @@ #include #include -#include -#include +#include +#include diff --git a/doc/src/examples/algorithms/sym_difference.cpp b/doc/src/examples/algorithms/sym_difference.cpp index 09fb7359f..6ba6af3cc 100644 --- a/doc/src/examples/algorithms/sym_difference.cpp +++ b/doc/src/examples/algorithms/sym_difference.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include /*<-*/ #include "create_svg_overlay.hpp" /*->*/ diff --git a/doc/src/examples/algorithms/union.cpp b/doc/src/examples/algorithms/union.cpp index 460b53082..f6fc347fc 100644 --- a/doc/src/examples/algorithms/union.cpp +++ b/doc/src/examples/algorithms/union.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include /*<-*/ #include "create_svg_overlay.hpp" /*->*/ diff --git a/example/06_b_transformation_example.cpp b/example/06_b_transformation_example.cpp index 79ae2ca1d..1f17aa5cd 100644 --- a/example/06_b_transformation_example.cpp +++ b/example/06_b_transformation_example.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/example/07_a_graph_route_example.cpp b/example/07_a_graph_route_example.cpp index 4994ce4fa..c605d938e 100644 --- a/example/07_a_graph_route_example.cpp +++ b/example/07_a_graph_route_example.cpp @@ -22,13 +22,11 @@ #include #include +#include // Yes, this example currently uses some extensions: - // For input: - #include - // For output: #include diff --git a/example/07_b_graph_route_example.cpp b/example/07_b_graph_route_example.cpp index 05388c0d3..1d1586d36 100644 --- a/example/07_b_graph_route_example.cpp +++ b/example/07_b_graph_route_example.cpp @@ -26,13 +26,11 @@ #include #include +#include // Yes, this example currently uses some extensions: - // For input: - #include - // For output: #include diff --git a/example/experimental/geometry_of.cpp b/example/experimental/geometry_of.cpp index 04ee7f4cd..fb2fb4e65 100644 --- a/example/experimental/geometry_of.cpp +++ b/example/experimental/geometry_of.cpp @@ -21,7 +21,7 @@ #include -#include +#include namespace bg = boost::geometry; namespace proto = boost::proto; diff --git a/example/extensions/gis/io/shapelib/shapelib.cpp b/example/extensions/gis/io/shapelib/shapelib.cpp index fe02300a3..27ee276b8 100644 --- a/example/extensions/gis/io/shapelib/shapelib.cpp +++ b/example/extensions/gis/io/shapelib/shapelib.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include // Writing shapefiles has never been easier. diff --git a/example/extensions/gis/projections/p01_projection_example.cpp b/example/extensions/gis/projections/p01_projection_example.cpp index 8c92fa5e0..1518571bf 100644 --- a/example/extensions/gis/projections/p01_projection_example.cpp +++ b/example/extensions/gis/projections/p01_projection_example.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/example/extensions/gis/projections/p02_projfactory_example.cpp b/example/extensions/gis/projections/p02_projfactory_example.cpp index dbdb18109..b21060515 100644 --- a/example/extensions/gis/projections/p02_projfactory_example.cpp +++ b/example/extensions/gis/projections/p02_projfactory_example.cpp @@ -9,7 +9,7 @@ // Projection example 2, using factory #include -#include +#include #include #include #include diff --git a/example/extensions/gis/projections/p03_projmap_example.cpp b/example/extensions/gis/projections/p03_projmap_example.cpp index 5100d1e57..892fcd049 100644 --- a/example/extensions/gis/projections/p03_projmap_example.cpp +++ b/example/extensions/gis/projections/p03_projmap_example.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include diff --git a/example/with_external_libs/x02_gd_example.cpp b/example/with_external_libs/x02_gd_example.cpp index 91adcbb61..e3b05fe5a 100644 --- a/example/with_external_libs/x02_gd_example.cpp +++ b/example/with_external_libs/x02_gd_example.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include diff --git a/example/with_external_libs/x03_a_soci_example.cpp b/example/with_external_libs/x03_a_soci_example.cpp index e133d551e..7802ab9c5 100644 --- a/example/with_external_libs/x03_a_soci_example.cpp +++ b/example/with_external_libs/x03_a_soci_example.cpp @@ -36,7 +36,7 @@ #include #include -#include +#include diff --git a/example/with_external_libs/x03_b_soci_example.cpp b/example/with_external_libs/x03_b_soci_example.cpp index 0429abd2e..3e227f4ba 100644 --- a/example/with_external_libs/x03_b_soci_example.cpp +++ b/example/with_external_libs/x03_b_soci_example.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include struct city diff --git a/example/with_external_libs/x03_c_soci_example.cpp b/example/with_external_libs/x03_c_soci_example.cpp index da407ea3f..a648d804e 100644 --- a/example/with_external_libs/x03_c_soci_example.cpp +++ b/example/with_external_libs/x03_c_soci_example.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include // user-defined type with GGL geometry struct tree diff --git a/example/with_external_libs/x03_d_soci_example.cpp b/example/with_external_libs/x03_d_soci_example.cpp index 4894865df..58cdf8693 100644 --- a/example/with_external_libs/x03_d_soci_example.cpp +++ b/example/with_external_libs/x03_d_soci_example.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include int main() { diff --git a/example/with_external_libs/x04_wxwidgets_world_mapper.cpp b/example/with_external_libs/x04_wxwidgets_world_mapper.cpp index a1c86c210..0b8b22bf6 100644 --- a/example/with_external_libs/x04_wxwidgets_world_mapper.cpp +++ b/example/with_external_libs/x04_wxwidgets_world_mapper.cpp @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include // wxWidgets, if these headers are NOT found, adapt include path (and lib path) diff --git a/example/with_external_libs/x05_shapelib_example.cpp b/example/with_external_libs/x05_shapelib_example.cpp index 8988732ea..fe3791385 100644 --- a/example/with_external_libs/x05_shapelib_example.cpp +++ b/example/with_external_libs/x05_shapelib_example.cpp @@ -20,7 +20,7 @@ #include "shapefil.h" #include -#include +#include using namespace boost::geometry; diff --git a/example/with_external_libs/x06_qt_world_mapper.cpp b/example/with_external_libs/x06_qt_world_mapper.cpp index 2c76803f3..04241883a 100644 --- a/example/with_external_libs/x06_qt_world_mapper.cpp +++ b/example/with_external_libs/x06_qt_world_mapper.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include diff --git a/test/algorithms/correct.cpp b/test/algorithms/correct.cpp index 1c87c7928..093d66abc 100644 --- a/test/algorithms/correct.cpp +++ b/test/algorithms/correct.cpp @@ -15,8 +15,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/test/algorithms/detail/sections/range_by_section.cpp b/test/algorithms/detail/sections/range_by_section.cpp index c43bd8d34..a0dc13131 100644 --- a/test/algorithms/detail/sections/range_by_section.cpp +++ b/test/algorithms/detail/sections/range_by_section.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include diff --git a/test/algorithms/detail/sections/sectionalize.cpp b/test/algorithms/detail/sections/sectionalize.cpp index 8a63eef73..5d5402971 100644 --- a/test/algorithms/detail/sections/sectionalize.cpp +++ b/test/algorithms/detail/sections/sectionalize.cpp @@ -16,8 +16,8 @@ #include #include #include -#include -#include +#include +#include #include diff --git a/test/algorithms/disjoint.cpp b/test/algorithms/disjoint.cpp index aea6d1b8f..17781e557 100644 --- a/test/algorithms/disjoint.cpp +++ b/test/algorithms/disjoint.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include diff --git a/test/algorithms/make.cpp b/test/algorithms/make.cpp index c56f2266f..12b2217f2 100644 --- a/test/algorithms/make.cpp +++ b/test/algorithms/make.cpp @@ -11,7 +11,7 @@ #include -#include +#include #include #include diff --git a/test/algorithms/overlay/assemble.cpp b/test/algorithms/overlay/assemble.cpp index 346cf1c57..0b33c55de 100644 --- a/test/algorithms/overlay/assemble.cpp +++ b/test/algorithms/overlay/assemble.cpp @@ -25,8 +25,8 @@ #include -#include -#include +#include +#include @@ -86,9 +86,9 @@ inline void test_assemble(std::string const& id, Geometry const& p, Geometry con || abs(diff_d2) < 0.001; BOOST_CHECK_MESSAGE(ok, - id << " diff: " - << diff << " d1: " - << diff_d1 << " d2: " + id << " diff: " + << diff << " d1: " + << diff_d1 << " d2: " << diff_d2); } diff --git a/test/algorithms/overlay/ccw_traverse.cpp b/test/algorithms/overlay/ccw_traverse.cpp index bd61d08ad..215cdfaa1 100644 --- a/test/algorithms/overlay/ccw_traverse.cpp +++ b/test/algorithms/overlay/ccw_traverse.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include #if defined(TEST_WITH_SVG) # include diff --git a/test/algorithms/overlay/dissolver.cpp b/test/algorithms/overlay/dissolver.cpp index 55c75fcc3..0cc6522cd 100644 --- a/test/algorithms/overlay/dissolver.cpp +++ b/test/algorithms/overlay/dissolver.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include diff --git a/test/algorithms/overlay/overlay_common.hpp b/test/algorithms/overlay/overlay_common.hpp index 6e28386ca..42cb9a6e4 100644 --- a/test/algorithms/overlay/overlay_common.hpp +++ b/test/algorithms/overlay/overlay_common.hpp @@ -25,8 +25,8 @@ #include -#include -#include +#include +#include #if defined(TEST_WITH_SVG) diff --git a/test/algorithms/overlay/robustness/interior_triangles.cpp b/test/algorithms/overlay/robustness/interior_triangles.cpp index 053086ac1..ac1fbb323 100644 --- a/test/algorithms/overlay/robustness/interior_triangles.cpp +++ b/test/algorithms/overlay/robustness/interior_triangles.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include diff --git a/test/algorithms/overlay/robustness/recursive_polygons.cpp b/test/algorithms/overlay/robustness/recursive_polygons.cpp index 3748cdf16..759db9540 100644 --- a/test/algorithms/overlay/robustness/recursive_polygons.cpp +++ b/test/algorithms/overlay/robustness/recursive_polygons.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include @@ -183,7 +183,7 @@ int main(int argc, char** argv) po::store(po::parse_command_line(argc, argv, description), varmap); po::notify(varmap); - if (varmap.count("help") + if (varmap.count("help") || (form != "box" && form != "triangle")) { std::cout << description << std::endl; diff --git a/test/algorithms/overlay/robustness/star_comb.cpp b/test/algorithms/overlay/robustness/star_comb.cpp index d4f28d9f1..8a52e5dd9 100644 --- a/test/algorithms/overlay/robustness/star_comb.cpp +++ b/test/algorithms/overlay/robustness/star_comb.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include diff --git a/test/algorithms/overlay/robustness/test_overlay_p_q.hpp b/test/algorithms/overlay/robustness/test_overlay_p_q.hpp index 0992f4929..0c21beaa8 100644 --- a/test/algorithms/overlay/robustness/test_overlay_p_q.hpp +++ b/test/algorithms/overlay/robustness/test_overlay_p_q.hpp @@ -26,7 +26,7 @@ #include -#include +#include #include #include @@ -83,7 +83,7 @@ static bool test_overlay_p_q(std::string const& caseid, double sum_d2 = (area_u - area_p) - area_d2; bool wrong_d1 = std::abs(sum_d1) > settings.tolerance; bool wrong_d2 = std::abs(sum_d2) > settings.tolerance; - + if (wrong_d1 || wrong_d2) { wrong = true; @@ -113,7 +113,7 @@ static bool test_overlay_p_q(std::string const& caseid, if (settings.also_difference) { - std::cout + std::cout << " area d1: " << area_d1 << " area d2: " << area_d2; } @@ -153,12 +153,12 @@ static bool test_overlay_p_q(std::string const& caseid, { for (BOOST_AUTO(it, out_d.begin()); it != out_d.end(); ++it) { - mapper.map(*it, + mapper.map(*it, "opacity:0.8;fill:none;stroke:rgb(255,128,0);stroke-width:4;stroke-dasharray:1,7;stroke-linecap:round"); } for (BOOST_AUTO(it, out_d2.begin()); it != out_d2.end(); ++it) { - mapper.map(*it, + mapper.map(*it, "opacity:0.8;fill:none;stroke:rgb(255,0,255);stroke-width:4;stroke-dasharray:1,7;stroke-linecap:round"); } } diff --git a/test/algorithms/overlay/self_intersection_points.cpp b/test/algorithms/overlay/self_intersection_points.cpp index fe8af0a1f..98c3717e7 100644 --- a/test/algorithms/overlay/self_intersection_points.cpp +++ b/test/algorithms/overlay/self_intersection_points.cpp @@ -20,8 +20,8 @@ #include -#include -#include +#include +#include diff --git a/test/algorithms/overlay/split_rings.cpp b/test/algorithms/overlay/split_rings.cpp index 59d509455..1bd7a12c2 100644 --- a/test/algorithms/overlay/split_rings.cpp +++ b/test/algorithms/overlay/split_rings.cpp @@ -17,8 +17,8 @@ #include -#include -#include +#include +#include #if defined(TEST_WITH_SVG) diff --git a/test/algorithms/overlay/traverse_gmp.cpp b/test/algorithms/overlay/traverse_gmp.cpp index 486c93b7e..a0f901845 100644 --- a/test/algorithms/overlay/traverse_gmp.cpp +++ b/test/algorithms/overlay/traverse_gmp.cpp @@ -35,7 +35,7 @@ -#include +#include #define TEST_WITH_SVG diff --git a/test/algorithms/test_area.hpp b/test/algorithms/test_area.hpp index 2acd9c211..c8c97a68a 100644 --- a/test/algorithms/test_area.hpp +++ b/test/algorithms/test_area.hpp @@ -14,11 +14,11 @@ #include #include -#include +#include template -void test_area(Geometry const& geometry, +void test_area(Geometry const& geometry, typename bg::area_result::type expected_area) { typename bg::area_result::type area = bg::area(geometry); @@ -55,7 +55,7 @@ void test_area(Geometry const& geometry, } template -void test_geometry(std::string const& wkt, +void test_geometry(std::string const& wkt, typename bg::area_result::type expected_area) { Geometry geometry; diff --git a/test/algorithms/test_centroid.hpp b/test/algorithms/test_centroid.hpp index 4beb20938..9abb8b153 100644 --- a/test/algorithms/test_centroid.hpp +++ b/test/algorithms/test_centroid.hpp @@ -16,7 +16,7 @@ #include #include -#include +#include template diff --git a/test/algorithms/test_combine.hpp b/test/algorithms/test_combine.hpp index 3c53ba4c5..289fe9d1d 100644 --- a/test/algorithms/test_combine.hpp +++ b/test/algorithms/test_combine.hpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include diff --git a/test/algorithms/test_convex_hull.hpp b/test/algorithms/test_convex_hull.hpp index bfa10a7a2..bd054fb63 100644 --- a/test/algorithms/test_convex_hull.hpp +++ b/test/algorithms/test_convex_hull.hpp @@ -16,8 +16,8 @@ #include -#include -#include +#include +#include #include diff --git a/test/algorithms/test_difference.hpp b/test/algorithms/test_difference.hpp index 6ba1a3348..9dbb2dc73 100644 --- a/test/algorithms/test_difference.hpp +++ b/test/algorithms/test_difference.hpp @@ -34,7 +34,7 @@ #include -#include +#include #if defined(TEST_WITH_SVG) @@ -96,7 +96,7 @@ void test_difference(std::string const& caseid, G1 const& g1, G2 const& g2, { boost::copy(array_with_one_empty_geometry, bg::difference_inserter(g1, g2, std::back_inserter(inserted))); } - + BOOST_CHECK_EQUAL(boost::size(clip), boost::size(inserted) - 1); } #endif @@ -150,7 +150,7 @@ void test_difference(std::string const& caseid, G1 const& g1, G2 const& g2, for (typename std::vector::const_iterator it = clip.begin(); it != clip.end(); ++it) { - mapper.map(*it, + mapper.map(*it, //sym ? "fill-opacity:0.2;stroke-opacity:0.4;fill:rgb(255,255,0);stroke:rgb(255,0,255);stroke-width:8" : "fill-opacity:0.2;stroke-opacity:0.4;fill:rgb(255,0,0);stroke:rgb(255,0,255);stroke-width:8"); } diff --git a/test/algorithms/test_distance.hpp b/test/algorithms/test_distance.hpp index 6d8a5a103..736e0c5ce 100644 --- a/test/algorithms/test_distance.hpp +++ b/test/algorithms/test_distance.hpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include diff --git a/test/algorithms/test_envelope.hpp b/test/algorithms/test_envelope.hpp index e78df258e..56f7c788c 100644 --- a/test/algorithms/test_envelope.hpp +++ b/test/algorithms/test_envelope.hpp @@ -15,7 +15,7 @@ #include #include -#include +#include template diff --git a/test/algorithms/test_equals.hpp b/test/algorithms/test_equals.hpp index 65ee88a71..bc8008a6c 100644 --- a/test/algorithms/test_equals.hpp +++ b/test/algorithms/test_equals.hpp @@ -15,7 +15,7 @@ #include #include -#include +#include template diff --git a/test/algorithms/test_for_each.hpp b/test/algorithms/test_for_each.hpp index e072959ad..71fd64d41 100644 --- a/test/algorithms/test_for_each.hpp +++ b/test/algorithms/test_for_each.hpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include diff --git a/test/algorithms/test_intersection.hpp b/test/algorithms/test_intersection.hpp index 951fd048e..fabdfc86f 100644 --- a/test/algorithms/test_intersection.hpp +++ b/test/algorithms/test_intersection.hpp @@ -25,7 +25,7 @@ #include -#include +#include #if defined(TEST_WITH_SVG) @@ -36,7 +36,7 @@ template -typename bg::area_result::type test_intersection(std::string const& caseid, +typename bg::area_result::type test_intersection(std::string const& caseid, G1 const& g1, G2 const& g2, std::size_t expected_count = 0, std::size_t expected_point_count = 0, double expected_length_or_area = 0, @@ -174,7 +174,7 @@ typename bg::area_result::type test_intersection(std::string const& caseid, } template -typename bg::area_result::type test_one(std::string const& caseid, +typename bg::area_result::type test_one(std::string const& caseid, std::string const& wkt1, std::string const& wkt2, std::size_t expected_count = 0, std::size_t expected_point_count = 0, double expected_length_or_area = 0, diff --git a/test/algorithms/test_intersects.hpp b/test/algorithms/test_intersects.hpp index cc5126c24..b707a1fe4 100644 --- a/test/algorithms/test_intersects.hpp +++ b/test/algorithms/test_intersects.hpp @@ -17,7 +17,7 @@ #include #include -#include +#include template diff --git a/test/algorithms/test_length.hpp b/test/algorithms/test_length.hpp index c18471448..e3e7eacda 100644 --- a/test/algorithms/test_length.hpp +++ b/test/algorithms/test_length.hpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include diff --git a/test/algorithms/test_overlaps.hpp b/test/algorithms/test_overlaps.hpp index c3a946618..84cde7c1c 100644 --- a/test/algorithms/test_overlaps.hpp +++ b/test/algorithms/test_overlaps.hpp @@ -17,7 +17,7 @@ #include #include -#include +#include template diff --git a/test/algorithms/test_perimeter.hpp b/test/algorithms/test_perimeter.hpp index 0ae72aefe..e97156d13 100644 --- a/test/algorithms/test_perimeter.hpp +++ b/test/algorithms/test_perimeter.hpp @@ -15,7 +15,7 @@ #include -#include +#include template diff --git a/test/algorithms/test_reverse.hpp b/test/algorithms/test_reverse.hpp index eb005a69d..cdc346253 100644 --- a/test/algorithms/test_reverse.hpp +++ b/test/algorithms/test_reverse.hpp @@ -13,7 +13,7 @@ #include #include -#include +#include template diff --git a/test/algorithms/test_simplify.hpp b/test/algorithms/test_simplify.hpp index 1e6bfa58f..560a9b684 100644 --- a/test/algorithms/test_simplify.hpp +++ b/test/algorithms/test_simplify.hpp @@ -15,7 +15,7 @@ #include #include -#include +#include template struct test_inserter diff --git a/test/algorithms/test_union.hpp b/test/algorithms/test_union.hpp index 40d706a36..4bacd642a 100644 --- a/test/algorithms/test_union.hpp +++ b/test/algorithms/test_union.hpp @@ -26,7 +26,7 @@ #include -#include +#include #if defined(TEST_WITH_SVG) diff --git a/test/algorithms/test_unique.hpp b/test/algorithms/test_unique.hpp index 9b4a5a91c..37c6f0689 100644 --- a/test/algorithms/test_unique.hpp +++ b/test/algorithms/test_unique.hpp @@ -13,7 +13,7 @@ #include #include -#include +#include template diff --git a/test/algorithms/test_within.hpp b/test/algorithms/test_within.hpp index 274b931fb..ab8418be4 100644 --- a/test/algorithms/test_within.hpp +++ b/test/algorithms/test_within.hpp @@ -17,7 +17,7 @@ #include #include -#include +#include template diff --git a/test/algorithms/transform.cpp b/test/algorithms/transform.cpp index 6f57b9752..8d9d9343d 100644 --- a/test/algorithms/transform.cpp +++ b/test/algorithms/transform.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include diff --git a/test/algorithms/union.cpp b/test/algorithms/union.cpp index 3616c4a96..0e6fb9b37 100644 --- a/test/algorithms/union.cpp +++ b/test/algorithms/union.cpp @@ -18,9 +18,27 @@ #include +static std::string javier4[2] = + { + "POLYGON((-2 2, 1842 2, 1842 -2362, -2 -2362, -2 2), (0 0, 0 -2360, 1840 -2360, 1840 0, 0 0))", + // "POLYGON((-0.01 -1960, 0 -1960, 0 -1880, 0.01 -1960, -0.01 -1960))" + "POLYGON ((-0.01 -1960, 80.01 -1960, 0 -1880, -0.01 -1960))" + }; + + + + + + + + template void test_areal() { + test_one("javier4", + javier4[0], javier4[1], + 1, 1, 13, 20016.4); + test_one("simplex_normal", simplex_normal[0], simplex_normal[1], 1, 0, 13, 11.526367); diff --git a/test/core/ring.cpp b/test/core/ring.cpp index dc94fea05..9edd2ad23 100644 --- a/test/core/ring.cpp +++ b/test/core/ring.cpp @@ -21,7 +21,7 @@ #include -#include +#include diff --git a/test/extensions/algorithms/buffer/test_buffer.hpp b/test/extensions/algorithms/buffer/test_buffer.hpp index c9ac875c2..0b4c36ee2 100644 --- a/test/extensions/algorithms/buffer/test_buffer.hpp +++ b/test/extensions/algorithms/buffer/test_buffer.hpp @@ -58,7 +58,7 @@ #include -#include +#include @@ -110,32 +110,32 @@ void test_buffer(std::string const& caseid, Geometry const& geometry, > inserter_type; - /***/ + /***/ typedef bg::box box_type; typedef bg::sections sections_type; sections_type sections; bg::sectionalize(geometry, sections); - std::vector sections_buffered; + std::vector sections_buffered; - // Buffer all sections separately + // Buffer all sections separately BOOST_FOREACH(typename sections_type::value_type const& section, sections) { if (! section.duplicate) { - typedef typename boost::range_iterator - < - typename bg::range_type::type const - >::type iterator_type; + typedef typename boost::range_iterator + < + typename bg::range_type::type const + >::type iterator_type; - inserter_type inserter(sections_buffered); + inserter_type inserter(sections_buffered); - iterator_type begin, end; - typedef std::pair section_range; - //bg::get_section(geometry, section, begin, end); + iterator_type begin, end; + typedef std::pair section_range; + //bg::get_section(geometry, section, begin, end); typedef bg::closeable_view < @@ -145,41 +145,41 @@ void test_buffer(std::string const& caseid, Geometry const& geometry, view_type view = bg::get_full_section(geometry, section); - bg::detail::buffer::linestring_buffer - < - section_range, ring_type, distance, join_strategy + bg::detail::buffer::linestring_buffer + < + section_range, ring_type, distance, join_strategy >::apply(std::make_pair( - boost::begin(view) + section.begin_index, - boost::begin(view) + section.end_index), + boost::begin(view) + section.begin_index, + boost::begin(view) + section.end_index), inserter, - distance(distance_left, distance_left / 2.0), // two times left - join_strategy()); + distance(distance_left, distance_left / 2.0), // two times left + join_strategy()); } } std::vector sections_buffered_unioned; BOOST_FOREACH(GeometryOut const& p, sections_buffered) { - if (sections_buffered_unioned.empty()) - { - bg::union_inserter(geometry, p, std::back_inserter(sections_buffered_unioned)); - } - else if (boost::size(sections_buffered_unioned) == 1) - { - std::vector step; - bg::union_inserter(sections_buffered_unioned.front(), p, std::back_inserter(step)); - step.swap(sections_buffered_unioned); - } - else - { - std::cout << "nyi" << std::endl; - BOOST_FOREACH(GeometryOut const& sbu, sections_buffered_unioned) - { - bg::union_inserter(p, sbu, sections_buffered_unioned); - } - } + if (sections_buffered_unioned.empty()) + { + bg::union_inserter(geometry, p, std::back_inserter(sections_buffered_unioned)); + } + else if (boost::size(sections_buffered_unioned) == 1) + { + std::vector step; + bg::union_inserter(sections_buffered_unioned.front(), p, std::back_inserter(step)); + step.swap(sections_buffered_unioned); + } + else + { + std::cout << "nyi" << std::endl; + BOOST_FOREACH(GeometryOut const& sbu, sections_buffered_unioned) + { + bg::union_inserter(p, sbu, sections_buffered_unioned); + } + } } - /***/ + /***/ std::vector buffered; @@ -236,8 +236,8 @@ void test_buffer(std::string const& caseid, Geometry const& geometry, #if defined(BOOST_GEOMETRY_TEST_BUFFER_POLYGON) /* - bg::detail::buffer::unioning_buffer(geometry, sections_buffered_unioned, - distance(distance_left, distance_left / 2.0) + bg::detail::buffer::unioning_buffer(geometry, sections_buffered_unioned, + distance(distance_left, distance_left / 2.0) #ifdef BOOST_GEOMETRY_DEBUG_WITH_MAPPER , join_strategy(mapper), mapper #else @@ -264,8 +264,8 @@ void test_buffer(std::string const& caseid, Geometry const& geometry, #else - bg::detail::buffer::segmenting_buffer(geometry, sections_buffered_unioned, - distance(distance_left, distance_right) + bg::detail::buffer::segmenting_buffer(geometry, sections_buffered_unioned, + distance(distance_left, distance_right) #ifdef BOOST_GEOMETRY_DEBUG_WITH_MAPPER , join_strategy(mapper), mapper #else @@ -342,16 +342,16 @@ std::cout << bg::wkt(ring) } #endif - /*** + /*** coordinate_type a = coordinate_type(); BOOST_FOREACH(GeometryOut const& polygon, buffered) { a += bg::area(polygon); } - BOOST_CHECK_CLOSE(a, expected_area, join == 'r' + BOOST_CHECK_CLOSE(a, expected_area, join == 'r' ? coordinate_type(0.1) : coordinate_type(0.001)); - ***/ + ***/ } #ifdef BOOST_GEOMETRY_CHECK_WITH_POSTGIS diff --git a/test/extensions/algorithms/connect.cpp b/test/extensions/algorithms/connect.cpp index 92e279deb..1dd79300f 100644 --- a/test/extensions/algorithms/connect.cpp +++ b/test/extensions/algorithms/connect.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/test/extensions/algorithms/dissolve.cpp b/test/extensions/algorithms/dissolve.cpp index 22f35341f..c85cd4915 100644 --- a/test/extensions/algorithms/dissolve.cpp +++ b/test/extensions/algorithms/dissolve.cpp @@ -23,7 +23,7 @@ #include -#include +#include #include @@ -50,7 +50,7 @@ struct map_segment map_segment& operator=(map_segment const& other) { - if(this != &other) + if(this != &other) { this->m_mapper = other.m_mapper; } @@ -126,12 +126,12 @@ void test_dissolve(std::string const& caseid, Geometry const& geometry, std::ofstream svg(filename.str().c_str()); - typedef + typedef bg::svg_mapper < typename bg::point_type::type > mapper_type; - + mapper_type mapper(svg, 500, 500); mapper.add(geometry); @@ -302,6 +302,14 @@ void test_all() test_one("new_hole", "MULTIPOLYGON(((0 0,1 4,4 1,0 0)),((2 2,3 6,6 3,2 2)),((3 4,5 6,6 2,3 4)),((3 1,5 4,8 4,3 1)))", 1, 18, 19.5206); + + // GGL mailing list - report Javier - 2011, March 7 + test_one("ggl_list_20110307_javier_01", + "MULTIPOLYGON(((560 -400, 600 -400, 600 -440, 560 -440, 560 -400)), ((480 -400, 520 -400, 520 -440, 480 -440, 480 -400)), ((600 -320, 640 -320, 640 -360, 600 -360, 600 -320)), ((520 -400, 560 -400, 560 -440, 520 -440, 520 -400)))", + 1, 18, 19.5206); + test_one("ggl_list_20110307_javier_01", + "POLYGON((0 0, 2000 0, 2000 -2000, 0 -2000, 0 0), (560 -400, 560 -440, 600 -440, 600 -400, 560 -400), (480 -400, 480 -440, 520 -440, 520 -400, 480 -400), (600 -320, 600 -360, 640 -360, 640 -320, 600 -320), (520 -400, 520 -440, 560 -440, 560 -400, 520 -400))", + 1, 18, 19.5206); } diff --git a/test/algorithms/is_convex.cpp b/test/extensions/algorithms/is_convex.cpp similarity index 94% rename from test/algorithms/is_convex.cpp rename to test/extensions/algorithms/is_convex.cpp index 71fb601ba..f66cba62e 100644 --- a/test/algorithms/is_convex.cpp +++ b/test/extensions/algorithms/is_convex.cpp @@ -18,15 +18,15 @@ #include #include -#include -#include +#include +#include #include #include #include -#include +#include template diff --git a/test/algorithms/is_convex.vcproj b/test/extensions/algorithms/is_convex.vcproj similarity index 100% rename from test/algorithms/is_convex.vcproj rename to test/extensions/algorithms/is_convex.vcproj diff --git a/test/extensions/algorithms/mark_spikes.cpp b/test/extensions/algorithms/mark_spikes.cpp index aa1393898..51565e151 100644 --- a/test/extensions/algorithms/mark_spikes.cpp +++ b/test/extensions/algorithms/mark_spikes.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include @@ -112,7 +112,7 @@ void test_all() "MULTIPOLYGON( ((114766.45300292969 560935.37800598145, 114839.08099365234 560958.13200378418, 114919.38200378418 560983.13500976562, 114945.70799255371 560990.80799865723, 114946.2380065918 560992.39601135254, 114930.75900268555 561046.63500976562, 114923.41007995606 561073.32402038574, 114924.41039576962 561073.6148228565, 114903.32929992676 561145.36410522461, 114895.68840026856 561171.36880493164, 114894.6575012207 561174.46450805664, 114894.59449768066 561174.43589782715, 114894.31700134277 561175.496307373, 114894.01480102539 561178.669998169, 114894.57029724121 561179.59580993652, 114969.90060575516 561202.33975150948, 114969.85419015621 561202.51050945686, 114942.83399963379 561194.24600219727, 114895.87001037598 561180.091003418, 114893.3570098877 561179.16500854492, 114872.97556998512 561162.44151731138, 114893.35699462891 561179.16400146484, 114894.90800476074 561173.2380065918, 114892.52699279785 561174.03199768066, 114889.74899291992 561171.51899719238, 114879.56199645996 561162.78800964355, 114844.50500488281 561131.30200195312, 114809.71200561523 561099.1549987793, 114787.22300720215 561079.17900085449, 114771.87699890137 561065.68499755859, 114753.62100219727 561048.4880065918, 114727.0299987793 561029.17300415039, 114717.10800170898 561021.5, 114701.89500427246 561011.04901123047, 114700.83599853516 561009.59400939941, 114701.89500427246 561006.94799804688, 114715.38800048828 560981.28300476074, 114729.9409942627 560953.370010376, 114738.27499389648 560937.62699890137, 114739.46600341797 560937.75900268555, 114766.45300292969 560935.37800598145), (114825.04400634766 560971.37200927734, 114823.72099304199 560971.76800537109, 114822.66299438477 560971.90100097656, 114821.07600402832 560973.22399902344, 114821.07600402832 560975.33999633789, 114821.47200012207 560976.26600646973, 114823.19200134277 560978.11799621582, 114825.04400634766 560978.51499938965, 114827.42599487305 560978.25100708008, 114828.48399353027 560976.796005249, 114828.61599731445 560974.15000915527, 114827.82200622559 560972.8270111084, 114825.04400634766 560971.37200927734), (114893.16600036621 561141.21200561523, 114891.51400756836 561142.51000976562, 114890.68800354004 561144.2799987793, 114890.92399597168 561146.9940032959, 114893.04200744629 561149.43600463867, 114897.01100158691 561148.77500915527, 114898.59399414063 561145.10600280762, 114898.00399780273 561142.9820098877, 114895.64399719238 561141.56600952148, 114893.16600036621 561141.21200561523)))", bg::select_gapped_spike<>(2.0, 0.1), 31052.272, 794.761); test_geometry("texel_195365", - "MULTIPOLYGON( ((115681.31161499021 560944.083480835, 115681.2671573319 560944.22872300365, 115755.0199966431 560968.15299987793, 115727.1070022583 561055.33200073242, 115707.6600036621 561120.94999694824, 115708.341003418 561121.30999755859, 115728.7350006104 561055.82598876953, 115735.858001709 561033.60101318359, 115738.58300018311 561034.407989502, 115739.43000030521 561034.66000366211, 115739.2969970703 561037.56900024414, 115724.7450027466 561084.66598510742, 115713.5 561123.16198730469, 115736.263999939 561131.608001709, 115789.30400085451 561150.01800537109, 115866.6949996948 561176.07998657227, 115921.46299743649 561194.59899902344, 115984.4339981079 561215.10598754883, 115986.9479980469 561198.83401489258, 115992.372001648 561159.808013916, 115995.4150009155 561122.50100708008, 115997.0019989014 561087.70700073242, 115997.266998291 561057.28100585938, 115996.8700027466 561041.53799438477, 115986.5510025024 561038.89300537109, 115864.5780029297 561002.38000488281, 115757.55999755859 560968.05499267578, 115757.5589981079 560968.05499267578, 115749.0859985352 560965.33700561523, 115681.31161499021 560944.083480835)))", + "MULTIPOLYGON( ((115681.31161499021 560944.083480835, 115681.2671573319 560944.22872300365, 115755.0199966431 560968.15299987793, 115727.1070022583 561055.33200073242, 115707.6600036621 561120.94999694824, 115708.341003418 561121.30999755859, 115728.7350006104 561055.82598876953, 115735.858001709 561033.60101318359, 115738.58300018311 561034.407989502, 115739.43000030521 561034.66000366211, 115739.2969970703 561037.56900024414, 115724.7450027466 561084.66598510742, 115713.5 561123.16198730469, 115736.263999939 561131.608001709, 115789.30400085451 561150.01800537109, 115866.6949996948 561176.07998657227, 115921.46299743649 561194.59899902344, 115984.4339981079 561215.10598754883, 115986.9479980469 561198.83401489258, 115992.372001648 561159.808013916, 115995.4150009155 561122.50100708008, 115997.0019989014 561087.70700073242, 115997.266998291 561057.28100585938, 115996.8700027466 561041.53799438477, 115986.5510025024 561038.89300537109, 115864.5780029297 561002.38000488281, 115757.55999755859 560968.05499267578, 115757.5589981079 560968.05499267578, 115749.0859985352 560965.33700561523, 115681.31161499021 560944.083480835)))", bg::select_gapped_spike<>(2.0, 0.9), 45002.987, 924.56); // Found some PostGIS stored procedure as well. diff --git a/test/extensions/algorithms/midpoints.cpp b/test/extensions/algorithms/midpoints.cpp index 6c41412b5..0e460eafb 100644 --- a/test/extensions/algorithms/midpoints.cpp +++ b/test/extensions/algorithms/midpoints.cpp @@ -20,7 +20,7 @@ #include -#include +#include #include diff --git a/test/extensions/algorithms/offset.cpp b/test/extensions/algorithms/offset.cpp index 6f9adb104..96c6a7e1a 100644 --- a/test/extensions/algorithms/offset.cpp +++ b/test/extensions/algorithms/offset.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include diff --git a/test/extensions/algorithms/remove_holes_if.cpp b/test/extensions/algorithms/remove_holes_if.cpp index 501d0e37a..d1fb44b55 100644 --- a/test/extensions/algorithms/remove_holes_if.cpp +++ b/test/extensions/algorithms/remove_holes_if.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include diff --git a/test/extensions/algorithms/selected.cpp b/test/extensions/algorithms/selected.cpp index 70a18b537..0c41e2f58 100644 --- a/test/extensions/algorithms/selected.cpp +++ b/test/extensions/algorithms/selected.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include diff --git a/test/extensions/gis/io/wkb/read_wkb.cpp b/test/extensions/gis/io/wkb/read_wkb.cpp index 6c47b819d..02434fde7 100644 --- a/test/extensions/gis/io/wkb/read_wkb.cpp +++ b/test/extensions/gis/io/wkb/read_wkb.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/test/extensions/gis/io/wkt/multi_wkt.cpp b/test/extensions/gis/io/wkt/multi_wkt.cpp index ecd84f947..7ab87b0dc 100644 --- a/test/extensions/gis/io/wkt/multi_wkt.cpp +++ b/test/extensions/gis/io/wkt/multi_wkt.cpp @@ -29,8 +29,8 @@ #include #include -#include -#include +#include +#include template diff --git a/test/extensions/gis/io/wkt/wkt.cpp b/test/extensions/gis/io/wkt/wkt.cpp index 8d0d52ba5..089c4df3f 100644 --- a/test/extensions/gis/io/wkt/wkt.cpp +++ b/test/extensions/gis/io/wkt/wkt.cpp @@ -24,8 +24,8 @@ #include #include #include -#include -#include +#include +#include template diff --git a/test/extensions/gis/latlong/point_ll.cpp b/test/extensions/gis/latlong/point_ll.cpp index ef3eaa8e1..59bad7707 100644 --- a/test/extensions/gis/latlong/point_ll.cpp +++ b/test/extensions/gis/latlong/point_ll.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/test/extensions/nsphere/within.cpp b/test/extensions/nsphere/within.cpp index b9d70a5a3..5fc061588 100644 --- a/test/extensions/nsphere/within.cpp +++ b/test/extensions/nsphere/within.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include template diff --git a/test/geometries/boost_polygon.cpp b/test/geometries/boost_polygon.cpp index b148a254e..67866ec03 100644 --- a/test/geometries/boost_polygon.cpp +++ b/test/geometries/boost_polygon.cpp @@ -8,13 +8,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include template void fill_polygon_with_two_holes(boost::polygon::polygon_with_holes_data& boost_polygon_polygon) @@ -65,7 +65,7 @@ void test_coordinate_type() typedef bg::model::point bg_point_type; bg_point_type boost_geometry_point(3, 4); - BOOST_CHECK_EQUAL(bg::distance(boost_polygon_point, boost_geometry_point), + BOOST_CHECK_EQUAL(bg::distance(boost_polygon_point, boost_geometry_point), 2 * std::sqrt(2.0)); // 2a: Check if Boost.Polygon's box fulfills Boost.Geometry's box concept @@ -86,7 +86,7 @@ void test_coordinate_type() // 3a: Check if Boost.Polygon's polygon fulfills Boost.Geometry's ring concept bg::concept::check >(); - // 3b: use a Boost.Polygon polygon (ring) + // 3b: use a Boost.Polygon polygon (ring) boost::polygon::polygon_data boost_polygon_ring; { // Filling it is a two-step process using Boost.Polygon diff --git a/test/geometries/boost_polygon_overlay.cpp b/test/geometries/boost_polygon_overlay.cpp index 5094c0a61..1b6264ca2 100644 --- a/test/geometries/boost_polygon_overlay.cpp +++ b/test/geometries/boost_polygon_overlay.cpp @@ -8,12 +8,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include @@ -91,7 +91,7 @@ void test_overlay_using_boost_geometry(std::string const& case_id, std::string c double sum = area_p + area_q - area_u - area_i; BOOST_CHECK_MESSAGE(abs(sum) < 0.001, - "Overlay error\n" + "Overlay error\n" << "Boost.Geometry " << case_id << " area p: " << area_p << " area q: " << area_q diff --git a/test/geometries/boost_range.cpp b/test/geometries/boost_range.cpp index 4061da97f..8bc54fcc1 100644 --- a/test/geometries/boost_range.cpp +++ b/test/geometries/boost_range.cpp @@ -18,15 +18,15 @@ #include #include -#include +#include #include struct not_two { template - bool operator()(P const& p) const - { + bool operator()(P const& p) const + { return boost::geometry::get<0>(p) != 2.0; } }; @@ -34,8 +34,8 @@ struct not_two struct sum_not_five { template - bool operator()(P const& p1, P const& p2) const - { + bool operator()(P const& p1, P const& p2) const + { return boost::geometry::get<0>(p1) + boost::geometry::get<0>(p2) != 5.0; } }; @@ -43,7 +43,7 @@ struct sum_not_five template void test_range_adaptor() -{ +{ bg::model::linestring

ls; bg::read_wkt("LINESTRING(1 1,2 2,3 3,4 4)", ls); diff --git a/test/iterators/box_iterator.cpp b/test/iterators/box_iterator.cpp index 8582259a7..f9b4e100d 100644 --- a/test/iterators/box_iterator.cpp +++ b/test/iterators/box_iterator.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include diff --git a/test/iterators/circular_iterator.cpp b/test/iterators/circular_iterator.cpp index 0924a18d1..eeb5f0a5f 100644 --- a/test/iterators/circular_iterator.cpp +++ b/test/iterators/circular_iterator.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include diff --git a/test/iterators/closing_iterator.cpp b/test/iterators/closing_iterator.cpp index 238b842d3..5ebfd6c7a 100644 --- a/test/iterators/closing_iterator.cpp +++ b/test/iterators/closing_iterator.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include diff --git a/test/iterators/ever_circling_iterator.cpp b/test/iterators/ever_circling_iterator.cpp index 816a7afc2..e7d203d59 100644 --- a/test/iterators/ever_circling_iterator.cpp +++ b/test/iterators/ever_circling_iterator.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include template diff --git a/test/iterators/segment_range_iterator.cpp b/test/iterators/segment_range_iterator.cpp index 030a78957..8b97b425d 100644 --- a/test/iterators/segment_range_iterator.cpp +++ b/test/iterators/segment_range_iterator.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include diff --git a/test/iterators/segment_returning_iterator.cpp b/test/iterators/segment_returning_iterator.cpp index f158f0fd7..f2f63b3be 100644 --- a/test/iterators/segment_returning_iterator.cpp +++ b/test/iterators/segment_returning_iterator.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include template void test_linestring(std::string const& wkt, std::string const& expected) diff --git a/test/multi/algorithms/multi_area.cpp b/test/multi/algorithms/multi_area.cpp index 4676a9fc3..4cdd7e31f 100644 --- a/test/multi/algorithms/multi_area.cpp +++ b/test/multi/algorithms/multi_area.cpp @@ -12,7 +12,7 @@ #include -#include +#include diff --git a/test/multi/algorithms/multi_centroid.cpp b/test/multi/algorithms/multi_centroid.cpp index 48a38827b..4b4d47c90 100644 --- a/test/multi/algorithms/multi_centroid.cpp +++ b/test/multi/algorithms/multi_centroid.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include // #define REPORT_RESULTS diff --git a/test/multi/algorithms/multi_convex_hull.cpp b/test/multi/algorithms/multi_convex_hull.cpp index a326baaca..30190c201 100644 --- a/test/multi/algorithms/multi_convex_hull.cpp +++ b/test/multi/algorithms/multi_convex_hull.cpp @@ -14,7 +14,7 @@ #include -#include +#include #include #include @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/test/multi/algorithms/multi_correct.cpp b/test/multi/algorithms/multi_correct.cpp index a54067cd4..408c7171a 100644 --- a/test/multi/algorithms/multi_correct.cpp +++ b/test/multi/algorithms/multi_correct.cpp @@ -13,7 +13,7 @@ #include -#include +#include #include #include diff --git a/test/multi/algorithms/multi_difference.cpp b/test/multi/algorithms/multi_difference.cpp index fff3632b0..92f709a1c 100644 --- a/test/multi/algorithms/multi_difference.cpp +++ b/test/multi/algorithms/multi_difference.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include template void test_areal() diff --git a/test/multi/algorithms/multi_distance.cpp b/test/multi/algorithms/multi_distance.cpp index ad41acdd3..ad749e9f5 100644 --- a/test/multi/algorithms/multi_distance.cpp +++ b/test/multi/algorithms/multi_distance.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/test/multi/algorithms/multi_envelope.cpp b/test/multi/algorithms/multi_envelope.cpp index b928e5209..4a977972c 100644 --- a/test/multi/algorithms/multi_envelope.cpp +++ b/test/multi/algorithms/multi_envelope.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include diff --git a/test/multi/algorithms/multi_equals.cpp b/test/multi/algorithms/multi_equals.cpp index 67b88377c..2ad3b260c 100644 --- a/test/multi/algorithms/multi_equals.cpp +++ b/test/multi/algorithms/multi_equals.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include diff --git a/test/multi/algorithms/multi_for_each.cpp b/test/multi/algorithms/multi_for_each.cpp index 2c1bc59f7..45a1fb736 100644 --- a/test/multi/algorithms/multi_for_each.cpp +++ b/test/multi/algorithms/multi_for_each.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/test/multi/algorithms/multi_intersection.cpp b/test/multi/algorithms/multi_intersection.cpp index ab3d38af7..1c32e101d 100644 --- a/test/multi/algorithms/multi_intersection.cpp +++ b/test/multi/algorithms/multi_intersection.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include template void test_areal() diff --git a/test/multi/algorithms/multi_length.cpp b/test/multi/algorithms/multi_length.cpp index 719f242a3..d86579ff4 100644 --- a/test/multi/algorithms/multi_length.cpp +++ b/test/multi/algorithms/multi_length.cpp @@ -12,7 +12,7 @@ #include -#include +#include diff --git a/test/multi/algorithms/multi_num_geometries.cpp b/test/multi/algorithms/multi_num_geometries.cpp index 59f5777a4..e2bd8798e 100644 --- a/test/multi/algorithms/multi_num_geometries.cpp +++ b/test/multi/algorithms/multi_num_geometries.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/test/multi/algorithms/multi_num_interior_rings.cpp b/test/multi/algorithms/multi_num_interior_rings.cpp index 11f6dc98e..eb56e6c9e 100644 --- a/test/multi/algorithms/multi_num_interior_rings.cpp +++ b/test/multi/algorithms/multi_num_interior_rings.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/test/multi/algorithms/multi_num_points.cpp b/test/multi/algorithms/multi_num_points.cpp index 479a3fc10..6bc95d01d 100644 --- a/test/multi/algorithms/multi_num_points.cpp +++ b/test/multi/algorithms/multi_num_points.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/test/multi/algorithms/multi_perimeter.cpp b/test/multi/algorithms/multi_perimeter.cpp index fdbe46231..ebcb20a36 100644 --- a/test/multi/algorithms/multi_perimeter.cpp +++ b/test/multi/algorithms/multi_perimeter.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/test/multi/algorithms/multi_reverse.cpp b/test/multi/algorithms/multi_reverse.cpp index 556bbac48..cb61e93a4 100644 --- a/test/multi/algorithms/multi_reverse.cpp +++ b/test/multi/algorithms/multi_reverse.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include diff --git a/test/multi/algorithms/multi_simplify.cpp b/test/multi/algorithms/multi_simplify.cpp index f9271958a..e4a787d5c 100644 --- a/test/multi/algorithms/multi_simplify.cpp +++ b/test/multi/algorithms/multi_simplify.cpp @@ -9,7 +9,7 @@ #include -#include +#include #include #include diff --git a/test/multi/algorithms/multi_transform.cpp b/test/multi/algorithms/multi_transform.cpp index ddb12c984..876efa220 100644 --- a/test/multi/algorithms/multi_transform.cpp +++ b/test/multi/algorithms/multi_transform.cpp @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include // This test is a little different from transform.cpp test. @@ -36,7 +36,7 @@ void test_transform(std::string const& wkt, std::string const& expected) Geometry geometry_in, geometry_out; bg::read_wkt(wkt, geometry_in); - bg::transform(geometry_in, geometry_out, + bg::transform(geometry_in, geometry_out, bg::strategy::transform::scale_transformer(2, 2)); std::ostringstream detected; detected << bg::wkt(geometry_out); @@ -50,31 +50,31 @@ void test_all() typedef bg::model::d2::point_xy P; test_transform

( - "POINT(1 1)", + "POINT(1 1)", "POINT(2 2)"); test_transform >( - "LINESTRING(1 1,2 2)", + "LINESTRING(1 1,2 2)", "LINESTRING(2 2,4 4)"); test_transform >( - "LINESTRING(1 1,2 2)", + "LINESTRING(1 1,2 2)", "LINESTRING(2 2,4 4)"); test_transform >( - "POLYGON((0 0,0 1,1 0,0 0))", + "POLYGON((0 0,0 1,1 0,0 0))", "POLYGON((0 0,0 2,2 0,0 0))"); test_transform >( - "POLYGON((0 0,0 1,1 0,0 0))", + "POLYGON((0 0,0 1,1 0,0 0))", "POLYGON((0 0,0 2,2 0,0 0))"); test_transform >( - "POLYGON((0 0,0 1,1 1,1 0,0 0))", + "POLYGON((0 0,0 1,1 1,1 0,0 0))", "POLYGON((0 0,0 2,2 2,2 0,0 0))"); test_transform >( - "MULTIPOINT((1 1),(2 2))", + "MULTIPOINT((1 1),(2 2))", "MULTIPOINT((2 2),(4 4))"); test_transform > >( - "MULTILINESTRING((1 1,2 2))", + "MULTILINESTRING((1 1,2 2))", "MULTILINESTRING((2 2,4 4))"); test_transform > >( - "MULTIPOLYGON(((0 0,0 1,1 0,0 0)))", + "MULTIPOLYGON(((0 0,0 1,1 0,0 0)))", "MULTIPOLYGON(((0 0,0 2,2 0,0 0)))"); } diff --git a/test/multi/algorithms/multi_union.cpp b/test/multi/algorithms/multi_union.cpp index 697089453..44c0576d8 100644 --- a/test/multi/algorithms/multi_union.cpp +++ b/test/multi/algorithms/multi_union.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include template diff --git a/test/multi/algorithms/multi_unique.cpp b/test/multi/algorithms/multi_unique.cpp index e5f6f6196..f8b02f277 100644 --- a/test/multi/algorithms/multi_unique.cpp +++ b/test/multi/algorithms/multi_unique.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include diff --git a/test/multi/algorithms/multi_within.cpp b/test/multi/algorithms/multi_within.cpp index d2fe555aa..e4519ec4d 100644 --- a/test/multi/algorithms/multi_within.cpp +++ b/test/multi/algorithms/multi_within.cpp @@ -7,7 +7,7 @@ #include -#include +#include #include #include diff --git a/test/multi/algorithms/overlay/multi_overlay_common.hpp b/test/multi/algorithms/overlay/multi_overlay_common.hpp index 631d10afb..314036dad 100644 --- a/test/multi/algorithms/overlay/multi_overlay_common.hpp +++ b/test/multi/algorithms/overlay/multi_overlay_common.hpp @@ -14,7 +14,7 @@ #include #include -#include +#include //#include diff --git a/test/multi/algorithms/overlay/multi_traverse.cpp b/test/multi/algorithms/overlay/multi_traverse.cpp index 681fe60ed..348440e21 100644 --- a/test/multi/algorithms/overlay/multi_traverse.cpp +++ b/test/multi/algorithms/overlay/multi_traverse.cpp @@ -32,7 +32,7 @@ #include -#include +#include #include "multi_overlay_cases.hpp" diff --git a/test/ranges/box_range.cpp b/test/ranges/box_range.cpp index 6d417383c..d27bc6c53 100644 --- a/test/ranges/box_range.cpp +++ b/test/ranges/box_range.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include diff --git a/test/ranges/segment_range.cpp b/test/ranges/segment_range.cpp index 1be700f2e..31e65519e 100644 --- a/test/ranges/segment_range.cpp +++ b/test/ranges/segment_range.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include diff --git a/test/strategies/projected_point.cpp b/test/strategies/projected_point.cpp index c6f3c81ed..38716d70e 100644 --- a/test/strategies/projected_point.cpp +++ b/test/strategies/projected_point.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include @@ -133,8 +133,8 @@ int test_main(int, char* []) test_services < - bg::model::point, - bg::model::point, + bg::model::point, + bg::model::point, long double >(); @@ -142,8 +142,8 @@ int test_main(int, char* []) #if defined(HAVE_TTMATH) test_all_2d < - bg::model::point, - bg::model::point + bg::model::point, + bg::model::point >(); #endif diff --git a/test/strategies/within.cpp b/test/strategies/within.cpp index 45db86172..063a78e7d 100644 --- a/test/strategies/within.cpp +++ b/test/strategies/within.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include diff --git a/test/util/as_range.cpp b/test/util/as_range.cpp index 8fe96a877..75b5ee60e 100644 --- a/test/util/as_range.cpp +++ b/test/util/as_range.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include template double sum(Range const& range) diff --git a/test/util/write_dsv.cpp b/test/util/write_dsv.cpp index 1d82b549e..695c69904 100644 --- a/test/util/write_dsv.cpp +++ b/test/util/write_dsv.cpp @@ -16,7 +16,7 @@ #include -#include +#include diff --git a/test/views/closeable_view.cpp b/test/views/closeable_view.cpp index 6620d3352..993ddb206 100644 --- a/test/views/closeable_view.cpp +++ b/test/views/closeable_view.cpp @@ -14,7 +14,7 @@ #include -#include +#include #include #include #include diff --git a/test/views/reversible_closeable.cpp b/test/views/reversible_closeable.cpp index c54949297..8e36134ec 100644 --- a/test/views/reversible_closeable.cpp +++ b/test/views/reversible_closeable.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include diff --git a/test/views/reversible_view.cpp b/test/views/reversible_view.cpp index b6803aafd..1ba45f7a3 100644 --- a/test/views/reversible_view.cpp +++ b/test/views/reversible_view.cpp @@ -14,7 +14,7 @@ #include -#include +#include #include #include #include