Fixed (mostly multi)tests for wkt update

[SVN r76016]
2025-05-11 21:44:04 +00:00 · 2011-12-17 12:34:39 +00:00 · 2011-12-17 12:34:39 +00:00 · 4be8f12c77
commit 4be8f12c77
parent c369fb6ade
19 changed files with 23 additions and 3 deletions
--- a/test/algorithms/detail/partition.cpp
+++ b/test/algorithms/detail/partition.cpp
@ -18,6 +18,7 @@
 #include <boost/geometry/algorithms/detail/partition.hpp>

 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>

 #if defined(TEST_WITH_SVG)
 # include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
--- a/test/algorithms/difference.cpp
+++ b/test/algorithms/difference.cpp
@ -27,6 +27,7 @@
 #include <boost/geometry/multi/algorithms/correct.hpp>
 #include <boost/geometry/multi/algorithms/intersection.hpp>
 #include <boost/geometry/multi/algorithms/within.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>

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

--- a/test/algorithms/distance.cpp
+++ b/test/algorithms/distance.cpp
@ -221,6 +221,7 @@ void test_all()
    // open
    test_geometry<P, bg::model::polygon<P, true, false> >("POINT(2 2)", "POLYGON ((0 0,1 9,8 1),(1 1,4 1,1 4))", 0.5 * sqrt(2.0));

+    test_geometry<bg::model::polygon<P>, bg::model::polygon<P> >(donut, donut, 0.5 * sqrt(2.0));

    // DOES NOT COMPILE - cannot do read_wkt (because boost::array is not variably sized)
    // test_geometry<P, boost::array<P, 2> >("POINT(3 1)", "LINESTRING(1 1,4 4)", sqrt(2.0));
--- a/test/multi/algorithms/multi_area.cpp
+++ b/test/multi/algorithms/multi_area.cpp
@ -15,6 +15,7 @@
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>

 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>



--- a/test/multi/algorithms/multi_convert.cpp
+++ b/test/multi/algorithms/multi_convert.cpp
@ -13,6 +13,9 @@
 #include <boost/geometry/multi/geometries/multi_linestring.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>

+#include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>
+

 template <typename Point1, typename Point2>
 void test_mixed_point_types()
--- a/test/multi/algorithms/multi_convex_hull.cpp
+++ b/test/multi/algorithms/multi_convex_hull.cpp
@ -32,6 +32,7 @@
 #include <boost/geometry/multi/algorithms/detail/for_each_range.hpp>

 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>

 #include <boost/geometry/multi/geometries/multi_point.hpp>
 #include <boost/geometry/multi/geometries/multi_linestring.hpp>
--- a/test/multi/algorithms/multi_correct.cpp
+++ b/test/multi/algorithms/multi_correct.cpp
@ -14,6 +14,7 @@
 #include <boost/geometry/multi/algorithms/correct.hpp>

 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>

 #include <boost/geometry/geometries/box.hpp>
 #include <boost/geometry/geometries/ring.hpp>
--- a/test/multi/algorithms/multi_covered_by.cpp
+++ b/test/multi/algorithms/multi_covered_by.cpp
@ -7,8 +7,6 @@

 #include <geometry_test_common.hpp>

-#include <boost/geometry/io/wkt/wkt.hpp>
-
 #include <boost/geometry/algorithms/correct.hpp>
 #include <boost/geometry/algorithms/covered_by.hpp>

@ -21,6 +19,9 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>

+#include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>
+
 #include <algorithms/test_covered_by.hpp>


--- a/test/multi/algorithms/multi_for_each.cpp
+++ b/test/multi/algorithms/multi_for_each.cpp
@ -11,6 +11,7 @@
 #include <boost/geometry/multi/algorithms/for_each.hpp>

 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>

 #include <boost/geometry/geometries/box.hpp>
 #include <boost/geometry/geometries/ring.hpp>
--- a/test/multi/algorithms/multi_length.cpp
+++ b/test/multi/algorithms/multi_length.cpp
@ -15,6 +15,7 @@
 #include <boost/geometry/multi/geometries/multi_linestring.hpp>

 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>



--- a/test/multi/algorithms/multi_num_geometries.cpp
+++ b/test/multi/algorithms/multi_num_geometries.cpp
@ -11,6 +11,7 @@
 #include <boost/geometry/multi/algorithms/num_geometries.hpp>

 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>

 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
--- a/test/multi/algorithms/multi_num_interior_rings.cpp
+++ b/test/multi/algorithms/multi_num_interior_rings.cpp
@ -11,6 +11,7 @@
 #include <boost/geometry/multi/algorithms/num_interior_rings.hpp>

 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>

 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
--- a/test/multi/algorithms/multi_num_points.cpp
+++ b/test/multi/algorithms/multi_num_points.cpp
@ -11,6 +11,7 @@
 #include <boost/geometry/multi/algorithms/num_points.hpp>

 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>

 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
--- a/test/multi/algorithms/multi_perimeter.cpp
+++ b/test/multi/algorithms/multi_perimeter.cpp
@ -11,6 +11,7 @@
 #include <boost/geometry/multi/algorithms/perimeter.hpp>

 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>

 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
--- a/test/multi/algorithms/multi_reverse.cpp
+++ b/test/multi/algorithms/multi_reverse.cpp
@ -11,6 +11,7 @@
 #include <boost/geometry/multi/algorithms/reverse.hpp>

 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>

 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
--- a/test/multi/algorithms/multi_simplify.cpp
+++ b/test/multi/algorithms/multi_simplify.cpp
@ -10,6 +10,7 @@
 #include <boost/geometry/multi/algorithms/simplify.hpp>

 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>

 #include <boost/geometry/geometries/box.hpp>
 #include <boost/geometry/geometries/ring.hpp>
--- a/test/multi/algorithms/multi_transform.cpp
+++ b/test/multi/algorithms/multi_transform.cpp
@ -29,7 +29,7 @@
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>

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


 // This test is a little different from transform.cpp test.
--- a/test/multi/algorithms/multi_unique.cpp
+++ b/test/multi/algorithms/multi_unique.cpp
@ -11,6 +11,7 @@
 #include <boost/geometry/multi/algorithms/unique.hpp>

 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>

 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
--- a/test/multi/algorithms/multi_within.cpp
+++ b/test/multi/algorithms/multi_within.cpp
@ -8,6 +8,7 @@
 #include <geometry_test_common.hpp>

 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/multi/io/wkt/wkt.hpp>

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