From 4958e9d785874ce1f24de49a56b53e9bee11bd65 Mon Sep 17 00:00:00 2001
From: jfa <jfa@opencascade.com>
Date: Mon, 1 Feb 2021 13:54:18 +0300
Subject: [PATCH] bos #20546: EDF 22644 - Offset not closed.

---
 src/GeomAlgoAPI/GeomAlgoAPI_WireBuilder.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_WireBuilder.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_WireBuilder.cpp
index 2a6c42497..a7b313945 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_WireBuilder.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_WireBuilder.cpp
@@ -34,6 +34,7 @@
 #include <TopoDS_Wire.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
+#include <ShapeFix_Wire.hxx>
 
 #include <cmath>
 #include <map>
@@ -164,8 +165,15 @@ GeomAlgoAPI_WireBuilder::GeomAlgoAPI_WireBuilder(const ListOfShape& theShapes,
     setImpl(aWireBuilder);
     setBuilderType(OCCT_BRepBuilderAPI_MakeShape);
 
-    // split the result wire
+    // fix edges order (bos #20546)
     TopoDS_Wire aWire = aWireBuilder->Wire();
+    Handle(ShapeFix_Wire) aFW = new ShapeFix_Wire;
+    aFW->Load(aWire);
+    aFW->FixReorder();
+    if (aFW->StatusReorder(ShapeExtend_DONE))
+      aWire = aFW->WireAPIMake();
+
+    // split the result wire
     if (isSplitWire && BRep_Tool::IsClosed(aWire)) {
       TopoDS_Wire aNewWire;
       BRep_Builder aBuilder;
@@ -285,4 +293,4 @@ bool GeomAlgoAPI_WireBuilder::isSelfIntersected(const GeomShapePtr& theWire)
   }
 
   return false;
-}
\ No newline at end of file
+}
-- 
2.30.2