From 82c3a325e9c2690c8513868c6fe483b2f4021d18 Mon Sep 17 00:00:00 2001
From: jgv <jgv@opencascade.com>
Date: Fri, 27 Aug 2021 12:53:29 +0300
Subject: [PATCH] 0032502: Modeling Algorithms - BOP wrong result on sphere and
 cylinder

Modifications in the method IntPatch_ALineToWLine::MakeWLine:
correct setting parameters to vertices on IntPatch_WLine curve.
---
 src/IntPatch/IntPatch_ALineToWLine.cxx | 12 +++++++++---
 tests/bugs/modalg_7/bug32502           | 24 ++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 tests/bugs/modalg_7/bug32502

diff --git a/src/IntPatch/IntPatch_ALineToWLine.cxx b/src/IntPatch/IntPatch_ALineToWLine.cxx
index cfe8227d7f..bcf5d97ce7 100644
--- a/src/IntPatch/IntPatch_ALineToWLine.cxx
+++ b/src/IntPatch/IntPatch_ALineToWLine.cxx
@@ -676,7 +676,11 @@ void IntPatch_ALineToWLine::MakeWLine(const Handle(IntPatch_ALine)& theALine,
             IntPatch_Point aLVtx = theALine->Vertex(i);
             aLVtx.SetValue(aVertP2S);
             aLVtx.SetTolerance(aVertToler);
-            aLVtx.SetParameter(aNewVertexParam);
+            Standard_Real aParam = aLVtx.ParameterOnLine();
+            if (Abs(aParam - theLPar) <= Precision::PConfusion()) //in the case of closed curve,
+              aLVtx.SetParameter(-1); //we don't know yet the number of points in the curve
+            else
+              aLVtx.SetParameter(aNewVertexParam);
             aSeqVertex(++aNewVertID) = aLVtx;
             hasVertexBeenChecked(i) = Standard_True;
             isFound = Standard_True;
@@ -748,7 +752,9 @@ void IntPatch_ALineToWLine::MakeWLine(const Handle(IntPatch_ALine)& theALine,
 
     for(Standard_Integer i = aSeqVertex.Lower(); i <= aNewVertID; i++)
     {
-      const IntPatch_Point& aVtx = aSeqVertex(i);
+      IntPatch_Point aVtx = aSeqVertex(i);
+      if (aVtx.ParameterOnLine() == -1) //in the case of closed curve,
+        aVtx.SetParameter (aWLine->NbPnts()); //we set the last parameter
       aWLine->AddVertex(aVtx);
     }
 
@@ -756,7 +762,7 @@ void IntPatch_ALineToWLine::MakeWLine(const Handle(IntPatch_ALine)& theALine,
 
     //the method ComputeVertexParameters can reduce the number of points in <aWLine>
     aWLine->ComputeVertexParameters(myTol3D);
-
+    
     if (aWLine->NbPnts() > 1)
     {
       aWLine->EnablePurging(Standard_False);
diff --git a/tests/bugs/modalg_7/bug32502 b/tests/bugs/modalg_7/bug32502
new file mode 100644
index 0000000000..2f4cef1dbf
--- /dev/null
+++ b/tests/bugs/modalg_7/bug32502
@@ -0,0 +1,24 @@
+puts "================================================="
+puts "OCC32502: BOP wrong result on sphere and cylinder"
+puts "================================================="
+puts ""
+
+psphere sph 10
+plane pln 0 0 7 0 1 0 0 0 1
+pcylinder cyl pln 3 40
+ttranslate cyl 0 -20 0
+
+bop sph cyl
+bopfuse result
+
+checkshape result
+
+checknbshapes result -t -vertex 4 -edge 11 -wire 5 -face 5 -shell 1 -solid 1
+
+set tolres [checkmaxtol result]
+
+if { ${tolres} > 3.e-5} {
+   puts "Error: bad tolerance of result"
+}
+
+checkprops result -s 1750.1 -v 4947.2