[Boost-commit] svn:boost r86239 - trunk/boost/geometry/algorithms/detail/overlay

Subject: [Boost-commit] svn:boost r86239 - trunk/boost/geometry/algorithms/detail/overlay
From: barend.gehrels_at_[hidden]
Date: 2013-10-11 16:49:05

Author: barendgehrels
Date: 2013-10-11 16:49:05 EDT (Fri, 11 Oct 2013)
New Revision: 86239
URL: http://svn.boost.org/trac/boost/changeset/86239

Log:
[geometry] discard turn points without turn info

Text files modified: 
   trunk/boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp |    12 ++++++++----                            
   1 files changed, 8 insertions(+), 4 deletions(-)

Modified: trunk/boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp	Fri Oct 11 16:42:48 2013	(r86238)
+++ trunk/boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp	2013-10-11 16:49:05 EDT (Fri, 11 Oct 2013)	(r86239)
@@ -112,9 +112,9 @@
             typename geometry::coordinate_system<Geometry1>::type
         > robust_point_type;
 
-    inline void get_situation_map(Indexed const& left, Indexed const& right, 
-                              robust_point_type& pi_rob, robust_point_type& pj_rob, 
-                              robust_point_type& ri_rob, robust_point_type& rj_rob, 
+    inline void get_situation_map(Indexed const& left, Indexed const& right,
+                              robust_point_type& pi_rob, robust_point_type& pj_rob,
+                              robust_point_type& ri_rob, robust_point_type& rj_rob,
                               robust_point_type& si_rob, robust_point_type& sj_rob) const
     {
         typename geometry::point_type<Geometry1>::type pi, pj, ri, rj, si, sj;
@@ -128,7 +128,7 @@
         geometry::copy_segment_points<Reverse1, Reverse2>(m_geometry1, m_geometry2,
             right.subject.other_id,
             si, sj);
-        geometry::zoom_to_robust(pi, pj, ri, rj, si, sj, 
+        geometry::zoom_to_robust(pi, pj, ri, rj, si, sj,
                                     pi_rob, pj_rob, ri_rob, rj_rob, si_rob, sj_rob);
     }
 
@@ -484,6 +484,10 @@
         {
             it->discarded = true;
         }
+        if (it->both(detail::overlay::operation_none))
+        {
+            it->discarded = true;
+        }
     }