Imported from /home/lorry/working-area/delta_boost-tarball/boost_1_58_0.tar.bz2.HEADboost_1_58_0master

1 files changed, 37 insertions, 12 deletions

diff --git a/libs/geometry/test/to_svg.hpp b/libs/geometry/test/to_svg.hpp
index e2eccd54f..026e5f929 100644
--- a/libs/geometry/test/to_svg.hpp
+++ b/libs/geometry/test/to_svg.hpp
@@ -31,6 +31,8 @@
 template <typename G, typename Turns, typename Mapper>
 inline void turns_to_svg(Turns const& turns, Mapper & mapper, bool /*enrich*/ = false)
 {
+    namespace bg = boost::geometry;
+
     // turn points in orange, + enrichment/traversal info
     typedef typename bg::coordinate_type<G>::type coordinate_type;
     typedef typename boost::range_value<Turns>::type turn_info;
@@ -85,10 +87,10 @@ inline void turns_to_svg(Turns const& turns, Mapper & mapper, bool /*enrich*/ =
                 << ' ' << turn.operations[0].seg_id.multi_index
                 << ' ' << turn.operations[0].seg_id.ring_index
                 << ' ' << turn.operations[0].seg_id.segment_index << ", ";
-            out << "other: " << turn.operations[0].other_id.source_index
-                << ' ' << turn.operations[0].other_id.multi_index
-                << ' ' << turn.operations[0].other_id.ring_index
-                << ' ' << turn.operations[0].other_id.segment_index;
+            out << "other: " << turn.operations[1].seg_id.source_index
+                << ' ' << turn.operations[1].seg_id.multi_index
+                << ' ' << turn.operations[1].seg_id.ring_index
+                << ' ' << turn.operations[1].seg_id.segment_index;
 
             /*if ( enrich )
             {
@@ -111,10 +113,10 @@ inline void turns_to_svg(Turns const& turns, Mapper & mapper, bool /*enrich*/ =
                 << ' ' << turn.operations[1].seg_id.multi_index
                 << ' ' << turn.operations[1].seg_id.ring_index
                 << ' ' << turn.operations[1].seg_id.segment_index << ", ";
-            out << "other: " << turn.operations[1].other_id.source_index
-                << ' ' << turn.operations[1].other_id.multi_index
-                << ' ' << turn.operations[1].other_id.ring_index
-                << ' ' << turn.operations[1].other_id.segment_index;
+            out << "other: " << turn.operations[0].seg_id.source_index
+                << ' ' << turn.operations[0].seg_id.multi_index
+                << ' ' << turn.operations[0].seg_id.ring_index
+                << ' ' << turn.operations[0].seg_id.segment_index;
 
             /*if ( enrich )
             {
@@ -188,7 +190,8 @@ inline void turns_to_svg(Turns const& turns, Mapper & mapper, bool /*enrich*/ =
 }
 
 template <typename G1, typename P>
-inline void geom_to_svg(G1 const& g1, bg::svg_mapper<P> & mapper)
+inline void geom_to_svg(G1 const& g1,
+                        boost::geometry::svg_mapper<P> & mapper)
 {
     mapper.add(g1);
 
@@ -197,7 +200,8 @@ inline void geom_to_svg(G1 const& g1, bg::svg_mapper<P> & mapper)
 }
 
 template <typename G1, typename G2, typename P>
-inline void geom_to_svg(G1 const& g1, G2 const& g2, bg::svg_mapper<P> & mapper)
+inline void geom_to_svg(G1 const& g1, G2 const& g2,
+                        boost::geometry::svg_mapper<P> & mapper)
 {
     mapper.add(g1);
     mapper.add(g2);
@@ -208,7 +212,7 @@ inline void geom_to_svg(G1 const& g1, G2 const& g2, bg::svg_mapper<P> & mapper)
         "stroke:rgb(51,51,153);stroke-width:3");
 }
 
-template <typename G1, typename G2>
+template <typename G1>
 inline void geom_to_svg(G1 const& g1, std::string const& filename)
 {
     namespace bg = boost::geometry;
@@ -232,9 +236,30 @@ inline void geom_to_svg(G1 const& g1, G2 const& g2, std::string const& filename)
     geom_to_svg(g1, g2, mapper);
 }
 
+template <typename G1>
+inline void geom_to_svg(std::string const& wkt1, std::string const& filename)
+{
+    namespace bg = boost::geometry;
+
+    G1 g1;
+    bg::read_wkt(wkt1, g1);
+    geom_to_svg(g1, filename);
+}
+
+template <typename G1, typename G2>
+inline void geom_to_svg(std::string const& wkt1, std::string const& wkt2, std::string const& filename)
+{
+    namespace bg = boost::geometry;
+
+    G1 g1;
+    G2 g2;
+    bg::read_wkt(wkt1, g1);
+    bg::read_wkt(wkt2, g2);
+    geom_to_svg(g1, g2, filename);
+}
 
 struct to_svg_assign_policy
-    : bg::detail::overlay::assign_null_policy
+    : boost::geometry::detail::overlay::assign_null_policy
 {
     static bool const include_no_turn = false;
     static bool const include_degenerate = false;