Subject: [Boost-commit] svn:boost r69906 - in trunk/libs/geometry: doc doc/doxy/doxygen_input/sourcecode doc/src/docutils/tools/implementation_status doc/src/examples/algorithms example example/experimental example/extensions/gis/io/shapelib example/extensions/gis/projections example/with_external_libs test/algorithms test/algorithms/detail/sections test/algorithms/overlay test/algorithms/overlay/robustness test/core test/extensions/algorithms test/extensions/algorithms/buffer test/extensions/gis/io/wkb test/extensions/gis/io/wkt test/extensions/gis/latlong test/extensions/nsphere test/geometries test/iterators test/multi/algorithms test/multi/algorithms/overlay test/ranges test/strategies test/util test/views
From: barend.gehrels_at_[hidden]
Date: 2011-03-12 18:54:58
Author: barendgehrels
Date: 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
New Revision: 69906
URL: http://svn.boost.org/trac/boost/changeset/69906
Log:
Moved wkt (used in nearly all tests) from extension to domains tree for release
Added:
trunk/libs/geometry/doc/acknowledgments.qbk (contents, props changed)
trunk/libs/geometry/doc/imports.qbk (contents, props changed)
trunk/libs/geometry/test/extensions/algorithms/is_convex.cpp
- copied, changed from r69889, /trunk/libs/geometry/test/algorithms/is_convex.cpp
trunk/libs/geometry/test/extensions/algorithms/is_convex.vcproj
- copied unchanged from r69889, /trunk/libs/geometry/test/algorithms/is_convex.vcproj
Removed:
trunk/libs/geometry/test/algorithms/is_convex.cpp
trunk/libs/geometry/test/algorithms/is_convex.vcproj
Text files modified:
trunk/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_1.cpp | 2
trunk/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp | 2
trunk/libs/geometry/doc/geometry.qbk | 54 +++--------------------
trunk/libs/geometry/doc/src/docutils/tools/implementation_status/implementation_status.hpp | 2
trunk/libs/geometry/doc/src/examples/algorithms/area.cpp | 2
trunk/libs/geometry/doc/src/examples/algorithms/area_with_strategy.cpp | 2
trunk/libs/geometry/doc/src/examples/algorithms/difference.cpp | 2
trunk/libs/geometry/doc/src/examples/algorithms/difference_inserter.cpp | 2
trunk/libs/geometry/doc/src/examples/algorithms/envelope.cpp | 2
trunk/libs/geometry/doc/src/examples/algorithms/for_each_point.cpp | 2
trunk/libs/geometry/doc/src/examples/algorithms/for_each_point_const.cpp | 2
trunk/libs/geometry/doc/src/examples/algorithms/intersection_ls_ls_point.cpp | 2
trunk/libs/geometry/doc/src/examples/algorithms/intersection_poly_poly.cpp | 2
trunk/libs/geometry/doc/src/examples/algorithms/intersection_segment.cpp | 2
trunk/libs/geometry/doc/src/examples/algorithms/intersects_linestring.cpp | 2
trunk/libs/geometry/doc/src/examples/algorithms/intersects_segment.cpp | 2
trunk/libs/geometry/doc/src/examples/algorithms/length.cpp | 2
trunk/libs/geometry/doc/src/examples/algorithms/num_geometries.cpp | 2
trunk/libs/geometry/doc/src/examples/algorithms/num_interior_rings.cpp | 2
trunk/libs/geometry/doc/src/examples/algorithms/num_points.cpp | 2
trunk/libs/geometry/doc/src/examples/algorithms/simplify_inserter_with_strategy.cpp | 4
trunk/libs/geometry/doc/src/examples/algorithms/sym_difference.cpp | 2
trunk/libs/geometry/doc/src/examples/algorithms/union.cpp | 2
trunk/libs/geometry/example/06_b_transformation_example.cpp | 2
trunk/libs/geometry/example/07_a_graph_route_example.cpp | 4 -
trunk/libs/geometry/example/07_b_graph_route_example.cpp | 4 -
trunk/libs/geometry/example/experimental/geometry_of.cpp | 2
trunk/libs/geometry/example/extensions/gis/io/shapelib/shapelib.cpp | 2
trunk/libs/geometry/example/extensions/gis/projections/p01_projection_example.cpp | 2
trunk/libs/geometry/example/extensions/gis/projections/p02_projfactory_example.cpp | 2
trunk/libs/geometry/example/extensions/gis/projections/p03_projmap_example.cpp | 2
trunk/libs/geometry/example/with_external_libs/x02_gd_example.cpp | 2
trunk/libs/geometry/example/with_external_libs/x03_a_soci_example.cpp | 2
trunk/libs/geometry/example/with_external_libs/x03_b_soci_example.cpp | 2
trunk/libs/geometry/example/with_external_libs/x03_c_soci_example.cpp | 2
trunk/libs/geometry/example/with_external_libs/x03_d_soci_example.cpp | 2
trunk/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp | 4
trunk/libs/geometry/example/with_external_libs/x05_shapelib_example.cpp | 2
trunk/libs/geometry/example/with_external_libs/x06_qt_world_mapper.cpp | 2
trunk/libs/geometry/test/algorithms/correct.cpp | 4
trunk/libs/geometry/test/algorithms/detail/sections/range_by_section.cpp | 2
trunk/libs/geometry/test/algorithms/detail/sections/sectionalize.cpp | 4
trunk/libs/geometry/test/algorithms/disjoint.cpp | 2
trunk/libs/geometry/test/algorithms/make.cpp | 2
trunk/libs/geometry/test/algorithms/overlay/assemble.cpp | 10 ++--
trunk/libs/geometry/test/algorithms/overlay/ccw_traverse.cpp | 2
trunk/libs/geometry/test/algorithms/overlay/dissolver.cpp | 2
trunk/libs/geometry/test/algorithms/overlay/overlay_common.hpp | 4
trunk/libs/geometry/test/algorithms/overlay/robustness/interior_triangles.cpp | 2
trunk/libs/geometry/test/algorithms/overlay/robustness/recursive_polygons.cpp | 4
trunk/libs/geometry/test/algorithms/overlay/robustness/star_comb.cpp | 2
trunk/libs/geometry/test/algorithms/overlay/robustness/test_overlay_p_q.hpp | 10 ++--
trunk/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp | 4
trunk/libs/geometry/test/algorithms/overlay/split_rings.cpp | 4
trunk/libs/geometry/test/algorithms/overlay/traverse_gmp.cpp | 2
trunk/libs/geometry/test/algorithms/test_area.hpp | 6 +-
trunk/libs/geometry/test/algorithms/test_centroid.hpp | 2
trunk/libs/geometry/test/algorithms/test_combine.hpp | 2
trunk/libs/geometry/test/algorithms/test_convex_hull.hpp | 4
trunk/libs/geometry/test/algorithms/test_difference.hpp | 6 +-
trunk/libs/geometry/test/algorithms/test_distance.hpp | 2
trunk/libs/geometry/test/algorithms/test_envelope.hpp | 2
trunk/libs/geometry/test/algorithms/test_equals.hpp | 2
trunk/libs/geometry/test/algorithms/test_for_each.hpp | 2
trunk/libs/geometry/test/algorithms/test_intersection.hpp | 6 +-
trunk/libs/geometry/test/algorithms/test_intersects.hpp | 2
trunk/libs/geometry/test/algorithms/test_length.hpp | 2
trunk/libs/geometry/test/algorithms/test_overlaps.hpp | 2
trunk/libs/geometry/test/algorithms/test_perimeter.hpp | 2
trunk/libs/geometry/test/algorithms/test_reverse.hpp | 2
trunk/libs/geometry/test/algorithms/test_simplify.hpp | 2
trunk/libs/geometry/test/algorithms/test_union.hpp | 2
trunk/libs/geometry/test/algorithms/test_unique.hpp | 2
trunk/libs/geometry/test/algorithms/test_within.hpp | 2
trunk/libs/geometry/test/algorithms/transform.cpp | 2
trunk/libs/geometry/test/algorithms/union.cpp | 18 ++++++++
trunk/libs/geometry/test/core/ring.cpp | 2
trunk/libs/geometry/test/extensions/algorithms/buffer/test_buffer.hpp | 90 ++++++++++++++++++++--------------------
trunk/libs/geometry/test/extensions/algorithms/connect.cpp | 2
trunk/libs/geometry/test/extensions/algorithms/dissolve.cpp | 16 +++++-
trunk/libs/geometry/test/extensions/algorithms/is_convex.cpp | 6 +-
trunk/libs/geometry/test/extensions/algorithms/mark_spikes.cpp | 4
trunk/libs/geometry/test/extensions/algorithms/midpoints.cpp | 2
trunk/libs/geometry/test/extensions/algorithms/offset.cpp | 2
trunk/libs/geometry/test/extensions/algorithms/remove_holes_if.cpp | 2
trunk/libs/geometry/test/extensions/algorithms/selected.cpp | 2
trunk/libs/geometry/test/extensions/gis/io/wkb/read_wkb.cpp | 2
trunk/libs/geometry/test/extensions/gis/io/wkt/multi_wkt.cpp | 4
trunk/libs/geometry/test/extensions/gis/io/wkt/wkt.cpp | 4
trunk/libs/geometry/test/extensions/gis/latlong/point_ll.cpp | 2
trunk/libs/geometry/test/extensions/nsphere/within.cpp | 2
trunk/libs/geometry/test/geometries/boost_polygon.cpp | 18 ++++----
trunk/libs/geometry/test/geometries/boost_polygon_overlay.cpp | 14 +++---
trunk/libs/geometry/test/geometries/boost_range.cpp | 12 ++--
trunk/libs/geometry/test/iterators/box_iterator.cpp | 2
trunk/libs/geometry/test/iterators/circular_iterator.cpp | 2
trunk/libs/geometry/test/iterators/closing_iterator.cpp | 2
trunk/libs/geometry/test/iterators/ever_circling_iterator.cpp | 2
trunk/libs/geometry/test/iterators/segment_range_iterator.cpp | 2
trunk/libs/geometry/test/iterators/segment_returning_iterator.cpp | 2
trunk/libs/geometry/test/multi/algorithms/multi_area.cpp | 2
trunk/libs/geometry/test/multi/algorithms/multi_centroid.cpp | 2
trunk/libs/geometry/test/multi/algorithms/multi_convex_hull.cpp | 4
trunk/libs/geometry/test/multi/algorithms/multi_correct.cpp | 2
trunk/libs/geometry/test/multi/algorithms/multi_difference.cpp | 2
trunk/libs/geometry/test/multi/algorithms/multi_distance.cpp | 4
trunk/libs/geometry/test/multi/algorithms/multi_envelope.cpp | 2
trunk/libs/geometry/test/multi/algorithms/multi_equals.cpp | 2
trunk/libs/geometry/test/multi/algorithms/multi_for_each.cpp | 2
trunk/libs/geometry/test/multi/algorithms/multi_intersection.cpp | 2
trunk/libs/geometry/test/multi/algorithms/multi_length.cpp | 2
trunk/libs/geometry/test/multi/algorithms/multi_num_geometries.cpp | 2
trunk/libs/geometry/test/multi/algorithms/multi_num_interior_rings.cpp | 2
trunk/libs/geometry/test/multi/algorithms/multi_num_points.cpp | 2
trunk/libs/geometry/test/multi/algorithms/multi_perimeter.cpp | 2
trunk/libs/geometry/test/multi/algorithms/multi_reverse.cpp | 2
trunk/libs/geometry/test/multi/algorithms/multi_simplify.cpp | 2
trunk/libs/geometry/test/multi/algorithms/multi_transform.cpp | 24 +++++-----
trunk/libs/geometry/test/multi/algorithms/multi_union.cpp | 2
trunk/libs/geometry/test/multi/algorithms/multi_unique.cpp | 2
trunk/libs/geometry/test/multi/algorithms/multi_within.cpp | 2
trunk/libs/geometry/test/multi/algorithms/overlay/multi_overlay_common.hpp | 2
trunk/libs/geometry/test/multi/algorithms/overlay/multi_traverse.cpp | 2
trunk/libs/geometry/test/ranges/box_range.cpp | 2
trunk/libs/geometry/test/ranges/segment_range.cpp | 2
trunk/libs/geometry/test/strategies/projected_point.cpp | 10 ++--
trunk/libs/geometry/test/strategies/within.cpp | 2
trunk/libs/geometry/test/util/as_range.cpp | 2
trunk/libs/geometry/test/util/write_dsv.cpp | 2
trunk/libs/geometry/test/views/closeable_view.cpp | 2
trunk/libs/geometry/test/views/reversible_closeable.cpp | 2
trunk/libs/geometry/test/views/reversible_view.cpp | 2
132 files changed, 275 insertions(+), 291 deletions(-)
Added: trunk/libs/geometry/doc/acknowledgments.qbk
==============================================================================
--- (empty file)
+++ trunk/libs/geometry/doc/acknowledgments.qbk 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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_at_[hidden])
+ 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]
+
Modified: trunk/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_1.cpp
==============================================================================
--- trunk/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_1.cpp (original)
+++ trunk/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_1.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -22,7 +22,7 @@
#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
Modified: trunk/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp
==============================================================================
--- trunk/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp (original)
+++ trunk/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -16,7 +16,7 @@
#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>
Modified: trunk/libs/geometry/doc/geometry.qbk
==============================================================================
--- trunk/libs/geometry/doc/geometry.qbk (original)
+++ trunk/libs/geometry/doc/geometry.qbk 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -63,54 +63,16 @@
[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]
-
-[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]
+* 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]
+
+[include imports.qbk]
[include introduction.qbk]
[include quickstart.qbk]
Added: trunk/libs/geometry/doc/imports.qbk
==============================================================================
--- (empty file)
+++ trunk/libs/geometry/doc/imports.qbk 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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_at_[hidden])
+ 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]
Modified: trunk/libs/geometry/doc/src/docutils/tools/implementation_status/implementation_status.hpp
==============================================================================
--- trunk/libs/geometry/doc/src/docutils/tools/implementation_status/implementation_status.hpp (original)
+++ trunk/libs/geometry/doc/src/docutils/tools/implementation_status/implementation_status.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/doc/src/examples/algorithms/area.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/area.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/area.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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 >*/
Modified: trunk/libs/geometry/doc/src/examples/algorithms/area_with_strategy.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/area_with_strategy.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/area_with_strategy.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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 >*/
Modified: trunk/libs/geometry/doc/src/examples/algorithms/difference.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/difference.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/difference.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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" /*->*/
Modified: trunk/libs/geometry/doc/src/examples/algorithms/difference_inserter.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/difference_inserter.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/difference_inserter.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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" /*->*/
Modified: trunk/libs/geometry/doc/src/examples/algorithms/envelope.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/envelope.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/envelope.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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" /*->*/
Modified: trunk/libs/geometry/doc/src/examples/algorithms/for_each_point.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/for_each_point.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/for_each_point.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/doc/src/examples/algorithms/for_each_point_const.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/for_each_point_const.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/for_each_point_const.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/doc/src/examples/algorithms/intersection_ls_ls_point.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/intersection_ls_ls_point.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/intersection_ls_ls_point.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/doc/src/examples/algorithms/intersection_poly_poly.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/intersection_poly_poly.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/intersection_poly_poly.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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" /*->*/
Modified: trunk/libs/geometry/doc/src/examples/algorithms/intersection_segment.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/intersection_segment.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/intersection_segment.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/doc/src/examples/algorithms/intersects_linestring.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/intersects_linestring.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/intersects_linestring.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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()
{
Modified: trunk/libs/geometry/doc/src/examples/algorithms/intersects_segment.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/intersects_segment.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/intersects_segment.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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()
{
Modified: trunk/libs/geometry/doc/src/examples/algorithms/length.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/length.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/length.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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()
Modified: trunk/libs/geometry/doc/src/examples/algorithms/num_geometries.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/num_geometries.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/num_geometries.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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()
Modified: trunk/libs/geometry/doc/src/examples/algorithms/num_interior_rings.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/num_interior_rings.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/num_interior_rings.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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()
Modified: trunk/libs/geometry/doc/src/examples/algorithms/num_points.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/num_points.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/num_points.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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()
Modified: trunk/libs/geometry/doc/src/examples/algorithms/simplify_inserter_with_strategy.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/simplify_inserter_with_strategy.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/simplify_inserter_with_strategy.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/doc/src/examples/algorithms/sym_difference.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/sym_difference.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/sym_difference.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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" /*->*/
Modified: trunk/libs/geometry/doc/src/examples/algorithms/union.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/union.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/union.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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" /*->*/
Modified: trunk/libs/geometry/example/06_b_transformation_example.cpp
==============================================================================
--- trunk/libs/geometry/example/06_b_transformation_example.cpp (original)
+++ trunk/libs/geometry/example/06_b_transformation_example.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/example/07_a_graph_route_example.cpp
==============================================================================
--- trunk/libs/geometry/example/07_a_graph_route_example.cpp (original)
+++ trunk/libs/geometry/example/07_a_graph_route_example.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/example/07_b_graph_route_example.cpp
==============================================================================
--- trunk/libs/geometry/example/07_b_graph_route_example.cpp (original)
+++ trunk/libs/geometry/example/07_b_graph_route_example.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/example/experimental/geometry_of.cpp
==============================================================================
--- trunk/libs/geometry/example/experimental/geometry_of.cpp (original)
+++ trunk/libs/geometry/example/experimental/geometry_of.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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;
Modified: trunk/libs/geometry/example/extensions/gis/io/shapelib/shapelib.cpp
==============================================================================
--- trunk/libs/geometry/example/extensions/gis/io/shapelib/shapelib.cpp (original)
+++ trunk/libs/geometry/example/extensions/gis/io/shapelib/shapelib.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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.
Modified: trunk/libs/geometry/example/extensions/gis/projections/p01_projection_example.cpp
==============================================================================
--- trunk/libs/geometry/example/extensions/gis/projections/p01_projection_example.cpp (original)
+++ trunk/libs/geometry/example/extensions/gis/projections/p01_projection_example.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/example/extensions/gis/projections/p02_projfactory_example.cpp
==============================================================================
--- trunk/libs/geometry/example/extensions/gis/projections/p02_projfactory_example.cpp (original)
+++ trunk/libs/geometry/example/extensions/gis/projections/p02_projfactory_example.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/example/extensions/gis/projections/p03_projmap_example.cpp
==============================================================================
--- trunk/libs/geometry/example/extensions/gis/projections/p03_projmap_example.cpp (original)
+++ trunk/libs/geometry/example/extensions/gis/projections/p03_projmap_example.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/example/with_external_libs/x02_gd_example.cpp
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x02_gd_example.cpp (original)
+++ trunk/libs/geometry/example/with_external_libs/x02_gd_example.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/example/with_external_libs/x03_a_soci_example.cpp
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x03_a_soci_example.cpp (original)
+++ trunk/libs/geometry/example/with_external_libs/x03_a_soci_example.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/example/with_external_libs/x03_b_soci_example.cpp
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x03_b_soci_example.cpp (original)
+++ trunk/libs/geometry/example/with_external_libs/x03_b_soci_example.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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
Modified: trunk/libs/geometry/example/with_external_libs/x03_c_soci_example.cpp
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x03_c_soci_example.cpp (original)
+++ trunk/libs/geometry/example/with_external_libs/x03_c_soci_example.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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
Modified: trunk/libs/geometry/example/with_external_libs/x03_d_soci_example.cpp
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x03_d_soci_example.cpp (original)
+++ trunk/libs/geometry/example/with_external_libs/x03_d_soci_example.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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()
{
Modified: trunk/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp (original)
+++ trunk/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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)
Modified: trunk/libs/geometry/example/with_external_libs/x05_shapelib_example.cpp
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x05_shapelib_example.cpp (original)
+++ trunk/libs/geometry/example/with_external_libs/x05_shapelib_example.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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;
Modified: trunk/libs/geometry/example/with_external_libs/x06_qt_world_mapper.cpp
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x06_qt_world_mapper.cpp (original)
+++ trunk/libs/geometry/example/with_external_libs/x06_qt_world_mapper.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/correct.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/correct.cpp (original)
+++ trunk/libs/geometry/test/algorithms/correct.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/detail/sections/range_by_section.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/detail/sections/range_by_section.cpp (original)
+++ trunk/libs/geometry/test/algorithms/detail/sections/range_by_section.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/detail/sections/sectionalize.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/detail/sections/sectionalize.cpp (original)
+++ trunk/libs/geometry/test/algorithms/detail/sections/sectionalize.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/disjoint.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/disjoint.cpp (original)
+++ trunk/libs/geometry/test/algorithms/disjoint.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Deleted: trunk/libs/geometry/test/algorithms/is_convex.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/is_convex.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
+++ (empty file)
@@ -1,120 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
-// 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)
-
-#include <cstddef>
-#include <string>
-
-
-#include <geometry_test_common.hpp>
-
-#include <boost/geometry/algorithms/convex_hull.hpp>
-
-
-#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/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>
-
-
-template <typename Geometry>
-void test_geometry(std::string const& wkt,
- std::size_t size_original, std::size_t size_hull,
- double expected_area)
-{
-
- Geometry geometry;
- bg::read_wkt(wkt, geometry);
-
- typedef typename bg::point_type<Geometry>::type P;
- typename bg::strategy_side
- <
- typename bg::cs_tag<P>::type
- >::type side;
-
- boost::ignore_unused_variable_warning(side);
-
- typedef typename bg::range_type<Geometry>::type range_type;
- typedef typename boost::range_const_iterator<range_type>::type iterator;
-
- range_type const& range = bg::as_range<range_type>(geometry);
-
- iterator it1 = boost::begin(range);
- iterator it3 = it1++;
- iterator it2 = it1++;
-
- for (;
- it2 != boost::end(range);
- ++it1, ++it2, ++it3)
- {
- // Last/closing point
- if (it1 == boost::end(range))
- {
- it1 = boost::begin(range) + 1;
- }
- int s = side.apply(*it1, *it2, *it3);
-
- if (s != 1)
- {
- std::cout << "NOT CONVEX!";
- }
- if (s == 0)
- {
- std::cout << " COLLINEAR!";
- }
-
- std::cout
- << " " << (*it3)
- << " " << bg::wkt(*it2)
- << " " << bg::wkt(*it1)
- << " " << s
- << std::endl;
- }
-
- std::cout << bg::area(geometry) << " " << bg::wkt(geometry) << std::endl;
-}
-
-template <typename P>
-void test_all()
-{
- // rectangular, with concavity
- test_geometry<bg::model::polygon<P> >(
- "polygon((1 1, 1 4, 3 4, 3 3, 4 3, 4 4, 5 4, 5 1, 1 1))",
- 9, 5, 12.0);
-
-
- // concavity at start/closing point
- test_geometry<bg::model::polygon<P> >(
- "polygon((1 1,0 2,3 3,1 0,1 1))", 9, 5, 12.0);
-
- // from sample polygon, with concavity
- test_geometry<bg::model::polygon<P> >(
- "polygon((2.0 1.3, 2.4 1.7, 2.8 1.8, 3.4 1.2, 3.7 1.6,3.4 2.0, 4.1 3.0"
- ", 5.3 2.6, 5.4 1.2, 4.9 0.8, 2.9 0.7,2.0 1.3))",
- 12, 8, 5.245);
-}
-
-int test_main(int, char* [])
-{
- //test_all<bg::model::d2::point_xy<int> >();
- //test_all<bg::model::d2::point_xy<float> >();
- test_all<bg::model::d2::point_xy<double> >();
-
-#if defined(HAVE_TTMATH)
- test_all<bg::model::d2::point_xy<ttmath_big> >();
-#endif
-
- return 0;
-}
Deleted: trunk/libs/geometry/test/algorithms/is_convex.vcproj
==============================================================================
--- trunk/libs/geometry/test/algorithms/is_convex.vcproj 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
+++ (empty file)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="is_convex"
- ProjectGUID="{65EAD0CE-1AC7-4997-B618-55712AD7D8EA}"
- RootNamespace="is_convex"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\is_convex"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- ExceptionHandling="2"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\is_convex"
- ConfigurationType="1"
- InheritedPropertySheets="..\boost.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- ExceptionHandling="2"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\is_convex.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Modified: trunk/libs/geometry/test/algorithms/make.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/make.cpp (original)
+++ trunk/libs/geometry/test/algorithms/make.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/overlay/assemble.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/assemble.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/assemble.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
@@ -86,9 +86,9 @@
|| 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);
}
Modified: trunk/libs/geometry/test/algorithms/overlay/ccw_traverse.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/ccw_traverse.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/ccw_traverse.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/overlay/dissolver.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/dissolver.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/dissolver.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/overlay/overlay_common.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/overlay_common.hpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/overlay_common.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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)
Modified: trunk/libs/geometry/test/algorithms/overlay/robustness/interior_triangles.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/robustness/interior_triangles.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/robustness/interior_triangles.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/overlay/robustness/recursive_polygons.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/robustness/recursive_polygons.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/robustness/recursive_polygons.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
@@ -183,7 +183,7 @@
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;
Modified: trunk/libs/geometry/test/algorithms/overlay/robustness/star_comb.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/robustness/star_comb.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/robustness/star_comb.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/overlay/robustness/test_overlay_p_q.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/robustness/test_overlay_p_q.hpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/robustness/test_overlay_p_q.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
@@ -83,7 +83,7 @@
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 @@
if (settings.also_difference)
{
- std::cout
+ std::cout
<< " area d1: " << area_d1
<< " area d2: " << area_d2;
}
@@ -153,12 +153,12 @@
{
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");
}
}
Modified: trunk/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/overlay/split_rings.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/split_rings.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/split_rings.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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)
Modified: trunk/libs/geometry/test/algorithms/overlay/traverse_gmp.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/traverse_gmp.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/traverse_gmp.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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
Modified: trunk/libs/geometry/test/algorithms/test_area.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_area.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_area.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -14,11 +14,11 @@
#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>
-void test_area(Geometry const& geometry,
+void test_area(Geometry const& geometry,
typename bg::area_result<Geometry>::type expected_area)
{
typename bg::area_result<Geometry>::type area = bg::area(geometry);
@@ -55,7 +55,7 @@
}
template <typename Geometry>
-void test_geometry(std::string const& wkt,
+void test_geometry(std::string const& wkt,
typename bg::area_result<Geometry>::type expected_area)
{
Geometry geometry;
Modified: trunk/libs/geometry/test/algorithms/test_centroid.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_centroid.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_centroid.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/test_combine.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_combine.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_combine.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/test_convex_hull.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_convex_hull.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_convex_hull.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/test_difference.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_difference.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_difference.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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)
@@ -96,7 +96,7 @@
{
boost::copy(array_with_one_empty_geometry, bg::difference_inserter<OutputType>(g1, g2, std::back_inserter(inserted)));
}
-
+
BOOST_CHECK_EQUAL(boost::size(clip), boost::size(inserted) - 1);
}
#endif
@@ -150,7 +150,7 @@
for (typename std::vector<OutputType>::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");
}
Modified: trunk/libs/geometry/test/algorithms/test_distance.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_distance.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_distance.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/test_envelope.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_envelope.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_envelope.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/test_equals.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_equals.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_equals.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/test_for_each.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_for_each.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_for_each.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/test_intersection.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_intersection.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_intersection.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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)
@@ -36,7 +36,7 @@
template <typename OutputType, typename CalculationType, typename G1, typename G2>
-typename bg::area_result<G1>::type test_intersection(std::string const& caseid,
+typename bg::area_result<G1>::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 @@
}
template <typename OutputType, typename G1, typename G2>
-typename bg::area_result<G1>::type test_one(std::string const& caseid,
+typename bg::area_result<G1>::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,
Modified: trunk/libs/geometry/test/algorithms/test_intersects.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_intersects.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_intersects.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/test_length.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_length.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_length.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/test_overlaps.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_overlaps.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_overlaps.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/test_perimeter.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_perimeter.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_perimeter.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/test_reverse.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_reverse.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_reverse.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/test_simplify.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_simplify.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_simplify.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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
Modified: trunk/libs/geometry/test/algorithms/test_union.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_union.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_union.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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)
Modified: trunk/libs/geometry/test/algorithms/test_unique.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_unique.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_unique.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/test_within.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_within.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_within.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/transform.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/transform.cpp (original)
+++ trunk/libs/geometry/test/algorithms/transform.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/algorithms/union.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/union.cpp (original)
+++ trunk/libs/geometry/test/algorithms/union.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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);
Modified: trunk/libs/geometry/test/core/ring.cpp
==============================================================================
--- trunk/libs/geometry/test/core/ring.cpp (original)
+++ trunk/libs/geometry/test/core/ring.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/extensions/algorithms/buffer/test_buffer.hpp
==============================================================================
--- trunk/libs/geometry/test/extensions/algorithms/buffer/test_buffer.hpp (original)
+++ trunk/libs/geometry/test/extensions/algorithms/buffer/test_buffer.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
@@ -110,32 +110,32 @@
> inserter_type;
- /***/
+ /***/
typedef bg::box<point_type> box_type;
typedef bg::sections<box_type, 1> sections_type;
sections_type sections;
bg::sectionalize(geometry, sections);
- std::vector<GeometryOut> sections_buffered;
+ std::vector<GeometryOut> 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<Geometry>::type const
- >::type iterator_type;
+ typedef typename boost::range_iterator
+ <
+ typename bg::range_type<Geometry>::type const
+ >::type iterator_type;
- inserter_type inserter(sections_buffered);
+ inserter_type inserter(sections_buffered);
- iterator_type begin, end;
- typedef std::pair<iterator_type, iterator_type> section_range;
- //bg::get_section(geometry, section, begin, end);
+ iterator_type begin, end;
+ typedef std::pair<iterator_type, iterator_type> section_range;
+ //bg::get_section(geometry, section, begin, end);
typedef bg::closeable_view
<
@@ -145,41 +145,41 @@
view_type view = bg::get_full_section<view_type>(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<GeometryOut> sections_buffered_unioned;
BOOST_FOREACH(GeometryOut const& p, sections_buffered)
{
- if (sections_buffered_unioned.empty())
- {
- bg::union_inserter<GeometryOut>(geometry, p, std::back_inserter(sections_buffered_unioned));
- }
- else if (boost::size(sections_buffered_unioned) == 1)
- {
- std::vector<GeometryOut> step;
- bg::union_inserter<GeometryOut>(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<GeometryOut>(p, sbu, sections_buffered_unioned);
- }
- }
+ if (sections_buffered_unioned.empty())
+ {
+ bg::union_inserter<GeometryOut>(geometry, p, std::back_inserter(sections_buffered_unioned));
+ }
+ else if (boost::size(sections_buffered_unioned) == 1)
+ {
+ std::vector<GeometryOut> step;
+ bg::union_inserter<GeometryOut>(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<GeometryOut>(p, sbu, sections_buffered_unioned);
+ }
+ }
}
- /***/
+ /***/
std::vector<GeometryOut> buffered;
@@ -236,8 +236,8 @@
#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 @@
#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 @@
}
#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
Modified: trunk/libs/geometry/test/extensions/algorithms/connect.cpp
==============================================================================
--- trunk/libs/geometry/test/extensions/algorithms/connect.cpp (original)
+++ trunk/libs/geometry/test/extensions/algorithms/connect.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/extensions/algorithms/dissolve.cpp
==============================================================================
--- trunk/libs/geometry/test/extensions/algorithms/dissolve.cpp (original)
+++ trunk/libs/geometry/test/extensions/algorithms/dissolve.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
@@ -50,7 +50,7 @@
map_segment<Mapper>& operator=(map_segment<Mapper> const& other)
{
- if(this != &other)
+ if(this != &other)
{
this->m_mapper = other.m_mapper;
}
@@ -126,12 +126,12 @@
std::ofstream svg(filename.str().c_str());
- typedef
+ typedef
bg::svg_mapper
<
typename bg::point_type<Geometry>::type
> mapper_type;
-
+
mapper_type mapper(svg, 500, 500);
mapper.add(geometry);
@@ -302,6 +302,14 @@
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);
}
Copied: trunk/libs/geometry/test/extensions/algorithms/is_convex.cpp (from r69889, /trunk/libs/geometry/test/algorithms/is_convex.cpp)
==============================================================================
--- /trunk/libs/geometry/test/algorithms/is_convex.cpp (original)
+++ trunk/libs/geometry/test/extensions/algorithms/is_convex.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/extensions/algorithms/mark_spikes.cpp
==============================================================================
--- trunk/libs/geometry/test/extensions/algorithms/mark_spikes.cpp (original)
+++ trunk/libs/geometry/test/extensions/algorithms/mark_spikes.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
@@ -112,7 +112,7 @@
"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.788
00964355, 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.82200622
559 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<mp>("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 560
968.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 560
968.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.
Modified: trunk/libs/geometry/test/extensions/algorithms/midpoints.cpp
==============================================================================
--- trunk/libs/geometry/test/extensions/algorithms/midpoints.cpp (original)
+++ trunk/libs/geometry/test/extensions/algorithms/midpoints.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/extensions/algorithms/offset.cpp
==============================================================================
--- trunk/libs/geometry/test/extensions/algorithms/offset.cpp (original)
+++ trunk/libs/geometry/test/extensions/algorithms/offset.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/extensions/algorithms/remove_holes_if.cpp
==============================================================================
--- trunk/libs/geometry/test/extensions/algorithms/remove_holes_if.cpp (original)
+++ trunk/libs/geometry/test/extensions/algorithms/remove_holes_if.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/extensions/algorithms/selected.cpp
==============================================================================
--- trunk/libs/geometry/test/extensions/algorithms/selected.cpp (original)
+++ trunk/libs/geometry/test/extensions/algorithms/selected.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/extensions/gis/io/wkb/read_wkb.cpp
==============================================================================
--- trunk/libs/geometry/test/extensions/gis/io/wkb/read_wkb.cpp (original)
+++ trunk/libs/geometry/test/extensions/gis/io/wkb/read_wkb.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/extensions/gis/io/wkt/multi_wkt.cpp
==============================================================================
--- trunk/libs/geometry/test/extensions/gis/io/wkt/multi_wkt.cpp (original)
+++ trunk/libs/geometry/test/extensions/gis/io/wkt/multi_wkt.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/extensions/gis/io/wkt/wkt.cpp
==============================================================================
--- trunk/libs/geometry/test/extensions/gis/io/wkt/wkt.cpp (original)
+++ trunk/libs/geometry/test/extensions/gis/io/wkt/wkt.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/extensions/gis/latlong/point_ll.cpp
==============================================================================
--- trunk/libs/geometry/test/extensions/gis/latlong/point_ll.cpp (original)
+++ trunk/libs/geometry/test/extensions/gis/latlong/point_ll.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/extensions/nsphere/within.cpp
==============================================================================
--- trunk/libs/geometry/test/extensions/nsphere/within.cpp (original)
+++ trunk/libs/geometry/test/extensions/nsphere/within.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/geometries/boost_polygon.cpp
==============================================================================
--- trunk/libs/geometry/test/geometries/boost_polygon.cpp (original)
+++ trunk/libs/geometry/test/geometries/boost_polygon.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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)
@@ -65,7 +65,7 @@
typedef bg::model::point<T, 2, bg::cs::cartesian> 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 @@
// 3a: Check if Boost.Polygon's polygon fulfills Boost.Geometry's ring concept
bg::concept::check<boost::polygon::polygon_data<T> >();
- // 3b: use a Boost.Polygon polygon (ring)
+ // 3b: use a Boost.Polygon polygon (ring)
boost::polygon::polygon_data<T> boost_polygon_ring;
{
// Filling it is a two-step process using Boost.Polygon
Modified: trunk/libs/geometry/test/geometries/boost_polygon_overlay.cpp
==============================================================================
--- trunk/libs/geometry/test/geometries/boost_polygon_overlay.cpp (original)
+++ trunk/libs/geometry/test/geometries/boost_polygon_overlay.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
@@ -91,7 +91,7 @@
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
Modified: trunk/libs/geometry/test/geometries/boost_range.cpp
==============================================================================
--- trunk/libs/geometry/test/geometries/boost_range.cpp (original)
+++ trunk/libs/geometry/test/geometries/boost_range.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -18,15 +18,15 @@
#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>
struct not_two
{
template <typename P>
- 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 sum_not_five
{
template <typename P>
- 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 @@
template <typename P>
void test_range_adaptor()
-{
+{
bg::model::linestring<P> ls;
bg::read_wkt("LINESTRING(1 1,2 2,3 3,4 4)", ls);
Modified: trunk/libs/geometry/test/iterators/box_iterator.cpp
==============================================================================
--- trunk/libs/geometry/test/iterators/box_iterator.cpp (original)
+++ trunk/libs/geometry/test/iterators/box_iterator.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/iterators/circular_iterator.cpp
==============================================================================
--- trunk/libs/geometry/test/iterators/circular_iterator.cpp (original)
+++ trunk/libs/geometry/test/iterators/circular_iterator.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/iterators/closing_iterator.cpp
==============================================================================
--- trunk/libs/geometry/test/iterators/closing_iterator.cpp (original)
+++ trunk/libs/geometry/test/iterators/closing_iterator.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
Modified: trunk/libs/geometry/test/iterators/ever_circling_iterator.cpp
==============================================================================
--- trunk/libs/geometry/test/iterators/ever_circling_iterator.cpp (original)
+++ trunk/libs/geometry/test/iterators/ever_circling_iterator.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -14,7 +14,7 @@
#include <boost/geometry/iterators/ever_circling_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>
template <typename G>
Modified: trunk/libs/geometry/test/iterators/segment_range_iterator.cpp
==============================================================================
--- trunk/libs/geometry/test/iterators/segment_range_iterator.cpp (original)
+++ trunk/libs/geometry/test/iterators/segment_range_iterator.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -15,7 +15,7 @@
#include <boost/geometry/core/coordinate_type.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/iterators/segment_range_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>
Modified: trunk/libs/geometry/test/iterators/segment_returning_iterator.cpp
==============================================================================
--- trunk/libs/geometry/test/iterators/segment_returning_iterator.cpp (original)
+++ trunk/libs/geometry/test/iterators/segment_returning_iterator.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -20,7 +20,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/segment.hpp>
#include <boost/geometry/iterators/segment_returning_iterator.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
template <typename C>
void test_linestring(std::string const& wkt, std::string const& expected)
Modified: trunk/libs/geometry/test/multi/algorithms/multi_area.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_area.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_area.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -12,7 +12,7 @@
#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
Modified: trunk/libs/geometry/test/multi/algorithms/multi_centroid.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_centroid.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_centroid.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -18,7 +18,7 @@
#include <boost/geometry/multi/geometries/multi_point.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>
// #define REPORT_RESULTS
Modified: trunk/libs/geometry/test/multi/algorithms/multi_convex_hull.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_convex_hull.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_convex_hull.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -14,7 +14,7 @@
#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/multi/core/point_order.hpp>
#include <boost/geometry/multi/core/point_type.hpp>
@@ -24,7 +24,7 @@
#include <boost/geometry/multi/algorithms/num_points.hpp>
#include <boost/geometry/multi/algorithms/convex_hull.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/multi/geometries/multi_point.hpp>
#include <boost/geometry/multi/geometries/multi_linestring.hpp>
Modified: trunk/libs/geometry/test/multi/algorithms/multi_correct.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_correct.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_correct.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -13,7 +13,7 @@
#include <boost/geometry/multi/algorithms/correct.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/geometries/ring.hpp>
Modified: trunk/libs/geometry/test/multi/algorithms/multi_difference.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_difference.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_difference.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -23,7 +23,7 @@
#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/domains/gis/io/wkt/read_wkt_multi.hpp>
template <typename Ring, typename Polygon, typename MultiPolygon>
void test_areal()
Modified: trunk/libs/geometry/test/multi/algorithms/multi_distance.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_distance.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_distance.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -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>
@@ -20,7 +20,7 @@
#include <boost/geometry/multi/geometries/multi_point.hpp>
#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/domains/gis/io/wkt/read_wkt_multi.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
Modified: trunk/libs/geometry/test/multi/algorithms/multi_envelope.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_envelope.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_envelope.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -15,7 +15,7 @@
#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/domains/gis/io/wkt/read_wkt_multi.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
Modified: trunk/libs/geometry/test/multi/algorithms/multi_equals.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_equals.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_equals.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -13,7 +13,7 @@
#include <boost/geometry/geometries/geometries.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>
Modified: trunk/libs/geometry/test/multi/algorithms/multi_for_each.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_for_each.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_for_each.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -10,7 +10,7 @@
#include <boost/geometry/algorithms/for_each.hpp>
#include <boost/geometry/multi/algorithms/for_each.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/geometries/ring.hpp>
Modified: trunk/libs/geometry/test/multi/algorithms/multi_intersection.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_intersection.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_intersection.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -22,7 +22,7 @@
#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/domains/gis/io/wkt/read_wkt_multi.hpp>
template <typename Ring, typename Polygon, typename MultiPolygon>
void test_areal()
Modified: trunk/libs/geometry/test/multi/algorithms/multi_length.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_length.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_length.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -12,7 +12,7 @@
#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
Modified: trunk/libs/geometry/test/multi/algorithms/multi_num_geometries.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_num_geometries.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_num_geometries.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -10,7 +10,7 @@
#include <boost/geometry/algorithms/num_geometries.hpp>
#include <boost/geometry/multi/algorithms/num_geometries.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/multi/geometries/multi_point.hpp>
Modified: trunk/libs/geometry/test/multi/algorithms/multi_num_interior_rings.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_num_interior_rings.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_num_interior_rings.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -10,7 +10,7 @@
#include <boost/geometry/algorithms/num_interior_rings.hpp>
#include <boost/geometry/multi/algorithms/num_interior_rings.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/multi/geometries/multi_point.hpp>
Modified: trunk/libs/geometry/test/multi/algorithms/multi_num_points.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_num_points.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_num_points.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -10,7 +10,7 @@
#include <boost/geometry/algorithms/num_points.hpp>
#include <boost/geometry/multi/algorithms/num_points.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/multi/geometries/multi_point.hpp>
Modified: trunk/libs/geometry/test/multi/algorithms/multi_perimeter.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_perimeter.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_perimeter.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -10,7 +10,7 @@
#include <boost/geometry/algorithms/perimeter.hpp>
#include <boost/geometry/multi/algorithms/perimeter.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
Modified: trunk/libs/geometry/test/multi/algorithms/multi_reverse.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_reverse.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_reverse.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -10,7 +10,7 @@
#include <boost/geometry/algorithms/reverse.hpp>
#include <boost/geometry/multi/algorithms/reverse.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/geometries/geometries.hpp>
Modified: trunk/libs/geometry/test/multi/algorithms/multi_simplify.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_simplify.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_simplify.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -9,7 +9,7 @@
#include <boost/geometry/multi/algorithms/simplify.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/geometries/ring.hpp>
Modified: trunk/libs/geometry/test/multi/algorithms/multi_transform.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_transform.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_transform.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -21,8 +21,8 @@
#include <boost/geometry/multi/geometries/multi_linestring.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/read_wkt_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
// This test is a little different from transform.cpp test.
@@ -36,7 +36,7 @@
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<point_type>(2, 2));
std::ostringstream detected;
detected << bg::wkt(geometry_out);
@@ -50,31 +50,31 @@
typedef bg::model::d2::point_xy<T> P;
test_transform<P>(
- "POINT(1 1)",
+ "POINT(1 1)",
"POINT(2 2)");
test_transform<bg::model::linestring<P> >(
- "LINESTRING(1 1,2 2)",
+ "LINESTRING(1 1,2 2)",
"LINESTRING(2 2,4 4)");
test_transform<bg::model::segment<P> >(
- "LINESTRING(1 1,2 2)",
+ "LINESTRING(1 1,2 2)",
"LINESTRING(2 2,4 4)");
test_transform<bg::model::ring<P> >(
- "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<bg::model::polygon<P> >(
- "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<bg::model::box<P> >(
- "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<bg::model::multi_point<P> >(
- "MULTIPOINT((1 1),(2 2))",
+ "MULTIPOINT((1 1),(2 2))",
"MULTIPOINT((2 2),(4 4))");
test_transform<bg::model::multi_linestring<bg::model::linestring<P> > >(
- "MULTILINESTRING((1 1,2 2))",
+ "MULTILINESTRING((1 1,2 2))",
"MULTILINESTRING((2 2,4 4))");
test_transform<bg::model::multi_polygon<bg::model::polygon<P> > >(
- "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)))");
}
Modified: trunk/libs/geometry/test/multi/algorithms/multi_union.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_union.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_union.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -19,7 +19,7 @@
#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/domains/gis/io/wkt/read_wkt_multi.hpp>
template <typename Ring, typename Polygon, typename MultiPolygon>
Modified: trunk/libs/geometry/test/multi/algorithms/multi_unique.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_unique.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_unique.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -10,7 +10,7 @@
#include <boost/geometry/algorithms/unique.hpp>
#include <boost/geometry/multi/algorithms/unique.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/geometries/geometries.hpp>
Modified: trunk/libs/geometry/test/multi/algorithms/multi_within.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_within.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_within.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -7,7 +7,7 @@
#include <geometry_test_common.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/algorithms/correct.hpp>
#include <boost/geometry/algorithms/within.hpp>
Modified: trunk/libs/geometry/test/multi/algorithms/overlay/multi_overlay_common.hpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/overlay/multi_overlay_common.hpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/overlay/multi_overlay_common.hpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -14,7 +14,7 @@
#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/domains/gis/io/wkt/read_wkt_multi.hpp>
//#include <boost/geometry/multi/io/svg/write_svg.hpp>
Modified: trunk/libs/geometry/test/multi/algorithms/overlay/multi_traverse.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/overlay/multi_traverse.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/overlay/multi_traverse.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -32,7 +32,7 @@
#include <boost/geometry/multi/iterators/range_type.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/read_wkt_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
#include "multi_overlay_cases.hpp"
Modified: trunk/libs/geometry/test/ranges/box_range.cpp
==============================================================================
--- trunk/libs/geometry/test/ranges/box_range.cpp (original)
+++ trunk/libs/geometry/test/ranges/box_range.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -15,7 +15,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/ranges/box_range.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
Modified: trunk/libs/geometry/test/ranges/segment_range.cpp
==============================================================================
--- trunk/libs/geometry/test/ranges/segment_range.cpp (original)
+++ trunk/libs/geometry/test/ranges/segment_range.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -14,7 +14,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/ranges/segment_range.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
Modified: trunk/libs/geometry/test/strategies/projected_point.cpp
==============================================================================
--- trunk/libs/geometry/test/strategies/projected_point.cpp (original)
+++ trunk/libs/geometry/test/strategies/projected_point.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -12,7 +12,7 @@
#include <boost/geometry/strategies/cartesian/distance_projected_point.hpp>
#include <boost/geometry/strategies/concepts/distance_concept.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/point.hpp>
@@ -133,8 +133,8 @@
test_services
<
- bg::model::point<double, 2, bg::cs::cartesian>,
- bg::model::point<float, 2, bg::cs::cartesian>,
+ bg::model::point<double, 2, bg::cs::cartesian>,
+ bg::model::point<float, 2, bg::cs::cartesian>,
long double
>();
@@ -142,8 +142,8 @@
#if defined(HAVE_TTMATH)
test_all_2d
<
- bg::model::point<ttmath_big, 2, bg::cs::cartesian>,
- bg::model::point<ttmath_big, 2, bg::cs::cartesian>
+ bg::model::point<ttmath_big, 2, bg::cs::cartesian>,
+ bg::model::point<ttmath_big, 2, bg::cs::cartesian>
>();
#endif
Modified: trunk/libs/geometry/test/strategies/within.cpp
==============================================================================
--- trunk/libs/geometry/test/strategies/within.cpp (original)
+++ trunk/libs/geometry/test/strategies/within.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -21,7 +21,7 @@
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/polygon.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
Modified: trunk/libs/geometry/test/util/as_range.cpp
==============================================================================
--- trunk/libs/geometry/test/util/as_range.cpp (original)
+++ trunk/libs/geometry/test/util/as_range.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -16,7 +16,7 @@
#include <boost/geometry/core/cs.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>
template <int D, typename Range>
double sum(Range const& range)
Modified: trunk/libs/geometry/test/util/write_dsv.cpp
==============================================================================
--- trunk/libs/geometry/test/util/write_dsv.cpp (original)
+++ trunk/libs/geometry/test/util/write_dsv.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -16,7 +16,7 @@
#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>
Modified: trunk/libs/geometry/test/views/closeable_view.cpp
==============================================================================
--- trunk/libs/geometry/test/views/closeable_view.cpp (original)
+++ trunk/libs/geometry/test/views/closeable_view.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -14,7 +14,7 @@
#include <boost/geometry/views/closeable_view.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
#include <boost/geometry/util/write_dsv.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
Modified: trunk/libs/geometry/test/views/reversible_closeable.cpp
==============================================================================
--- trunk/libs/geometry/test/views/reversible_closeable.cpp (original)
+++ trunk/libs/geometry/test/views/reversible_closeable.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -16,7 +16,7 @@
#include <boost/geometry/views/closeable_view.hpp>
#include <boost/geometry/views/reversible_view.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
#include <boost/geometry/util/write_dsv.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
Modified: trunk/libs/geometry/test/views/reversible_view.cpp
==============================================================================
--- trunk/libs/geometry/test/views/reversible_view.cpp (original)
+++ trunk/libs/geometry/test/views/reversible_view.cpp 2011-03-12 18:53:18 EST (Sat, 12 Mar 2011)
@@ -14,7 +14,7 @@
#include <boost/geometry/views/reversible_view.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>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>