From 99582c6319a20a5eaaab9ad4d38f52f9e2632d68 Mon Sep 17 00:00:00 2001
From: Hanno Braun <hello@hannobraun.com>
Date: Fri, 13 Sep 2024 20:29:23 +0200
Subject: [PATCH] Add new-style curve geometry to `Geometry`

---
 crates/fj-core/src/geometry/geometry.rs | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/crates/fj-core/src/geometry/geometry.rs b/crates/fj-core/src/geometry/geometry.rs
index 4a4ab9caf..42c7293ce 100644
--- a/crates/fj-core/src/geometry/geometry.rs
+++ b/crates/fj-core/src/geometry/geometry.rs
@@ -8,13 +8,14 @@ use crate::{
 };
 
 use super::{
-    vertex::LocalVertexGeom, CurveGeom, LocalCurveGeom, Path, SurfaceGeom,
-    VertexGeom,
+    vertex::LocalVertexGeom, CurveGeom, CurveGeom2, LocalCurveGeom, Path,
+    SurfaceGeom, VertexGeom,
 };
 
 /// Geometric data that is associated with topological objects
 pub struct Geometry {
     curve: BTreeMap<Handle<Curve>, CurveGeom>,
+    curve2: BTreeMap<Handle<Curve>, CurveGeom2>,
     surface: BTreeMap<Handle<Surface>, SurfaceGeom>,
     vertex: BTreeMap<Handle<Vertex>, VertexGeom>,
 
@@ -30,6 +31,7 @@ impl Geometry {
     pub fn new(topology: &Topology) -> Self {
         let mut self_ = Self {
             curve: BTreeMap::new(),
+            curve2: BTreeMap::new(),
             surface: BTreeMap::new(),
             vertex: BTreeMap::new(),
 
@@ -116,6 +118,18 @@ impl Geometry {
         self.curve.get(curve)
     }
 
+    /// # Access the geometry of the provided curve
+    ///
+    /// ## Implementation Note
+    ///
+    /// There currently is an ongoing transition to a new geometry system. This
+    /// method returns the new-style geometry. Its name is temporary, while the
+    /// method returning the old-style geometry is still taking up the more
+    /// concise name.
+    pub fn of_curve_2(&self, curve: &Handle<Curve>) -> Option<&CurveGeom2> {
+        self.curve2.get(curve)
+    }
+
     /// # Access the geometry of the provided surface
     ///
     /// ## Panics