From 3ba205339efd4e5f771f59f0fb0c42bd2131e483 Mon Sep 17 00:00:00 2001
From: Ophir Setter <ophirset@post.tau.ac.il>
Date: Tue, 11 Sep 2007 07:50:27 +0000
Subject: [PATCH] Adding insertion function that receives visitor - was needed
 for Envelope_3

---
 .../include/CGAL/Arr_spherical_arc_traits_2.h |  1 +
 .../include/CGAL/Arrangement_2.h              |  3 +-
 .../Arrangement_on_surface_2_global.h         | 40 +++++++++++++------
 .../CGAL/graph_traits_Dual_Arrangement_2.h    |  1 +
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_arc_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_arc_traits_2.h
index a194836d87f..450a7419049 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_arc_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_arc_traits_2.h
@@ -407,6 +407,7 @@ public:
   typedef Arr_extended_direction_3<Kernel>      Point_2;
   typedef Arr_spherical_arc_3<Kernel>           X_monotone_curve_2;
   typedef Arr_spherical_arc_3<Kernel>           Curve_2;
+  typedef unsigned int                          Multiplicity;
 
 public:
   /// \name Basic functor definitions
diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2.h
index 82d2c191927..8cc28a97703 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2.h
@@ -54,12 +54,11 @@ private:
   typedef Default_planar_topology<GeomTraits_,
                                   Dcel_,
                                   Has_boundary>           Default_topology;
+public:
   typedef Arrangement_on_surface_2<GeomTraits_,
                                    typename Default_topology::Traits>
                                                           Base;
 
-public:
-
   typedef GeomTraits_                                     Geometry_traits_2;
 
   typedef Dcel_                                           Dcel;
diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h
index f17ea52a312..a4e2f9e235d 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h
@@ -60,20 +60,21 @@ CGAL_BEGIN_NAMESPACE
 // const Arr_segment_2&, const Arr_walk_along_line_point_location<>&, 
 // mpl_::bool_< true>)'
 //
-template <class GeomTraits, class TopTraits, class PointLocation>
+template <class GeomTraits, class TopTraits, class PointLocation, 
+  class ZoneVisitor>
 void insert (Arrangement_on_surface_2<GeomTraits, TopTraits>& arr, 
              const typename GeomTraits::Curve_2& c,
-             const PointLocation& pl, boost::is_same<int, double>::type)
+             const PointLocation& pl, ZoneVisitor &visitor, 
+             boost::is_same<int, double>::type)
 {
   typedef Arrangement_on_surface_2<GeomTraits, TopTraits>  Arr;
-  typedef typename TopTraits::Zone_insertion_visitor       Zone_visitor;
+  typedef ZoneVisitor                                      Zone_visitor;
 
   // Obtain an arrangement accessor.
   Arr_accessor<Arr>                      arr_access (arr);
 
-  // Define a zone-computation object an a visitor that performs the
+  // Initialize a zone-computation object an a visitor that performs the
   // incremental insertion.
-  Zone_visitor                           visitor;
   Arrangement_zone_2<Arr, Zone_visitor>  arr_zone (arr, &visitor);
 
   // Break the input curve into x-monotone subcurves and isolated points.
@@ -134,20 +135,21 @@ void insert (Arrangement_on_surface_2<GeomTraits, TopTraits>& arr,
 // mpl_::bool_< true>)'
 //
 //
-template <class GeomTraits, class TopTraits, class PointLocation>
+template <class GeomTraits, class TopTraits, class PointLocation, 
+  class ZoneVisitor>
 void insert(Arrangement_on_surface_2<GeomTraits, TopTraits>& arr,
             const typename GeomTraits::X_monotone_curve_2& c,
-            const PointLocation& pl, boost::is_same<int, int>::type)
+            const PointLocation& pl, ZoneVisitor &visitor, 
+            boost::is_same<int, int>::type)
 {
   typedef Arrangement_on_surface_2<GeomTraits, TopTraits>  Arr;
-  typedef typename TopTraits::Zone_insertion_visitor       Zone_visitor;
+  typedef ZoneVisitor                                      Zone_visitor;
 
   // Obtain an arrangement accessor.
   Arr_accessor<Arr>                      arr_access (arr);
 
-  // Define a zone-computation object an a visitor that performs the
+  // Initialize a zone-computation object an a visitor that performs the
   // incremental insertion.
-  Zone_visitor                           visitor;
   Arrangement_zone_2<Arr, Zone_visitor>  arr_zone (arr, &visitor);
 
   // Initialize the zone-computation object with the given curve.
@@ -167,16 +169,28 @@ void insert(Arrangement_on_surface_2<GeomTraits, TopTraits>& arr,
 
 //-----------------------------------------------------------------------------
 // Common interface for the insert of the Curve_2 and X_monotone_curve_2
-template <class GeomTraits, class TopTraits, class Curve, class PointLocation>
+template <class GeomTraits, class TopTraits, class Curve, class PointLocation, 
+  class ZoneVisitor>
 void insert (Arrangement_on_surface_2<GeomTraits, TopTraits>& arr,
-                   const Curve& c, const PointLocation& pl)
+             const Curve& c, const PointLocation& pl, ZoneVisitor &visitor)
 {
   typedef typename GeomTraits::X_monotone_curve_2       X_monotone_curve_2;
   
   typedef typename boost::is_same<Curve, X_monotone_curve_2>::type
     Is_x_monotone;
   
-  return insert(arr, c, pl, Is_x_monotone());
+  return insert(arr, c, pl, visitor, Is_x_monotone());
+}
+
+template <class GeomTraits, class TopTraits, class Curve, class PointLocation>
+void insert (Arrangement_on_surface_2<GeomTraits, TopTraits>& arr,
+             const Curve& c, const PointLocation& pl)
+{
+  typedef Arrangement_on_surface_2<GeomTraits, TopTraits>  Arr;
+  typedef typename TopTraits::Zone_insertion_visitor       Zone_visitor;
+  
+  Zone_visitor visitor;
+  insert (arr, c, pl, visitor);
 }
 
 //-----------------------------------------------------------------------------
diff --git a/Arrangement_on_surface_2/include/CGAL/graph_traits_Dual_Arrangement_2.h b/Arrangement_on_surface_2/include/CGAL/graph_traits_Dual_Arrangement_2.h
index 8a346957243..e0eef0f86ae 100644
--- a/Arrangement_on_surface_2/include/CGAL/graph_traits_Dual_Arrangement_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/graph_traits_Dual_Arrangement_2.h
@@ -27,6 +27,7 @@
  */
 
 #include <CGAL/Arrangement_on_surface_2.h>
+#include <CGAL/Arrangement_2.h>
 
 CGAL_BEGIN_NAMESPACE