Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r75979 - in trunk/libs/geometry: doc/doxy/doxygen_input/sourcecode doc/src/docutils/tools/implementation_status doc/src/examples/algorithms example example/with_external_libs example_extensions/experimental example_extensions/gis/io/shapelib example_extensions/gis/projections test test/algorithms test/algorithms/detail test/algorithms/detail/sections test/algorithms/overlay test/algorithms/overlay/robustness test/core test/geometries test/io test/io/wkt test/iterators test/multi test/multi/algorithms test/multi/algorithms/overlay test/multi/io test/multi/io/wkt test/strategies test/util test/views test_extensions/algorithms test_extensions/algorithms/buffer test_extensions/arithmetic test_extensions/gis/io/wkb test_extensions/gis/latlong test_extensions/iterators test_extensions/nsphere
From: mateusz_at_[hidden]
Date: 2011-12-15 20:45:34

Author: mloskot
Date: 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
New Revision: 75979
URL: http://svn.boost.org/trac/boost/changeset/75979

Log:
Boost.Geometry:
* Catch up with r75977 changes with new layout of IO formats in geometry/io/<FORMAT>/
* General maintenance in tests and examples.
Added:
 trunk/libs/geometry/test/io/
 - copied from r75832, /trunk/libs/geometry/test/domains/gis/io/
 trunk/libs/geometry/test/multi/io/ (props changed)
 trunk/libs/geometry/test/multi/io/Jamfile.v2 (contents, props changed)
 trunk/libs/geometry/test/multi/io/wkt/ (props changed)
 trunk/libs/geometry/test/multi/io/wkt/Jamfile.v2 (contents, props changed)
 trunk/libs/geometry/test/multi/io/wkt/io_wkt_tests.sln (contents, props changed)
 trunk/libs/geometry/test/multi/io/wkt/wkt.cpp (contents, props changed)
 trunk/libs/geometry/test/multi/io/wkt/wkt.vcproj (contents, props changed)
Removed:
 trunk/libs/geometry/test/io/wkt/multi_wkt.cpp
 trunk/libs/geometry/test/io/wkt/multi_wkt.vcproj
Text files modified:
 trunk/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_1.cpp | 5 +----
 trunk/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp | 2 +-
 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/centroid.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/distance.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_insert_with_strategy.cpp | 5 +----
 trunk/libs/geometry/doc/src/examples/algorithms/sym_difference.cpp | 2 +-
 trunk/libs/geometry/doc/src/examples/algorithms/union.cpp | 2 +-
 trunk/libs/geometry/doc/src/examples/algorithms/within.cpp | 2 +-
 trunk/libs/geometry/example/06_b_transformation_example.cpp | 2 +-
 trunk/libs/geometry/example/07_a_graph_route_example.cpp | 2 +-
 trunk/libs/geometry/example/07_b_graph_route_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/example_extensions/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/test/Jamfile.v2 | 4 ++--
 trunk/libs/geometry/test/algorithms/correct.cpp | 4 ++--
 trunk/libs/geometry/test/algorithms/detail/partition.cpp | 2 +-
 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 | 4 ++--
 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/get_turns.cpp | 4 ++--
 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/intersects.cpp | 2 +-
 trunk/libs/geometry/test/algorithms/overlay/robustness/recursive_polygons.cpp | 2 +-
 trunk/libs/geometry/test/algorithms/overlay/robustness/star_comb.cpp | 2 +-
 trunk/libs/geometry/test/algorithms/overlay/robustness/test_overlay_p_q.hpp | 2 +-
 trunk/libs/geometry/test/algorithms/overlay/select_rings.cpp | 2 +-
 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.cpp | 4 ++--
 trunk/libs/geometry/test/algorithms/overlay/traverse_gmp.cpp | 2 +-
 trunk/libs/geometry/test/algorithms/test_area.hpp | 2 +-
 trunk/libs/geometry/test/algorithms/test_centroid.hpp | 2 +-
 trunk/libs/geometry/test/algorithms/test_convert.hpp | 2 +-
 trunk/libs/geometry/test/algorithms/test_convex_hull.hpp | 4 ++--
 trunk/libs/geometry/test/algorithms/test_covered_by.hpp | 2 +-
 trunk/libs/geometry/test/algorithms/test_difference.hpp | 2 +-
 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_expand.hpp | 2 +-
 trunk/libs/geometry/test/algorithms/test_for_each.hpp | 2 +-
 trunk/libs/geometry/test/algorithms/test_intersection.hpp | 2 +-
 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/core/ring.cpp | 2 +-
 trunk/libs/geometry/test/geometries/boost_polygon.cpp | 2 +-
 trunk/libs/geometry/test/geometries/boost_polygon_overlay.cpp | 2 +-
 trunk/libs/geometry/test/geometries/boost_range.cpp | 2 +-
 trunk/libs/geometry/test/io/wkt/Jamfile.v2 | 3 +--
 trunk/libs/geometry/test/io/wkt/wkt.cpp | 6 ++----
 trunk/libs/geometry/test/iterators/closing_iterator.cpp | 2 +-
 trunk/libs/geometry/test/iterators/ever_circling_iterator.cpp | 2 +-
 trunk/libs/geometry/test/multi/Jamfile.v2 | 3 ++-
 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_covered_by.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 | 4 ++--
 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/strategies/projected_point.cpp | 2 +-
 trunk/libs/geometry/test/strategies/within.cpp | 2 +-
 trunk/libs/geometry/test/util/as_range.cpp | 2 +-
 trunk/libs/geometry/test/util/rational.cpp | 2 +-
 trunk/libs/geometry/test/util/write_dsv.cpp | 2 +-
 trunk/libs/geometry/test/views/box_view.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 +-
 trunk/libs/geometry/test/views/segment_view.cpp | 2 +-
 trunk/libs/geometry/test_extensions/algorithms/buffer/test_buffer.hpp | 2 +-
 trunk/libs/geometry/test_extensions/algorithms/connect.cpp | 2 +-
 trunk/libs/geometry/test_extensions/algorithms/dissolve.cpp | 2 +-
 trunk/libs/geometry/test_extensions/algorithms/is_convex.cpp | 6 +++---
 trunk/libs/geometry/test_extensions/algorithms/mark_spikes.cpp | 2 +-
 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/arithmetic/cross_product.cpp | 4 ++--
 trunk/libs/geometry/test_extensions/gis/io/wkb/read_wkb.cpp | 2 +-
 trunk/libs/geometry/test_extensions/gis/latlong/area_ll.cpp | 8 +-------
 trunk/libs/geometry/test_extensions/gis/latlong/cross_track.cpp | 9 +--------
 trunk/libs/geometry/test_extensions/gis/latlong/point_ll.cpp | 2 +-
 trunk/libs/geometry/test_extensions/iterators/segment_returning_iterator.cpp | 2 +-
 trunk/libs/geometry/test_extensions/nsphere/within.cpp | 2 +-
 144 files changed, 163 insertions(+), 184 deletions(-)

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -21,8 +21,7 @@
#include <boost/geometry/geometries/register/point.hpp>
#include <boost/geometry/geometries/geometries.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
-
+#include <boost/geometry/io/wkt/wkt.hpp>

// All functions below are referred to in the documentation of Boost.Geometry
// Don't rename them.
@@ -428,8 +427,6 @@
*/
}

-
-
int main(void)
{
example_area_polygon();

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -17,7 +17,7 @@

#include <boost/geometry/multi/multi.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -10,5 +10,5 @@
#include <boost/geometry/geometry.hpp>
#include <boost/geometry/multi/multi.hpp>
#include <boost/geometry/multi/geometries/multi_point.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -15,7 +15,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -15,7 +15,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

namespace bg = boost::geometry; /*< Convenient namespace alias >*/

Modified: trunk/libs/geometry/doc/src/examples/algorithms/centroid.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/centroid.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/centroid.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -17,7 +17,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>
/*<-*/ #include "create_svg_two.hpp" /*->*/

int main()

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -16,7 +16,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -16,7 +16,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

#include <boost/foreach.hpp>
/*<-*/ #include "create_svg_overlay.hpp" /*->*/

Modified: trunk/libs/geometry/doc/src/examples/algorithms/distance.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/distance.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/distance.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -20,7 +20,7 @@
#include <boost/geometry/multi/geometries/multi_point.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

#include <boost/foreach.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -16,7 +16,7 @@
#include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -15,7 +15,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -15,7 +15,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -14,7 +14,7 @@
#include <deque>

#include <boost/geometry.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/register/linestring.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -16,7 +16,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -14,7 +14,7 @@

#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

#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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -15,7 +15,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/linestring.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -15,7 +15,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/linestring.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -14,7 +14,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/linestring.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -16,7 +16,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -16,7 +16,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -17,7 +17,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

int main()

Modified: trunk/libs/geometry/doc/src/examples/algorithms/simplify_insert_with_strategy.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/simplify_insert_with_strategy.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/simplify_insert_with_strategy.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -15,10 +15,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/linestring.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
-#include <boost/geometry/domains/gis/io/wkt/stream_wkt.hpp>
-
-
+#include <boost/geometry/io/wkt/wkt.hpp>

int main()
{

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -16,7 +16,7 @@
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -16,7 +16,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

#include <boost/foreach.hpp>
/*<-*/ #include "create_svg_overlay.hpp" /*->*/

Modified: trunk/libs/geometry/doc/src/examples/algorithms/within.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/within.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/within.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -17,7 +17,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>
/*<-*/ #include "create_svg_two.hpp" /*->*/

int main()

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -21,7 +21,7 @@
#include <boost/geometry/algorithms/centroid.hpp>
#include <boost/geometry/strategies/transform.hpp>
#include <boost/geometry/strategies/transform/matrix_transformers.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>

#if defined(HAVE_SVG)
# include <boost/geometry/extensions/io/svg/write_svg.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -25,7 +25,7 @@

#include <boost/geometry/geometry.hpp>
#include <boost/geometry/geometries/linestring.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>

// Yes, this example currently uses some extensions:

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -29,7 +29,7 @@

#include <boost/geometry/geometry.hpp>
#include <boost/geometry/geometries/linestring.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>

// Yes, this example currently uses some extensions:

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-12-15 20:45:22 EST (Thu, 15 Dec 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/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -36,7 +36,7 @@

#include <boost/geometry/geometry.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -30,7 +30,7 @@
#include <boost/geometry/geometry.hpp>
#include <boost/geometry/geometries/geometries.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 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/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 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/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -23,8 +23,8 @@
#include <boost/geometry/geometries/register/ring.hpp>
#include <boost/geometry/multi/multi.hpp>
#include <boost/geometry/extensions/algorithms/selected.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
+#include <boost/geometry/io/wkt/read.hpp>
+#include <boost/geometry/multi/io/wkt/read.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -21,7 +21,7 @@

#include <boost/geometry/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/domains/gis/io/wkt/stream_wkt.hpp>
+#include <boost/geometry/io/wkt/iomanip.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -29,7 +29,7 @@

#include <boost/geometry/multi/multi.hpp>
#include <boost/geometry/extensions/algorithms/selected.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

Modified: trunk/libs/geometry/example_extensions/experimental/geometry_of.cpp
==============================================================================
--- trunk/libs/geometry/example_extensions/experimental/geometry_of.cpp (original)
+++ trunk/libs/geometry/example_extensions/experimental/geometry_of.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -22,7 +22,7 @@

#include <boost/geometry/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 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/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -11,7 +11,7 @@
#include <boost/geometry/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/extensions/algorithms/parse.hpp>
-#include <boost/geometry/domains/gis/io/wkt/stream_wkt.hpp>
+#include <boost/geometry/io/wkt/iomanip.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -10,7 +10,7 @@

#include <boost/geometry/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/domains/gis/io/wkt/stream_wkt.hpp>
+#include <boost/geometry/io/wkt/iomanip.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-12-15 20:45:22 EST (Thu, 15 Dec 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/domains/gis/io/wkt/read_multi.hpp>
+#include <boost/geometry/multi/io/wkt/read.hpp>
#include <boost/geometry/extensions/gis/latlong/latlong.hpp>
#include <boost/geometry/extensions/gis/projections/project_transformer.hpp>

Modified: trunk/libs/geometry/test/Jamfile.v2
==============================================================================
--- trunk/libs/geometry/test/Jamfile.v2 (original)
+++ trunk/libs/geometry/test/Jamfile.v2 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -17,7 +17,6 @@
 <include>../../../boost/geometry/extensions/contrib/ttmath
 <toolset>msvc:<asynch-exceptions>on
 ;
-

build-project core ;
build-project point_concept ;
@@ -27,7 +26,8 @@
build-project iterators ;
build-project strategies ;
build-project policies ;
+build-project io ;
build-project util ;
build-project views ;
build-project multi ;
-build-project domains ;
+build-project domains ;
\ No newline at end of file

Modified: trunk/libs/geometry/test/algorithms/correct.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/correct.cpp (original)
+++ trunk/libs/geometry/test/algorithms/correct.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -21,8 +21,8 @@

#include <boost/geometry/io/dsv/write.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
-#include <boost/geometry/domains/gis/io/wkt/write.hpp>
+#include <boost/geometry/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/write.hpp>

#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/box.hpp>

Modified: trunk/libs/geometry/test/algorithms/detail/partition.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/detail/partition.cpp (original)
+++ trunk/libs/geometry/test/algorithms/detail/partition.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -17,7 +17,7 @@

#include <boost/geometry/algorithms/detail/partition.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

#if defined(TEST_WITH_SVG)
# include <boost/geometry/extensions/io/svg/svg_mapper.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -18,7 +18,7 @@
#include <boost/geometry/views/detail/range_type.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -23,8 +23,8 @@
#include <boost/geometry/algorithms/detail/sections/sectionalize.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
-#include <boost/geometry/domains/gis/io/wkt/write.hpp>
+#include <boost/geometry/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/write.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -21,7 +21,7 @@
#include <boost/geometry/algorithms/disjoint.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/strategies/strategies.hpp>

#include <test_common/test_point.hpp>

Modified: trunk/libs/geometry/test/algorithms/make.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/make.cpp (original)
+++ trunk/libs/geometry/test/algorithms/make.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -17,7 +17,7 @@

#include <boost/geometry/algorithms/make.hpp>

-#include <boost/geometry/domains/gis/io/wkt/write.hpp>
+#include <boost/geometry/io/wkt/write.hpp>

#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/c_array.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -28,8 +28,8 @@

#include <boost/geometry/strategies/strategies.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
-#include <boost/geometry/domains/gis/io/wkt/write.hpp>
+#include <boost/geometry/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/write.hpp>

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -17,7 +17,7 @@

#include <boost/geometry/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -19,7 +19,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/multi/multi.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
+#include <boost/geometry/multi/io/wkt/read.hpp>
#include <boost/geometry/extensions/io/svg/write_svg_multi.hpp>

Modified: trunk/libs/geometry/test/algorithms/overlay/get_turns.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/get_turns.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/get_turns.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -29,8 +29,8 @@

#include <boost/geometry/geometries/geometries.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
-#include <boost/geometry/domains/gis/io/wkt/write.hpp>
+#include <boost/geometry/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/write.hpp>

#if defined(TEST_WITH_SVG)
# include <boost/geometry/extensions/io/svg/svg_mapper.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -25,8 +25,8 @@
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
-#include <boost/geometry/domains/gis/io/wkt/write.hpp>
+#include <boost/geometry/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/write.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -30,7 +30,7 @@
#include <boost/geometry/geometry.hpp>
#include <boost/geometry/multi/multi.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>

Modified: trunk/libs/geometry/test/algorithms/overlay/robustness/intersects.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/robustness/intersects.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/robustness/intersects.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -30,7 +30,7 @@
#include <boost/geometry/geometry.hpp>
#include <boost/geometry/multi/multi.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -30,7 +30,7 @@
#include <boost/geometry/multi/multi.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -32,7 +32,7 @@
#include <boost/geometry/multi/multi.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -29,7 +29,7 @@

#include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>

#include <geometry_test_common.hpp>

Modified: trunk/libs/geometry/test/algorithms/overlay/select_rings.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/select_rings.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/select_rings.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -18,7 +18,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>

#include <boost/assign/list_of.hpp>
#include <boost/foreach.hpp>

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -28,8 +28,8 @@

#include <boost/geometry/strategies/strategies.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
-#include <boost/geometry/domains/gis/io/wkt/write.hpp>
+#include <boost/geometry/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/write.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -25,8 +25,8 @@

#include <boost/geometry/strategies/strategies.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
-#include <boost/geometry/domains/gis/io/wkt/write.hpp>
+#include <boost/geometry/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/write.hpp>

#if defined(TEST_WITH_SVG)

Modified: trunk/libs/geometry/test/algorithms/overlay/traverse.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/traverse.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/traverse.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -51,8 +51,8 @@

#include <boost/geometry/geometries/geometries.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
-#include <boost/geometry/domains/gis/io/wkt/write.hpp>
+#include <boost/geometry/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/write.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -42,7 +42,7 @@

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -17,7 +17,7 @@
#include <boost/geometry/algorithms/correct.hpp>
#include <boost/geometry/strategies/strategies.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>

template <typename 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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -18,7 +18,7 @@
#include <boost/geometry/algorithms/distance.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>

template <std::size_t D>

Modified: trunk/libs/geometry/test/algorithms/test_convert.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_convert.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_convert.hpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -15,7 +15,7 @@
#include <boost/geometry/algorithms/make.hpp>
#include <boost/geometry/algorithms/num_points.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/c_array.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -17,8 +17,8 @@

#include <boost/geometry/strategies/strategies.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
-#include <boost/geometry/domains/gis/io/wkt/write.hpp>
+#include <boost/geometry/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/write.hpp>

#include <boost/geometry/geometries/polygon.hpp>

Modified: trunk/libs/geometry/test/algorithms/test_covered_by.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_covered_by.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_covered_by.hpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -19,7 +19,7 @@
#include <boost/geometry/geometries/ring.hpp>
#include <boost/geometry/geometries/polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>

template <typename Geometry1, typename Geometry2>

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -34,7 +34,7 @@

#include <boost/geometry/strategies/strategies.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

#if defined(TEST_WITH_SVG)

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -12,7 +12,7 @@
#include <geometry_test_common.hpp>

#include <boost/geometry/algorithms/distance.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -16,7 +16,7 @@
#include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/strategies/strategies.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -16,7 +16,7 @@
#include <boost/geometry/algorithms/equals.hpp>
#include <boost/geometry/strategies/strategies.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>

template <typename Geometry1, typename Geometry2>

Modified: trunk/libs/geometry/test/algorithms/test_expand.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_expand.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_expand.hpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -14,7 +14,7 @@

#include <boost/geometry/algorithms/expand.hpp>
#include <boost/geometry/strategies/strategies.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/algorithms/assign.hpp>
#include <boost/geometry/io/dsv/write.hpp>

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -15,7 +15,7 @@

#include <boost/geometry/algorithms/distance.hpp>
#include <boost/geometry/strategies/strategies.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/geometry/io/dsv/write.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -24,7 +24,7 @@

#include <boost/geometry/strategies/strategies.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

#if defined(TEST_WITH_SVG)

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -18,7 +18,7 @@
#include <boost/geometry/geometries/ring.hpp>
#include <boost/geometry/geometries/polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -12,7 +12,7 @@
#include <geometry_test_common.hpp>

#include <boost/geometry/algorithms/length.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -18,7 +18,7 @@
#include <boost/geometry/geometries/ring.hpp>
#include <boost/geometry/geometries/polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -16,7 +16,7 @@
#include <boost/geometry/strategies/strategies.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -14,7 +14,7 @@
#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/reverse.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -16,7 +16,7 @@
#include <boost/geometry/algorithms/distance.hpp>
#include <boost/geometry/strategies/strategies.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -26,7 +26,7 @@

#include <boost/geometry/strategies/strategies.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -15,7 +15,7 @@
#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/unique.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -19,7 +19,7 @@
#include <boost/geometry/geometries/ring.hpp>
#include <boost/geometry/geometries/polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>

#include <boost/geometry/strategies/cartesian/point_in_box.hpp>
#include <boost/geometry/strategies/cartesian/box_in_box.hpp>

Modified: trunk/libs/geometry/test/algorithms/transform.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/transform.cpp (original)
+++ trunk/libs/geometry/test/algorithms/transform.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -25,7 +25,7 @@
#include <boost/geometry/geometries/point_xy.hpp>

#include <boost/geometry/io/dsv/write.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

#include <test_common/test_point.hpp>

Modified: trunk/libs/geometry/test/core/ring.cpp
==============================================================================
--- trunk/libs/geometry/test/core/ring.cpp (original)
+++ trunk/libs/geometry/test/core/ring.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -27,7 +27,7 @@
#include <boost/geometry/geometries/polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -22,7 +22,7 @@
#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 <boost/geometry/io/wkt/wkt.hpp>

#include <iostream>

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -16,7 +16,7 @@
#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 <boost/geometry/io/wkt/wkt.hpp>

#include<iostream>

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -21,7 +21,7 @@
#include <boost/geometry/geometries/adapted/boost_range/sliced.hpp>
#include <boost/geometry/geometries/adapted/boost_range/uniqued.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

#include <sstream>

Modified: trunk/libs/geometry/test/io/wkt/Jamfile.v2
==============================================================================
--- /trunk/libs/geometry/test/domains/gis/io/wkt/Jamfile.v2 (original)
+++ trunk/libs/geometry/test/io/wkt/Jamfile.v2 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -8,9 +8,8 @@
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)

-test-suite boost-geometry-domains-gis-io-wkt
+test-suite boost-geometry-io-wkt
     :
     [ run wkt.cpp ]
- [ run multi_wkt.cpp ]
     ;

Deleted: /trunk/libs/geometry/test/domains/gis/io/wkt/multi_wkt.cpp
==============================================================================
--- /trunk/libs/geometry/test/domains/gis/io/wkt/multi_wkt.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
+++ (empty file)
@@ -1,88 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-// Unit Test
-
-// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
-
-// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
-// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
-
-// 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 <iostream>
-#include <sstream>
-#include <string>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/concept/requires.hpp>
-
-#include <boost/test/floating_point_comparison.hpp>
-#include <boost/test/included/test_exec_monitor.hpp>
-
-#include <boost/geometry/geometries/geometries.hpp>
-
-
-#include <boost/geometry/multi/algorithms/area.hpp>
-#include <boost/geometry/multi/algorithms/length.hpp>
-#include <boost/geometry/multi/algorithms/num_points.hpp>
-#include <boost/geometry/multi/algorithms/perimeter.hpp>
-#include <boost/geometry/multi/core/point_type.hpp>
-#include <boost/geometry/multi/core/topological_dimension.hpp>
-#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/domains/gis/io/wkt/read_multi.hpp>
-#include <boost/geometry/domains/gis/io/wkt/write_multi.hpp>
-
-
-template <typename T>
-void test_all();
-
-
-// Include the single test
-#define GEOMETRY_TEST_MULTI
-#include "domains/gis/io/wkt/wkt.cpp"
-
-
-
-template <typename T>
-void test_all()
-{
- using namespace boost::geometry;
- typedef bg::model::point<T, 2, bg::cs::cartesian> P;
-
- test_wkt<bg::model::multi_point >("multipoint((1 2),(3 4))", 2);
- test_wkt<bg::model::multi_linestring<bg::model::linestring > >("multilinestring((1 1,2 2,3 3),(4 4,5 5,6 6))", 6, 4 * sqrt(2.0));
- test_wkt<bg::model::multi_polygon<bg::model::polygon > >("multipolygon(((0 0,0 2,2 2,2 0,0 0),(1 1,1 2,2 2,2 1,1 1)),((0 0,0 4,4 4,4 0,0 0)))", 15, 0, 21, 28);
-
- test_wrong_wkt<bg::model::multi_polygon<bg::model::polygon > >(
- "MULTIPOLYGON(((0 0,0 2,2 2,2 0,0 0),(1 1,1 2,2 2,2 1,1 1)),(0 0,0 4,4 4,4 0,0 0)))",
- "expected '('");
-}
-
-
-
-/*
-
-... see comments in "wkt.cpp"
-
-union select 13,'# mpoint',npoints(geomfromtext('MULTIPOINT((1 2),(3 4))'))
-union select 14,'length mpoint',length(geomfromtext('MULTIPOINT((1 2),(3 4))'))
-union select 15,'peri mpoint',perimeter(geomfromtext('MULTIPOINT((1 2),(3 4))'))
-union select 16,'area mpoint',area(geomfromtext('MULTIPOINT((1 2),(3 4))'))
-
-union select 17,'# mls',npoints(geomfromtext('MULTILINESTRING((1 1,2 2,3 3),(4 4,5 5,6 6))'))
-union select 18,'length mls',length(geomfromtext('MULTILINESTRING((1 1,2 2,3 3),(4 4,5 5,6 6))'))
-union select 19,'peri mls',perimeter(geomfromtext('MULTILINESTRING((1 1,2 2,3 3),(4 4,5 5,6 6))'))
-union select 20,'area mls',area(geomfromtext('MULTILINESTRING((1 1,2 2,3 3),(4 4,5 5,6 6))'))
-
-union select 21,'# mpoly',npoints(geomfromtext('MULTIPOLYGON(((0 0,0 2,2 2,2 0,0 0),(1 1,1 2,2 2,2 1,1 1)),((0 0,0 4,4 4,4 0,0 0)))'))
-union select 22,'length mpoly',length(geomfromtext('MULTIPOLYGON(((0 0,0 2,2 2,2 0,0 0),(1 1,1 2,2 2,2 1,1 1)),((0 0,0 4,4 4,4 0,0 0)))'))
-union select 23,'peri mpoly',perimeter(geomfromtext('MULTIPOLYGON(((0 0,0 2,2 2,2 0,0 0),(1 1,1 2,2 2,2 1,1 1)),((0 0,0 4,4 4,4 0,0 0)))'))
-union select 24,'area mpoly',area(geomfromtext('MULTIPOLYGON(((0 0,0 2,2 2,2 0,0 0),(1 1,1 2,2 2,2 1,1 1)),((0 0,0 4,4 4,4 0,0 0)))'))
-
-*/

Deleted: /trunk/libs/geometry/test/domains/gis/io/wkt/multi_wkt.vcproj
==============================================================================
--- /trunk/libs/geometry/test/domains/gis/io/wkt/multi_wkt.vcproj 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
+++ (empty file)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="multi_wkt"
- ProjectGUID="{CA8D5E44-7D8F-44A1-900C-35C28890299B}"
- RootNamespace="multi_wkt"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)\multi_wkt"
- 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)\multi_wkt"
- 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=".\multi_wkt.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>

Modified: trunk/libs/geometry/test/io/wkt/wkt.cpp
==============================================================================
--- /trunk/libs/geometry/test/domains/gis/io/wkt/wkt.cpp (original)
+++ trunk/libs/geometry/test/io/wkt/wkt.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -20,7 +20,6 @@

#include <geometry_test_common.hpp>

-
#include <boost/geometry/geometries/geometries.hpp>

#include <boost/geometry/algorithms/area.hpp>
@@ -30,9 +29,8 @@
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/core/point_type.hpp>
#include <boost/geometry/core/topological_dimension.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
-#include <boost/geometry/domains/gis/io/wkt/write.hpp>
-
+#include <boost/geometry/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/write.hpp>

template <typename G>
void test_wkt(std::string const& wkt, std::size_t n, double len = 0,

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -22,7 +22,7 @@
#include <boost/geometry/iterators/closing_iterator.hpp>

#include <boost/geometry/core/coordinate_type.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -20,7 +20,7 @@
#include <boost/geometry/iterators/ever_circling_iterator.hpp>

#include <boost/geometry/core/coordinate_type.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>

Modified: trunk/libs/geometry/test/multi/Jamfile.v2
==============================================================================
--- trunk/libs/geometry/test/multi/Jamfile.v2 (original)
+++ trunk/libs/geometry/test/multi/Jamfile.v2 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -8,4 +8,5 @@
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)

-build-project algorithms ;
\ No newline at end of file
+build-project algorithms ;
+build-project io ;
\ No newline at end of file

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -14,7 +14,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -25,7 +25,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/domains/gis/io/wkt/read_multi.hpp>
+#include <boost/geometry/multi/io/wkt/read.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -21,7 +21,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>

#include <boost/geometry/multi/core/point_order.hpp>
#include <boost/geometry/multi/core/point_type.hpp>
@@ -31,7 +31,7 @@
#include <boost/geometry/multi/algorithms/num_points.hpp>
#include <boost/geometry/multi/algorithms/detail/for_each_range.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -13,7 +13,7 @@

#include <boost/geometry/multi/algorithms/correct.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

#include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/geometries/ring.hpp>

Modified: trunk/libs/geometry/test/multi/algorithms/multi_covered_by.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_covered_by.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_covered_by.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -7,7 +7,7 @@

#include <geometry_test_common.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

#include <boost/geometry/algorithms/correct.hpp>
#include <boost/geometry/algorithms/covered_by.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -26,7 +26,7 @@
#include <boost/geometry/multi/geometries/multi_linestring.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
+#include <boost/geometry/multi/io/wkt/read.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -11,7 +11,7 @@
#include <geometry_test_common.hpp>

#include <boost/geometry/algorithms/distance.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.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/domains/gis/io/wkt/read_multi.hpp>
+#include <boost/geometry/multi/io/wkt/read.hpp>

#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -21,7 +21,7 @@
#include <boost/geometry/multi/geometries/multi_linestring.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
+#include <boost/geometry/multi/io/wkt/read.hpp>

#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -15,7 +15,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
+#include <boost/geometry/multi/io/wkt/read.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -10,7 +10,7 @@
#include <boost/geometry/algorithms/for_each.hpp>
#include <boost/geometry/multi/algorithms/for_each.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -25,7 +25,7 @@
#include <boost/geometry/multi/geometries/multi_linestring.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
+#include <boost/geometry/multi/io/wkt/read.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -14,7 +14,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/multi/geometries/multi_linestring.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -10,7 +10,7 @@
#include <boost/geometry/algorithms/num_geometries.hpp>
#include <boost/geometry/multi/algorithms/num_geometries.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.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-12-15 20:45:22 EST (Thu, 15 Dec 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/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -10,7 +10,7 @@
#include <boost/geometry/algorithms/num_points.hpp>
#include <boost/geometry/multi/algorithms/num_points.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -10,7 +10,7 @@
#include <boost/geometry/algorithms/perimeter.hpp>
#include <boost/geometry/multi/algorithms/perimeter.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -10,7 +10,7 @@
#include <boost/geometry/algorithms/reverse.hpp>
#include <boost/geometry/multi/algorithms/reverse.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -9,7 +9,7 @@

#include <boost/geometry/multi/algorithms/simplify.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -28,8 +28,8 @@
#include <boost/geometry/multi/geometries/multi_linestring.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/read.hpp>

// This test is a little different from transform.cpp test.

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -23,7 +23,7 @@
#include <boost/geometry/multi/geometries/multi_linestring.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
+#include <boost/geometry/multi/io/wkt/read.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -10,7 +10,7 @@
#include <boost/geometry/algorithms/unique.hpp>
#include <boost/geometry/multi/algorithms/unique.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -7,7 +7,7 @@

#include <geometry_test_common.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -15,7 +15,7 @@
#include <boost/geometry/multi/geometries/multi_linestring.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
+#include <boost/geometry/multi/io/wkt/read.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -34,7 +34,7 @@

#include <boost/geometry/multi/views/detail/range_type.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
+#include <boost/geometry/multi/io/wkt/read.hpp>

#include "multi_overlay_cases.hpp"

Added: trunk/libs/geometry/test/multi/io/Jamfile.v2
==============================================================================
--- (empty file)
+++ trunk/libs/geometry/test/multi/io/Jamfile.v2 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -0,0 +1,11 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+#
+# 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)
+
+build-project wkt ;
\ No newline at end of file

Added: trunk/libs/geometry/test/multi/io/wkt/Jamfile.v2
==============================================================================
--- (empty file)
+++ trunk/libs/geometry/test/multi/io/wkt/Jamfile.v2 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -0,0 +1,15 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+#
+# 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)
+
+test-suite boost-geometry-multi-io-wkt
+ :
+ [ run wkt.cpp ]
+ ;
+

Added: trunk/libs/geometry/test/multi/io/wkt/io_wkt_tests.sln
==============================================================================
--- (empty file)
+++ trunk/libs/geometry/test/multi/io/wkt/io_wkt_tests.sln 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -0,0 +1,27 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wkt", "wkt.vcproj", "{CA8D5E44-7D8F-44A1-900C-35C28890299B}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {1FA2ADE2-F649-4245-951E-A8F5935E7127}.Debug|Win32.ActiveCfg = Debug|Win32
+ {1FA2ADE2-F649-4245-951E-A8F5935E7127}.Debug|Win32.Build.0 = Debug|Win32
+ {1FA2ADE2-F649-4245-951E-A8F5935E7127}.Release|Win32.ActiveCfg = Release|Win32
+ {1FA2ADE2-F649-4245-951E-A8F5935E7127}.Release|Win32.Build.0 = Release|Win32
+ {F2A680B0-F6FC-479E-9988-24CF6851C13C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F2A680B0-F6FC-479E-9988-24CF6851C13C}.Debug|Win32.Build.0 = Debug|Win32
+ {F2A680B0-F6FC-479E-9988-24CF6851C13C}.Release|Win32.ActiveCfg = Release|Win32
+ {F2A680B0-F6FC-479E-9988-24CF6851C13C}.Release|Win32.Build.0 = Release|Win32
+ {CA8D5E44-7D8F-44A1-900C-35C28890299B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {CA8D5E44-7D8F-44A1-900C-35C28890299B}.Debug|Win32.Build.0 = Debug|Win32
+ {CA8D5E44-7D8F-44A1-900C-35C28890299B}.Release|Win32.ActiveCfg = Release|Win32
+ {CA8D5E44-7D8F-44A1-900C-35C28890299B}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal

Added: trunk/libs/geometry/test/multi/io/wkt/wkt.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/geometry/test/multi/io/wkt/wkt.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -0,0 +1,82 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
+
+// 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 <iostream>
+#include <sstream>
+#include <string>
+
+#include <boost/algorithm/string.hpp>
+#include <boost/concept/requires.hpp>
+
+#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>
+
+#include <boost/geometry/geometries/geometries.hpp>
+
+#include <boost/geometry/multi/algorithms/area.hpp>
+#include <boost/geometry/multi/algorithms/length.hpp>
+#include <boost/geometry/multi/algorithms/num_points.hpp>
+#include <boost/geometry/multi/algorithms/perimeter.hpp>
+#include <boost/geometry/multi/core/point_type.hpp>
+#include <boost/geometry/multi/core/topological_dimension.hpp>
+#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/multi/io/wkt/read.hpp>
+#include <boost/geometry/multi/io/wkt/write.hpp>
+
+template <typename T>
+void test_all();
+
+
+// Include the single test
+#define GEOMETRY_TEST_MULTI
+#include "io/wkt/wkt.cpp"
+
+template <typename T>
+void test_all()
+{
+ using namespace boost::geometry;
+ typedef bg::model::point<T, 2, bg::cs::cartesian> P;
+
+ test_wkt<bg::model::multi_point >("multipoint((1 2),(3 4))", 2);
+ test_wkt<bg::model::multi_linestring<bg::model::linestring > >("multilinestring((1 1,2 2,3 3),(4 4,5 5,6 6))", 6, 4 * sqrt(2.0));
+ test_wkt<bg::model::multi_polygon<bg::model::polygon > >("multipolygon(((0 0,0 2,2 2,2 0,0 0),(1 1,1 2,2 2,2 1,1 1)),((0 0,0 4,4 4,4 0,0 0)))", 15, 0, 21, 28);
+
+ test_wrong_wkt<bg::model::multi_polygon<bg::model::polygon > >(
+ "MULTIPOLYGON(((0 0,0 2,2 2,2 0,0 0),(1 1,1 2,2 2,2 1,1 1)),(0 0,0 4,4 4,4 0,0 0)))",
+ "expected '('");
+}
+
+/*
+
+... see comments in "wkt.cpp"
+
+union select 13,'# mpoint',npoints(geomfromtext('MULTIPOINT((1 2),(3 4))'))
+union select 14,'length mpoint',length(geomfromtext('MULTIPOINT((1 2),(3 4))'))
+union select 15,'peri mpoint',perimeter(geomfromtext('MULTIPOINT((1 2),(3 4))'))
+union select 16,'area mpoint',area(geomfromtext('MULTIPOINT((1 2),(3 4))'))
+
+union select 17,'# mls',npoints(geomfromtext('MULTILINESTRING((1 1,2 2,3 3),(4 4,5 5,6 6))'))
+union select 18,'length mls',length(geomfromtext('MULTILINESTRING((1 1,2 2,3 3),(4 4,5 5,6 6))'))
+union select 19,'peri mls',perimeter(geomfromtext('MULTILINESTRING((1 1,2 2,3 3),(4 4,5 5,6 6))'))
+union select 20,'area mls',area(geomfromtext('MULTILINESTRING((1 1,2 2,3 3),(4 4,5 5,6 6))'))
+
+union select 21,'# mpoly',npoints(geomfromtext('MULTIPOLYGON(((0 0,0 2,2 2,2 0,0 0),(1 1,1 2,2 2,2 1,1 1)),((0 0,0 4,4 4,4 0,0 0)))'))
+union select 22,'length mpoly',length(geomfromtext('MULTIPOLYGON(((0 0,0 2,2 2,2 0,0 0),(1 1,1 2,2 2,2 1,1 1)),((0 0,0 4,4 4,4 0,0 0)))'))
+union select 23,'peri mpoly',perimeter(geomfromtext('MULTIPOLYGON(((0 0,0 2,2 2,2 0,0 0),(1 1,1 2,2 2,2 1,1 1)),((0 0,0 4,4 4,4 0,0 0)))'))
+union select 24,'area mpoly',area(geomfromtext('MULTIPOLYGON(((0 0,0 2,2 2,2 0,0 0),(1 1,1 2,2 2,2 1,1 1)),((0 0,0 4,4 4,4 0,0 0)))'))
+
+*/

Added: trunk/libs/geometry/test/multi/io/wkt/wkt.vcproj
==============================================================================
--- (empty file)
+++ trunk/libs/geometry/test/multi/io/wkt/wkt.vcproj 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="wkt"
+ ProjectGUID="{CA8D5E44-7D8F-44A1-900C-35C28890299B}"
+ RootNamespace="wkt"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)\wkt"
+ 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)\wkt"
+ 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=".\wkt.cpp"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -18,7 +18,7 @@
#include <boost/geometry/strategies/cartesian/distance_projected_point.hpp>
#include <boost/geometry/strategies/concepts/distance_concept.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>

#include <boost/geometry/geometries/point.hpp>

Modified: trunk/libs/geometry/test/strategies/within.cpp
==============================================================================
--- trunk/libs/geometry/test/strategies/within.cpp (original)
+++ trunk/libs/geometry/test/strategies/within.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -28,7 +28,7 @@
#include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/geometries/polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -22,7 +22,7 @@
#include <boost/geometry/core/cs.hpp>
#include <boost/geometry/geometries/geometries.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>

template <int D, typename Range>
double sum(Range const& range)

Modified: trunk/libs/geometry/test/util/rational.cpp
==============================================================================
--- trunk/libs/geometry/test/util/rational.cpp (original)
+++ trunk/libs/geometry/test/util/rational.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -16,7 +16,7 @@
#include <geometry_test_common.hpp>

#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/geometry/util/rational.hpp>

void test_coordinate_cast(std::string const& s, int expected_nom, int expected_denom)

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -22,7 +22,7 @@

#include <boost/geometry/geometries/geometries.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>

Modified: trunk/libs/geometry/test/views/box_view.cpp
==============================================================================
--- trunk/libs/geometry/test/views/box_view.cpp (original)
+++ trunk/libs/geometry/test/views/box_view.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -17,7 +17,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/views/box_view.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -16,7 +16,7 @@

#include <boost/geometry/views/closeable_view.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/io/dsv/write.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -18,7 +18,7 @@
#include <boost/geometry/views/closeable_view.hpp>
#include <boost/geometry/views/reversible_view.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/io/dsv/write.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -16,7 +16,7 @@

#include <boost/geometry/views/reversible_view.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/geometry/io/dsv/write.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>

Modified: trunk/libs/geometry/test/views/segment_view.cpp
==============================================================================
--- trunk/libs/geometry/test/views/segment_view.cpp (original)
+++ trunk/libs/geometry/test/views/segment_view.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -17,7 +17,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/views/segment_view.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -60,7 +60,7 @@

#include <boost/geometry/strategies/buffer.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -19,7 +19,7 @@
#include <boost/geometry/algorithms/num_points.hpp>
#include <boost/geometry/algorithms/unique.hpp>
#include <boost/geometry/extensions/algorithms/connect.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
+#include <boost/geometry/multi/io/wkt/read.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -26,7 +26,7 @@

#include <boost/geometry/strategies/strategies.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

#include <boost/geometry/multi/algorithms/for_each.hpp>

Modified: trunk/libs/geometry/test_extensions/algorithms/is_convex.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/is_convex.cpp (original)
+++ trunk/libs/geometry/test_extensions/algorithms/is_convex.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -24,8 +24,8 @@
#include <boost/geometry/algorithms/area.hpp>
#include <boost/geometry/algorithms/num_points.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
-#include <boost/geometry/domains/gis/io/wkt/write.hpp>
+#include <boost/geometry/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/write.hpp>

#include <boost/geometry/strategies/strategies.hpp>

@@ -33,7 +33,7 @@
#include <boost/geometry/geometries/point_xy.hpp>

#include <boost/geometry/util/as_range.hpp>
-#include <boost/geometry/domains/gis/io/wkt/stream_wkt.hpp>
+#include <boost/geometry/io/wkt/iomanip.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -24,7 +24,7 @@
#include <boost/geometry/extensions/algorithms/mark_spikes.hpp>
#include <boost/geometry/extensions/algorithms/remove_marked.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -27,7 +27,7 @@
#include <boost/geometry/io/dsv/write.hpp>

-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>

template <typename G>

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -19,7 +19,7 @@
#include <boost/geometry/algorithms/num_points.hpp>
#include <boost/geometry/algorithms/unique.hpp>
#include <boost/geometry/extensions/algorithms/offset.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
+#include <boost/geometry/multi/io/wkt/read.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -24,7 +24,7 @@
#include <boost/geometry/algorithms/make.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -24,7 +24,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/extensions/algorithms/selected.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>

template <typename G, typename P>

Modified: trunk/libs/geometry/test_extensions/arithmetic/cross_product.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/arithmetic/cross_product.cpp (original)
+++ trunk/libs/geometry/test_extensions/arithmetic/cross_product.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -15,8 +15,8 @@
#include <boost/geometry/algorithms/assign.hpp>

#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -18,7 +18,7 @@

#include <boost/geometry/algorithms/equals.hpp>
#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.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/latlong/area_ll.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/gis/latlong/area_ll.cpp (original)
+++ trunk/libs/geometry/test_extensions/gis/latlong/area_ll.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -14,27 +14,21 @@

#include <geometry_test_common.hpp>

-
#include <boost/geometry/algorithms/area.hpp>
#include <boost/geometry/algorithms/transform.hpp>
-
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
-
+#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/strategies/strategies.hpp>

-#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
#include <boost/geometry/extensions/gis/latlong/point_ll.hpp>
#include <boost/geometry/extensions/gis/geographic/strategies/area_huiller_earth.hpp>
-
-
#include <boost/geometry/extensions/gis/projections/epsg.hpp>
#include <boost/geometry/extensions/gis/projections/parameters.hpp>
#include <boost/geometry/extensions/gis/projections/proj/sterea.hpp>

//#include <test_common/test_point.hpp>

-
template <typename PRJ, typename XY, typename LL>
void add_to_ring(PRJ const& prj, LL const& ll,
bg::model::ring<LL>& ring_ll,

Modified: trunk/libs/geometry/test_extensions/gis/latlong/cross_track.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/gis/latlong/cross_track.cpp (original)
+++ trunk/libs/geometry/test_extensions/gis/latlong/cross_track.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -15,23 +15,18 @@

#include <geometry_test_common.hpp>

-
#include <boost/geometry/algorithms/assign.hpp>
#include <boost/geometry/algorithms/distance.hpp>

#include <boost/geometry/strategies/spherical/distance_haversine.hpp>
#include <boost/geometry/strategies/spherical/distance_cross_track.hpp>
+#include <boost/geometry/strategies/concepts/distance_concept.hpp>
#include <boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp>
#include <boost/geometry/extensions/gis/geographic/strategies/distance_cross_track.hpp>
-
-#include <boost/geometry/strategies/concepts/distance_concept.hpp>
-
#include <boost/geometry/geometries/point.hpp>
#include <boost/geometry/geometries/segment.hpp>

-
-
template <typename Point>
void test_distance(
 typename bg::coordinate_type<Point>::type const& lon1,
@@ -62,8 +57,6 @@

 //typedef bg::strategy::distance::andoyer<Point, Point> andoyer_type;

-
-
 Point p1, p2, p3;
 bg::assign(p1, lon1, lat1);
 bg::assign(p2, lon2, lat2);

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -16,7 +16,7 @@
#include <geometry_test_common.hpp>

#include <boost/geometry/algorithms/transform.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/geometry/strategies/strategies.hpp>

#include <boost/geometry/extensions/gis/latlong/point_ll.hpp>

Modified: trunk/libs/geometry/test_extensions/iterators/segment_returning_iterator.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/iterators/segment_returning_iterator.cpp (original)
+++ trunk/libs/geometry/test_extensions/iterators/segment_returning_iterator.cpp 2011-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -21,7 +21,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/segment.hpp>
#include <boost/geometry/extensions/iterators/segment_returning_iterator.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>

template <typename C>
void test_linestring(std::string const& wkt, std::string const& expected)

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-12-15 20:45:22 EST (Thu, 15 Dec 2011)
@@ -14,7 +14,7 @@

#include <boost/geometry/strategies/strategies.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/read.hpp>

template <typename Geometry>

Date view	Thread view	Subject view	Author view

Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk