minor refactor

CGAL · Jul 10, 2023 · 824d989 · 824d989
1 parent 83d22ac
commit 824d989
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/Arrangement_on_surface_2/demo/earth/Aos.cpp b/Arrangement_on_surface_2/demo/earth/Aos.cpp
@@ -392,12 +392,12 @@ std::vector<QVector3D> Aos::ext_check(const Kml::Placemarks& placemarks)
 std::vector<QVector3D>  Aos::ext_check_id_based(Kml::Placemarks& placemarks)
 {
   // Construct the arrangement from 12 geodesic arcs.
-  Geom_traits traits, traits2;
-  Ext_aos arr(&traits), arr2(&traits2);
+  Geom_traits traits;
+  Ext_aos arr(&traits);
 
   // 
-  //auto nodes = Kml::generate_ids(placemarks);
-  auto nodes = Kml::generate_ids_approx(placemarks, 0.001);
+  auto nodes = Kml::generate_ids(placemarks);
+  //auto nodes = Kml::generate_ids_approx(placemarks, 0.001);
 
   //Segment s()
   auto ctr_p = traits.construct_point_2_object();
@@ -407,8 +407,7 @@ std::vector<QVector3D>  Aos::ext_check_id_based(Kml::Placemarks& placemarks)
   int num_counted_polygons = 0;
   // 
   std::vector<Point> points;
-  using Vertex_handle = decltype(CGAL::insert_point(arr2, ctr_p(1, 0, 0)));
-  std::vector<Vertex_handle> vertices;
+  std::vector<Ext_aos::Vertex_handle> vertices;
   for (const auto& node : nodes)
   {
     auto n = node.get_coords_3d();

diff --git a/Arrangement_on_surface_2/demo/earth/Main_widget.cpp b/Arrangement_on_surface_2/demo/earth/Main_widget.cpp
@@ -228,8 +228,8 @@ void Main_widget::initializeGL()
   else
   {
     // check the arrangement constructed from the GIS data-set
-    //auto created_vertices = Aos::ext_check(m_countries);
-    auto created_vertices = Aos::ext_check_id_based(m_countries);
+    auto created_vertices = Aos::ext_check(m_countries);
+    //auto created_vertices = Aos::ext_check_id_based(m_countries);
     m_vertices = std::make_unique<Vertices>(created_vertices);
   }