mirror of
https://github.com/boostorg/geometry.git
synced 2025-05-11 13:34:10 +00:00
Moved wkt (used in nearly all tests) from extension to domains tree for release
[SVN r69906]
This commit is contained in:
parent
0fc4cf96fb
commit
c1b1b4a6c7
26
doc/acknowledgments.qbk
Normal file
26
doc/acknowledgments.qbk
Normal file
@ -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]
|
||||
|
@ -22,7 +22,7 @@ OBSOLETE
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/geometries/adapted/std_as_linestring.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
|
||||
// All functions below are referred to in the documentation of Boost.Geometry
|
||||
|
@ -16,7 +16,7 @@ OBSOLETE
|
||||
|
||||
#include <boost/geometry/multi/multi.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/extensions/io/svg/write_svg_multi.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
|
@ -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]
|
||||
|
53
doc/imports.qbk
Normal file
53
doc/imports.qbk
Normal file
@ -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]
|
@ -8,5 +8,5 @@
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/multi/multi.hpp>
|
||||
#include <boost/geometry/multi/geometries/multi_point.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
#include <iostream>
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
namespace bg = boost::geometry; /*< Convenient namespace alias >*/
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
#include <iostream>
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
namespace bg = boost::geometry; /*< Convenient namespace alias >*/
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
#include <boost/foreach.hpp>
|
||||
/*<-*/ #include "create_svg_overlay.hpp" /*->*/
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
#include <boost/foreach.hpp>
|
||||
/*<-*/ #include "create_svg_overlay.hpp" /*->*/
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
/*<-*/ #include "create_svg_two.hpp" /*->*/
|
||||
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
|
||||
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
|
||||
template <typename Point>
|
||||
|
@ -14,7 +14,7 @@
|
||||
#include <deque>
|
||||
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/geometries/adapted/std_as_linestring.hpp> /*< Adapts std::vector to linestring concept >*/
|
||||
|
||||
#include <boost/foreach.hpp>
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
#include <boost/foreach.hpp>
|
||||
/*<-*/ #include "create_svg_overlay.hpp" /*->*/
|
||||
|
@ -13,7 +13,7 @@
|
||||
#include <iostream>
|
||||
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/geometries/adapted/std_as_linestring.hpp> /*< Adapts std::vector to linestring concept >*/
|
||||
|
||||
#include <boost/foreach.hpp>
|
||||
|
@ -13,7 +13,7 @@
|
||||
#include <iostream>
|
||||
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
int main()
|
||||
{
|
||||
|
@ -13,7 +13,7 @@
|
||||
#include <iostream>
|
||||
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
int main()
|
||||
{
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
#include <iostream>
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
|
||||
int main()
|
||||
|
@ -16,7 +16,7 @@
|
||||
#include <boost/geometry/multi/multi.hpp>
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
|
||||
int main()
|
||||
|
@ -16,7 +16,7 @@
|
||||
#include <boost/geometry/multi/multi.hpp>
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
|
||||
int main()
|
||||
|
@ -16,7 +16,7 @@
|
||||
#include <boost/geometry/multi/multi.hpp>
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
|
||||
int main()
|
||||
|
@ -12,8 +12,8 @@
|
||||
|
||||
#include <iostream>
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/stream_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/stream_wkt.hpp>
|
||||
|
||||
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
#include <boost/foreach.hpp>
|
||||
/*<-*/ #include "create_svg_overlay.hpp" /*->*/
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
#include <boost/foreach.hpp>
|
||||
/*<-*/ #include "create_svg_overlay.hpp" /*->*/
|
||||
|
@ -20,7 +20,7 @@
|
||||
#include <boost/geometry/strategies/transform.hpp>
|
||||
#include <boost/geometry/strategies/transform/matrix_transformers.hpp>
|
||||
#include <boost/geometry/extensions/io/svg/write_svg.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
|
||||
#include <boost/bind.hpp>
|
||||
#include <boost/random.hpp>
|
||||
|
@ -22,13 +22,11 @@
|
||||
#include <boost/graph/dijkstra_shortest_paths.hpp>
|
||||
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
|
||||
|
||||
// Yes, this example currently uses some extensions:
|
||||
|
||||
// For input:
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
|
||||
// For output:
|
||||
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
|
||||
|
@ -26,13 +26,11 @@
|
||||
#include <boost/graph/dijkstra_shortest_paths.hpp>
|
||||
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
|
||||
|
||||
// Yes, this example currently uses some extensions:
|
||||
|
||||
// For input:
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
|
||||
// For output:
|
||||
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
namespace bg = boost::geometry;
|
||||
namespace proto = boost::proto;
|
||||
|
@ -17,7 +17,7 @@
|
||||
#include <boost/geometry/extensions/gis/io/shapelib/shp_create_object_multi.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/shapelib/dbf_write_attribute.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
|
||||
// Writing shapefiles has never been easier.
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/algorithms/parse.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/stream_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/stream_wkt.hpp>
|
||||
#include <boost/geometry/extensions/gis/latlong/latlong.hpp>
|
||||
#include <boost/geometry/extensions/gis/projections/parameters.hpp>
|
||||
#include <boost/geometry/extensions/gis/projections/proj/robin.hpp>
|
||||
|
@ -9,7 +9,7 @@
|
||||
// Projection example 2, using factory
|
||||
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/stream_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/stream_wkt.hpp>
|
||||
#include <boost/geometry/extensions/gis/latlong/latlong.hpp>
|
||||
#include <boost/geometry/extensions/gis/projections/parameters.hpp>
|
||||
#include <boost/geometry/extensions/gis/projections/factory.hpp>
|
||||
|
@ -15,7 +15,7 @@
|
||||
#include <boost/geometry/geometries/register/point.hpp>
|
||||
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
|
||||
#include <boost/geometry/extensions/io/svg/write_svg.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt_multi.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
|
||||
#include <boost/geometry/extensions/gis/latlong/latlong.hpp>
|
||||
#include <boost/geometry/extensions/gis/projections/project_transformer.hpp>
|
||||
|
||||
|
@ -33,7 +33,7 @@
|
||||
#include <boost/geometry/extensions/gis/latlong/latlong.hpp>
|
||||
#include <boost/geometry/extensions/gis/geographic/strategies/area_huiller_earth.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
|
||||
#include <gd.h>
|
||||
|
@ -36,7 +36,7 @@
|
||||
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
|
||||
|
||||
|
@ -30,7 +30,7 @@
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
|
||||
struct city
|
||||
|
@ -32,7 +32,7 @@
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkb/read_wkb.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkb/utility.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
// user-defined type with GGL geometry
|
||||
struct tree
|
||||
|
@ -33,7 +33,7 @@
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkb/read_wkb.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkb/utility.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
int main()
|
||||
{
|
||||
|
@ -22,8 +22,8 @@
|
||||
#include <boost/geometry/geometries/register/ring.hpp>
|
||||
#include <boost/geometry/multi/multi.hpp>
|
||||
#include <boost/geometry/extensions/algorithms/selected.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt_multi.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
|
||||
|
||||
|
||||
// wxWidgets, if these headers are NOT found, adapt include path (and lib path)
|
||||
|
@ -20,7 +20,7 @@
|
||||
#include "shapefil.h"
|
||||
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/stream_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/stream_wkt.hpp>
|
||||
|
||||
using namespace boost::geometry;
|
||||
|
||||
|
@ -28,7 +28,7 @@
|
||||
|
||||
#include <boost/geometry/multi/multi.hpp>
|
||||
#include <boost/geometry/extensions/algorithms/selected.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
|
||||
|
||||
|
@ -15,8 +15,8 @@
|
||||
|
||||
#include <boost/geometry/util/write_dsv.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/write_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
|
||||
|
||||
#include <boost/geometry/geometries/point_xy.hpp>
|
||||
#include <boost/geometry/geometries/box.hpp>
|
||||
|
@ -15,7 +15,7 @@
|
||||
#include <boost/geometry/algorithms/detail/sections/range_by_section.hpp>
|
||||
#include <boost/geometry/iterators/range_type.hpp>
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
|
||||
|
||||
|
@ -16,8 +16,8 @@
|
||||
#include <boost/geometry/algorithms/num_points.hpp>
|
||||
#include <boost/geometry/algorithms/detail/sections/sectionalize.hpp>
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/write_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
|
||||
|
||||
#include <test_common/test_point.hpp>
|
||||
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
#include <boost/geometry/algorithms/disjoint.hpp>
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
|
||||
#include <test_common/test_point.hpp>
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
#include <boost/geometry/algorithms/make.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/write_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
|
||||
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
|
||||
|
@ -25,8 +25,8 @@
|
||||
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/write_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
|
||||
|
||||
|
||||
|
||||
|
@ -14,7 +14,7 @@
|
||||
#include <geometry_test_common.hpp>
|
||||
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
|
@ -16,7 +16,7 @@
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
#include <boost/geometry/multi/multi.hpp>
|
||||
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt_multi.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
|
||||
#include <boost/geometry/extensions/io/svg/write_svg_multi.hpp>
|
||||
|
||||
|
||||
|
@ -25,8 +25,8 @@
|
||||
#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
|
||||
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/write_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
|
||||
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
|
@ -28,7 +28,7 @@
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/multi/multi.hpp>
|
||||
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
|
||||
|
||||
|
@ -27,7 +27,7 @@
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/multi/multi.hpp>
|
||||
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
|
||||
|
||||
|
@ -29,7 +29,7 @@
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/multi/multi.hpp>
|
||||
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
|
||||
|
||||
|
@ -26,7 +26,7 @@
|
||||
|
||||
#include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
|
||||
#include <geometry_test_common.hpp>
|
||||
|
@ -20,8 +20,8 @@
|
||||
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/write_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
|
||||
|
||||
|
||||
|
||||
|
@ -17,8 +17,8 @@
|
||||
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/write_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
|
||||
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
|
@ -35,7 +35,7 @@
|
||||
|
||||
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
#define TEST_WITH_SVG
|
||||
|
||||
|
@ -14,7 +14,7 @@
|
||||
#include <boost/geometry/algorithms/area.hpp>
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
|
||||
|
||||
template <typename Geometry>
|
||||
|
@ -16,7 +16,7 @@
|
||||
#include <boost/geometry/algorithms/centroid.hpp>
|
||||
#include <boost/geometry/algorithms/distance.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
|
||||
|
||||
template<std::size_t D>
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
#include <boost/geometry/algorithms/combine.hpp>
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/algorithms/assign.hpp>
|
||||
#include <boost/geometry/util/write_dsv.hpp>
|
||||
|
||||
|
@ -16,8 +16,8 @@
|
||||
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/write_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
|
||||
|
||||
#include <boost/geometry/geometries/polygon.hpp>
|
||||
|
||||
|
@ -34,7 +34,7 @@
|
||||
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
|
@ -11,7 +11,7 @@
|
||||
#include <geometry_test_common.hpp>
|
||||
|
||||
#include <boost/geometry/algorithms/distance.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
#include <boost/geometry/geometries/box.hpp>
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
|
||||
|
||||
template<typename Box, std::size_t DimensionCount>
|
||||
|
@ -15,7 +15,7 @@
|
||||
#include <boost/geometry/algorithms/equals.hpp>
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
|
||||
|
||||
template <typename Geometry1, typename Geometry2>
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
#include <boost/geometry/algorithms/distance.hpp>
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/util/write_dsv.hpp>
|
||||
|
||||
|
||||
|
@ -25,7 +25,7 @@
|
||||
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
|
@ -17,7 +17,7 @@
|
||||
#include <boost/geometry/geometries/ring.hpp>
|
||||
#include <boost/geometry/geometries/polygon.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
|
||||
|
||||
template <typename Geometry1, typename Geometry2>
|
||||
|
@ -11,7 +11,7 @@
|
||||
#include <geometry_test_common.hpp>
|
||||
|
||||
#include <boost/geometry/algorithms/length.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
#include <boost/geometry/geometries/ring.hpp>
|
||||
#include <boost/geometry/geometries/polygon.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
|
||||
|
||||
template <typename Geometry1, typename Geometry2>
|
||||
|
@ -15,7 +15,7 @@
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
|
||||
|
||||
template <typename Geometry>
|
||||
|
@ -13,7 +13,7 @@
|
||||
#include <geometry_test_common.hpp>
|
||||
#include <boost/geometry/algorithms/reverse.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
|
||||
template <typename Geometry>
|
||||
|
@ -15,7 +15,7 @@
|
||||
#include <boost/geometry/algorithms/distance.hpp>
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
template <typename Tag, typename Geometry>
|
||||
struct test_inserter
|
||||
|
@ -26,7 +26,7 @@
|
||||
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
|
@ -13,7 +13,7 @@
|
||||
#include <geometry_test_common.hpp>
|
||||
#include <boost/geometry/algorithms/unique.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
|
||||
template <typename Geometry>
|
||||
|
@ -17,7 +17,7 @@
|
||||
#include <boost/geometry/geometries/ring.hpp>
|
||||
#include <boost/geometry/geometries/polygon.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
|
||||
|
||||
template <typename Geometry1, typename Geometry2>
|
||||
|
@ -18,7 +18,7 @@
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
|
||||
#include <boost/geometry/util/write_dsv.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
#include <test_common/test_point.hpp>
|
||||
|
||||
|
@ -18,9 +18,27 @@
|
||||
|
||||
#include <algorithms/overlay/overlay_cases.hpp>
|
||||
|
||||
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 <typename Ring, typename Polygon>
|
||||
void test_areal()
|
||||
{
|
||||
test_one<Polygon, Polygon, Polygon>("javier4",
|
||||
javier4[0], javier4[1],
|
||||
1, 1, 13, 20016.4);
|
||||
|
||||
test_one<Polygon, Polygon, Polygon>("simplex_normal",
|
||||
simplex_normal[0], simplex_normal[1],
|
||||
1, 0, 13, 11.526367);
|
||||
|
@ -21,7 +21,7 @@
|
||||
#include <boost/geometry/geometries/polygon.hpp>
|
||||
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
|
||||
|
||||
|
||||
|
@ -58,7 +58,7 @@
|
||||
|
||||
#include <boost/geometry/strategies/buffer.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
|
||||
|
||||
|
@ -16,7 +16,7 @@
|
||||
#include <boost/geometry/algorithms/num_points.hpp>
|
||||
#include <boost/geometry/algorithms/unique.hpp>
|
||||
#include <boost/geometry/extensions/algorithms/connect.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt_multi.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
|
||||
#include <boost/geometry/multi/algorithms/area.hpp>
|
||||
#include <boost/geometry/multi/algorithms/length.hpp>
|
||||
#include <boost/geometry/multi/algorithms/num_points.hpp>
|
||||
|
@ -23,7 +23,7 @@
|
||||
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
#include <boost/geometry/multi/algorithms/for_each.hpp>
|
||||
|
||||
@ -302,6 +302,14 @@ void test_all()
|
||||
test_one<multi_polygon, polygon>("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<multi_polygon, polygon>("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<polygon, polygon>("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);
|
||||
}
|
||||
|
||||
|
||||
|
@ -18,15 +18,15 @@
|
||||
#include <boost/geometry/algorithms/area.hpp>
|
||||
#include <boost/geometry/algorithms/num_points.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/write_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
|
||||
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
|
||||
#include <boost/geometry/util/as_range.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/stream_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/stream_wkt.hpp>
|
||||
|
||||
|
||||
template <typename Geometry>
|
@ -20,7 +20,7 @@
|
||||
#include <boost/geometry/extensions/algorithms/mark_spikes.hpp>
|
||||
#include <boost/geometry/extensions/algorithms/remove_marked.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
||||
#include <boost/geometry/util/write_dsv.hpp>
|
||||
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
|
||||
#include <test_common/test_point.hpp>
|
||||
|
@ -16,7 +16,7 @@
|
||||
#include <boost/geometry/algorithms/num_points.hpp>
|
||||
#include <boost/geometry/algorithms/unique.hpp>
|
||||
#include <boost/geometry/extensions/algorithms/offset.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt_multi.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
|
||||
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
#include <boost/geometry/extensions/algorithms/remove_holes_if.hpp>
|
||||
#include <boost/geometry/algorithms/make.hpp>
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/extensions/algorithms/selected.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
|
||||
|
||||
#include <test_common/test_point.hpp>
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
#include <boost/geometry/algorithms/equals.hpp>
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkb/read_wkb.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkb/utility.hpp>
|
||||
|
||||
|
@ -29,8 +29,8 @@
|
||||
#include <boost/geometry/multi/geometries/multi_linestring.hpp>
|
||||
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt_multi.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/write_wkt_multi.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp>
|
||||
|
||||
|
||||
template <typename T>
|
||||
|
@ -24,8 +24,8 @@
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
#include <boost/geometry/core/point_type.hpp>
|
||||
#include <boost/geometry/core/topological_dimension.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/write_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
|
||||
|
||||
|
||||
template <typename G>
|
||||
|
@ -10,7 +10,7 @@
|
||||
#include <geometry_test_common.hpp>
|
||||
|
||||
#include <boost/geometry/algorithms/transform.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/stream_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/stream_wkt.hpp>
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/latlong/point_ll.hpp>
|
||||
|
@ -12,7 +12,7 @@
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
|
||||
|
||||
template <typename Geometry>
|
||||
|
@ -8,13 +8,13 @@
|
||||
#include <geometry_test_common.hpp>
|
||||
|
||||
|
||||
#include<boost/geometry/geometry.hpp>
|
||||
#include<boost/geometry/geometries/adapted/boost_polygon/point.hpp>
|
||||
#include<boost/geometry/geometries/adapted/boost_polygon/box.hpp>
|
||||
#include<boost/geometry/geometries/adapted/boost_polygon/ring.hpp>
|
||||
#include<boost/geometry/geometries/adapted/boost_polygon/polygon.hpp>
|
||||
#include<boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include<iostream>
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/geometries/adapted/boost_polygon/point.hpp>
|
||||
#include <boost/geometry/geometries/adapted/boost_polygon/box.hpp>
|
||||
#include <boost/geometry/geometries/adapted/boost_polygon/ring.hpp>
|
||||
#include <boost/geometry/geometries/adapted/boost_polygon/polygon.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
#include <iostream>
|
||||
|
||||
template <typename T>
|
||||
void fill_polygon_with_two_holes(boost::polygon::polygon_with_holes_data<T>& boost_polygon_polygon)
|
||||
|
@ -8,12 +8,12 @@
|
||||
#include <geometry_test_common.hpp>
|
||||
|
||||
|
||||
#include<boost/geometry/geometry.hpp>
|
||||
#include<boost/geometry/geometries/adapted/boost_polygon/point.hpp>
|
||||
#include<boost/geometry/geometries/adapted/boost_polygon/box.hpp>
|
||||
#include<boost/geometry/geometries/adapted/boost_polygon/ring.hpp>
|
||||
#include<boost/geometry/geometries/adapted/boost_polygon/polygon.hpp>
|
||||
#include<boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/geometry.hpp>
|
||||
#include <boost/geometry/geometries/adapted/boost_polygon/point.hpp>
|
||||
#include <boost/geometry/geometries/adapted/boost_polygon/box.hpp>
|
||||
#include <boost/geometry/geometries/adapted/boost_polygon/ring.hpp>
|
||||
#include <boost/geometry/geometries/adapted/boost_polygon/polygon.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
#include<iostream>
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
||||
#include <boost/geometry/geometries/adapted/boost_range/sliced.hpp>
|
||||
#include <boost/geometry/geometries/adapted/boost_range/uniqued.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||
|
||||
#include <sstream>
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
#include <boost/geometry/core/coordinate_type.hpp>
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/iterators/box_iterator.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
|
||||
#include <test_geometries/custom_segment.hpp>
|
||||
|
||||
|
@ -16,7 +16,7 @@
|
||||
#include <boost/geometry/iterators/circular_iterator.hpp>
|
||||
|
||||
#include <boost/geometry/core/coordinate_type.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
|
||||
|
||||
|
@ -16,7 +16,7 @@
|
||||
#include <boost/geometry/iterators/closing_iterator.hpp>
|
||||
|
||||
#include <boost/geometry/core/coordinate_type.hpp>
|
||||
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user