From 048db7f1fc55082e9cf50dac7918da1b316c3861 Mon Sep 17 00:00:00 2001
From: Hanno Braun <hanno@braun-odw.eu>
Date: Fri, 14 Oct 2022 16:43:33 +0200
Subject: [PATCH] Fix `SurfaceVertex` duplication issue

The first and last `SurfaceVertex` of the `Cycle` built in this code
wasn't the same.
---
 crates/fj-kernel/src/partial/objects/cycle.rs | 36 +++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/crates/fj-kernel/src/partial/objects/cycle.rs b/crates/fj-kernel/src/partial/objects/cycle.rs
index 2c791cadc..f4df40e7c 100644
--- a/crates/fj-kernel/src/partial/objects/cycle.rs
+++ b/crates/fj-kernel/src/partial/objects/cycle.rs
@@ -160,12 +160,44 @@ impl PartialCycle {
     }
 
     /// Build a full [`Cycle`] from the partial cycle
-    pub fn build(self, objects: &Objects) -> Cycle {
+    pub fn build(mut self, objects: &Objects) -> Cycle {
         let surface = self.surface.expect("Need surface to build `Cycle`");
         let surface_for_edges = surface.clone();
         let half_edges = {
+            let last_vertex = self
+                .half_edges
+                .last_mut()
+                .and_then(|half_edge| {
+                    half_edge.front().map(|vertex| (half_edge, vertex))
+                })
+                .and_then(|(half_edge, vertex)| {
+                    vertex.surface_form().map(|surface_vertex| {
+                        (half_edge, vertex, surface_vertex)
+                    })
+                })
+                .map(|(half_edge, vertex, surface_vertex)| {
+                    let surface_vertex = surface_vertex
+                        .update_partial(|surface_vertex| {
+                            surface_vertex.with_surface(Some(surface.clone()))
+                        })
+                        .into_full(objects);
+
+                    *half_edge =
+                        half_edge.clone().update_partial(|half_edge| {
+                            half_edge.with_front_vertex(Some(
+                                vertex.update_partial(|vertex| {
+                                    vertex.with_surface_form(Some(
+                                        surface_vertex.clone(),
+                                    ))
+                                }),
+                            ))
+                        });
+
+                    surface_vertex
+                });
+
             let (half_edges, _) = self.half_edges.into_iter().fold(
-                (Vec::new(), None),
+                (Vec::new(), last_vertex),
                 |(mut half_edges, previous_vertex), half_edge| {
                     let half_edge = half_edge
                         .update_partial(|half_edge| {