From a81582cee996af2d2ceb04ca29e5db67198f0f1c Mon Sep 17 00:00:00 2001
From: Ophir Setter <ophirset@post.tau.ac.il>
Date: Tue, 18 Sep 2007 07:00:47 +0000
Subject: [PATCH] bug fix - _are_vertices_unique and merge

---
 .../include/CGAL/Arr_spherical_arc_traits_2.h | 47 +++++++++++++------
 .../Arrangement_on_surface_2_impl.h           |  4 +-
 2 files changed, 36 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 29700e91bdf..31dbfd26a6e 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
@@ -1303,10 +1303,15 @@ public:
           kernel.counterclockwise_in_between_2_object();
         typename Kernel::Equal_2 equal = kernel.equal_2_object();
 
-        if (xc1.is_vertical()) {
+        if (xc1.is_vertical()) 
+        {
           const Plane_3 & plane1 = xc1.plane();
           const Plane_3 & plane2 = xc2.plane();
+#if defined(CGAL_ARR_PLANE)
+          bool res = plane1.equal(plane2);
+#else
           bool res = kernel.equal_3_object()(plane1, plane2);
+#endif
           if ((!res && (xc1.is_directed_right() == xc2.is_directed_right())) ||
               (res && (xc1.is_directed_right() != xc2.is_directed_right())))
             return oi;
@@ -1435,25 +1440,39 @@ public:
       CGAL_precondition(!xc1.is_degenerate());
       CGAL_precondition(!xc2.is_degenerate());
 
-      CGAL_precondition_code(
-        Kernel kernel;
-        typename Kernel::Equal_3 equal = kernel.equal_3_object();
-      );
+      Kernel kernel;
+      typename Kernel::Equal_3 equal = kernel.equal_3_object();
+
       #if defined(CGAL_ARR_PLANE)
       CGAL_precondition((xc1.plane()).equal(xc2.plane()));
       #else
       CGAL_precondition(equal(xc1.plane(), xc2.plane()));
       #endif
-      CGAL_precondition(equal(xc1.right(), xc2.left()) &&
-                        xc2.left().is_no_boundary());
+      CGAL_precondition_code(Are_mergeable_2 are_merg;);
+      CGAL_precondition (are_merg(xc1, xc2) == true);
 
-      xc.set_source(xc1.left());
-      xc.set_target(xc2.right());
-      xc.set_plane(xc1.plane());
-      xc.set_is_degenerate(false);
-      xc.set_is_x_monotone(true);
-      xc.set_is_vertical(xc1.is_vertical());
-      xc.set_is_directed_right(true);
+      if (equal(xc1.right(), xc2.left()))
+      {
+        xc.set_source(xc1.left());
+        xc.set_target(xc2.right());
+        xc.set_plane(xc1.plane());
+        xc.set_is_degenerate(false);
+        xc.set_is_x_monotone(true);
+        xc.set_is_vertical(xc1.is_vertical());
+        xc.set_is_directed_right(true);
+      }
+      else
+      {
+        CGAL_assertion(equal(xc1.left(), xc2.right()));
+
+        xc.set_source(xc2.left());
+        xc.set_target(xc1.right());
+        xc.set_plane(xc2.plane());
+        xc.set_is_degenerate(false);
+        xc.set_is_x_monotone(true);
+        xc.set_is_vertical(xc2.is_vertical());
+        xc.set_is_directed_right(true);
+      }
     }
   };
 
diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_impl.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_impl.h
index cb719f277d8..a7fbe45801c 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_impl.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_impl.h
@@ -5014,14 +5014,16 @@ _are_vertices_unique() const
   Vertex_const_iterator vit;
   unsigned int          i = 0;
   
-  for (vit = vertices_begin(); vit != vertices_end(); ++vit, ++i)
+  for (vit = vertices_begin(); vit != vertices_end(); ++vit)
   {
     if (vit->boundary_in_x() == NO_BOUNDARY &&
         vit->boundary_in_y() == NO_BOUNDARY)
     { 
       points_vec[i] = vit->point();
+      ++i;
     }
   }
+  points_vec.resize (i);
 
   // Sort the vector of points and make sure no two adjacent points in the
   // sorted vector are equal.