@itwin/core-geometry 5.9.0-dev.9 → 5.9.1

package/lib/cjs/curve/internalContexts/CurveCurveIntersectXY.js

@@ -155,7 +155,8 @@ class CurveCurveIntersectXY extends GeometryHandler_1.RecurseToCurvesGeometryHan
      * @param fractionB1 end of the subcurve of cpB
      * @param reversed whether to reverse the details in the recorded intersection pair
      * @param intervalDetails optional data for a coincident segment intersection
-     * @param fractionTol relative tolerance for comparing fractions to avoid duplicating the last intersection. Defaults to [[Geometry.smallAngleRadians]].
+     * @param fractionTol relative tolerance for comparing fractions to avoid duplicating the last intersection. Defaults
+     * to [[Geometry.smallAngleRadians]].
      */
     recordPointWithLocalFractions(localFractionA, cpA, fractionA0, fractionA1, localFractionB, cpB, fractionB0, fractionB1, reversed, intervalDetails, fractionTol) {
         let globalFractionA, globalFractionB;
@@ -582,9 +583,9 @@ class CurveCurveIntersectXY extends GeometryHandler_1.RecurseToCurvesGeometryHan
             bezierA.fractionToPoint4d(f1, this._xyzwA1);
             Point4d_1.Point4d.createPlanePointPointZ(this._xyzwA0, this._xyzwA1, this._xyzwPlane);
             bezierB.poleProductsXYZW(univariateBezierB.coffs, this._xyzwPlane.x, this._xyzwPlane.y, this._xyzwPlane.z, this._xyzwPlane.w);
-            let errors = 0;
             const roots = univariateBezierB.roots(0.0, true);
             if (roots) {
+                const strictTolerance = this._coincidentGeometryContext.tolerance * 0.0001;
                 for (const r of roots) {
                     let bezierBFraction = r;
                     bezierB.fractionToPoint4d(bezierBFraction, this._xyzwB);
@@ -596,28 +597,19 @@ class CurveCurveIntersectXY extends GeometryHandler_1.RecurseToCurvesGeometryHan
                         const xyMatchingFunction = new Newton_1.CurveCurveIntersectionXYRRToRRD(bezierA, bezierB);
                         const newtonSearcher = new Newton_1.Newton2dUnboundedWithDerivative(xyMatchingFunction);
                         newtonSearcher.setUV(bezierAFraction, bezierBFraction);
-                        if (newtonSearcher.runIterations()) {
-                            bezierAFraction = newtonSearcher.getU();
-                            bezierBFraction = newtonSearcher.getV();
-                        }
+                        let converged = newtonSearcher.runIterations();
+                        bezierAFraction = newtonSearcher.getU();
+                        bezierBFraction = newtonSearcher.getV();
                         const bcurveAFraction = bezierA.fractionToParentFraction(bezierAFraction);
                         const bcurveBFraction = bezierB.fractionToParentFraction(bezierBFraction);
-                        if (false) { // verify results
-                            const xyzA0 = bezierA.fractionToPoint(bezierAFraction);
-                            const xyzA1 = bcurveA.fractionToPoint(bcurveAFraction);
-                            const xyzB0 = bezierB.fractionToPoint(bezierBFraction);
-                            const xyzB1 = bcurveB.fractionToPoint(bcurveBFraction);
-                            if (!xyzA0.isAlmostEqualXY(xyzA1))
-                                errors++;
-                            if (!xyzB0.isAlmostEqualXY(xyzB1))
-                                errors++;
-                            if (errors > 0 && !xyzA0.isAlmostEqual(xyzB0))
-                                errors++;
-                            if (errors > 0 && !xyzA1.isAlmostEqual(xyzB1))
-                                errors++;
-                        }
                         if (this.acceptFraction(false, bcurveAFraction, false) && this.acceptFraction(false, bcurveBFraction, false)) {
-                            this.recordPointWithLocalFractions(bcurveAFraction, bcurveA, 0, 1, bcurveBFraction, bcurveB, 0, 1, reversed);
+                            const pointA = bezierA.fractionToPoint(bezierAFraction, CurveCurveIntersectXY._workPointA0);
+                            const pointB = bezierB.fractionToPoint(bezierBFraction, CurveCurveIntersectXY._workPointB0);
+                            if (!converged) { // Newton may have found close points even if it didn't converge parametrically
+                                converged = pointA.isAlmostEqualXY(pointB, strictTolerance); // we can afford to be choosy
+                            }
+                            if (converged)
+                                this.recordPointWithLocalFractions(bcurveAFraction, bcurveA, 0, 1, bcurveBFraction, bcurveB, 0, 1, reversed);
                         }
                     }
                 }
@@ -846,137 +838,6 @@ class CurveCurveIntersectXY extends GeometryHandler_1.RecurseToCurvesGeometryHan
         this.resetGeometryB(geomB); // restore
         this._results = CurveChainWithDistanceIndex_1.CurveChainWithDistanceIndex.convertChildDetailToChainDetail(this._results, index0, undefined, geomB, true);
     }
-    /**
-     * Invoke dispatch on each child of `g` as "geometryA".
-     * * If `g` is a `Path` or `Loop`, adjust extension flags for geometryA accordingly.
-     */
-    handleChildren(g) {
-        const children = g.children;
-        if (!children)
-            return;
-        const saveExtendA0 = this._extendA0;
-        const saveExtendA1 = this._extendA1;
-        for (let i = 0; i < children.length; i++) {
-            let extendA0 = saveExtendA0;
-            let extendA1 = saveExtendA1;
-            if (g instanceof Path_1.Path && children.length > 1) {
-                if (i === 0)
-                    extendA1 = false; // first child can only extend from start
-                else if (i === children.length - 1)
-                    extendA0 = false; // last child can only extend from end
-                else
-                    extendA0 = extendA1 = false; // middle children cannot extend
-            }
-            else if (g instanceof Loop_1.Loop) {
-                extendA0 = extendA1 = false; // Loops cannot extend
-            }
-            this.resetGeometryA(extendA0, extendA1);
-            children[i].dispatchToGeometryHandler(this);
-        }
-        this.resetGeometryA(saveExtendA0, saveExtendA1);
-    }
-    /** Double dispatch handler for strongly typed segment. */
-    handleLineSegment3d(segmentA) {
-        if (this._geometryB instanceof LineSegment3d_1.LineSegment3d) {
-            const segmentB = this._geometryB;
-            this.dispatchSegmentSegment(segmentA, this._extendA0, segmentA.point0Ref, 0.0, segmentA.point1Ref, 1.0, this._extendA1, segmentB, this._extendB0, segmentB.point0Ref, 0.0, segmentB.point1Ref, 1.0, this._extendB1, false);
-        }
-        else if (this._geometryB instanceof LineString3d_1.LineString3d) {
-            this.computeSegmentLineString(segmentA, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
-        }
-        else if (this._geometryB instanceof Arc3d_1.Arc3d) {
-            this.dispatchSegmentArc(segmentA, this._extendA0, segmentA.point0Ref, 0.0, segmentA.point1Ref, 1.0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
-        }
-        else if (this._geometryB instanceof BSplineCurve_1.BSplineCurve3d) {
-            this.dispatchSegmentBsplineCurve(segmentA, this._extendA0, segmentA.point0Ref, 0.0, segmentA.point1Ref, 1.0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
-        }
-        else if (this._geometryB instanceof TransitionSpiral3d_1.TransitionSpiral3d) {
-            this.dispatchCurveSpiral(segmentA, this._extendA0, this._extendA1, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof CurveCollection_1.CurveCollection) {
-            this.dispatchCurveCollection(segmentA, this.handleLineSegment3d.bind(this));
-        }
-        else if (this._geometryB instanceof CurveChainWithDistanceIndex_1.CurveChainWithDistanceIndex) {
-            this.dispatchCurveChainWithDistanceIndex(segmentA, this.handleLineSegment3d.bind(this));
-        }
-        return undefined;
-    }
-    /** Double dispatch handler for strongly typed linestring. */
-    handleLineString3d(lsA) {
-        if (this._geometryB instanceof LineString3d_1.LineString3d) {
-            const lsB = this._geometryB;
-            this.computeLineStringLineString(lsA, this._extendA0, this._extendA1, lsB, this._extendB0, this._extendB1, false);
-        }
-        else if (this._geometryB instanceof LineSegment3d_1.LineSegment3d) {
-            this.computeSegmentLineString(this._geometryB, this._extendB0, this._extendB1, lsA, this._extendA0, this._extendA1, true);
-        }
-        else if (this._geometryB instanceof Arc3d_1.Arc3d) {
-            this.computeArcLineString(this._geometryB, this._extendB0, this._extendB1, lsA, this._extendA0, this._extendA1, true);
-        }
-        else if (this._geometryB instanceof BSplineCurve_1.BSplineCurve3d) {
-            this.dispatchLineStringBSplineCurve(lsA, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
-        }
-        else if (this._geometryB instanceof TransitionSpiral3d_1.TransitionSpiral3d) {
-            this.dispatchCurveSpiral(lsA, this._extendA0, this._extendA1, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof CurveCollection_1.CurveCollection) {
-            this.dispatchCurveCollection(lsA, this.handleLineString3d.bind(this));
-        }
-        else if (this._geometryB instanceof CurveChainWithDistanceIndex_1.CurveChainWithDistanceIndex) {
-            this.dispatchCurveChainWithDistanceIndex(lsA, this.handleLineString3d.bind(this));
-        }
-        return undefined;
-    }
-    /** Double dispatch handler for strongly typed arc. */
-    handleArc3d(arcA) {
-        if (this._geometryB instanceof LineSegment3d_1.LineSegment3d) {
-            this.dispatchSegmentArc(this._geometryB, this._extendB0, this._geometryB.point0Ref, 0.0, this._geometryB.point1Ref, 1.0, this._extendB1, arcA, this._extendA0, this._extendA1, true);
-        }
-        else if (this._geometryB instanceof LineString3d_1.LineString3d) {
-            this.computeArcLineString(arcA, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
-        }
-        else if (this._geometryB instanceof Arc3d_1.Arc3d) {
-            this.dispatchArcArc(arcA, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
-        }
-        else if (this._geometryB instanceof BSplineCurve_1.BSplineCurve3d) {
-            this.dispatchArcBsplineCurve3d(arcA, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
-        }
-        else if (this._geometryB instanceof TransitionSpiral3d_1.TransitionSpiral3d) {
-            this.dispatchCurveSpiral(arcA, this._extendA0, this._extendA1, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof CurveCollection_1.CurveCollection) {
-            this.dispatchCurveCollection(arcA, this.handleArc3d.bind(this));
-        }
-        else if (this._geometryB instanceof CurveChainWithDistanceIndex_1.CurveChainWithDistanceIndex) {
-            this.dispatchCurveChainWithDistanceIndex(arcA, this.handleArc3d.bind(this));
-        }
-        return undefined;
-    }
-    /** Double dispatch handler for strongly typed bspline curve. */
-    handleBSplineCurve3d(curveA) {
-        if (this._geometryB instanceof LineSegment3d_1.LineSegment3d) {
-            this.dispatchSegmentBsplineCurve(this._geometryB, this._extendB0, this._geometryB.point0Ref, 0.0, this._geometryB.point1Ref, 1.0, this._extendB1, curveA, this._extendA0, this._extendA1, true);
-        }
-        else if (this._geometryB instanceof LineString3d_1.LineString3d) {
-            this.dispatchLineStringBSplineCurve(this._geometryB, this._extendB0, this._extendB1, curveA, this._extendA0, this._extendA1, true);
-        }
-        else if (this._geometryB instanceof Arc3d_1.Arc3d) {
-            this.dispatchArcBsplineCurve3d(this._geometryB, this._extendB0, this._extendB1, curveA, this._extendA0, this._extendA1, true);
-        }
-        else if (this._geometryB instanceof BSplineCurve_1.BSplineCurve3dBase) {
-            this.dispatchBSplineCurve3dBSplineCurve3d(curveA, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof TransitionSpiral3d_1.TransitionSpiral3d) {
-            this.dispatchCurveSpiral(curveA, this._extendA0, this._extendA1, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof CurveCollection_1.CurveCollection) {
-            this.dispatchCurveCollection(curveA, this.handleBSplineCurve3d.bind(this));
-        }
-        else if (this._geometryB instanceof CurveChainWithDistanceIndex_1.CurveChainWithDistanceIndex) {
-            this.dispatchCurveChainWithDistanceIndex(curveA, this.handleBSplineCurve3d.bind(this));
-        }
-        return undefined;
-    }
     /**
      * Process tail of `this._results` for xy-intersections between the curve and spiral.
      * * Refine each result via Newton iteration. If it doesn't converge, remove it.
@@ -1115,6 +976,137 @@ class CurveCurveIntersectXY extends GeometryHandler_1.RecurseToCurvesGeometryHan
         this.appendDiscreteCloseApproachResults(cpA, cpB, maxError, reversed); // seeds for finding tangent intersections
         this.refineSpiralResultsByNewton(curveA, spiralB, index0, reversed);
     }
+    /**
+    * Invoke dispatch on each child of `g` as "geometryA".
+    * * If `g` is a `Path` or `Loop`, adjust extension flags for geometryA accordingly.
+    */
+    handleChildren(g) {
+        const children = g.children;
+        if (!children)
+            return;
+        const saveExtendA0 = this._extendA0;
+        const saveExtendA1 = this._extendA1;
+        for (let i = 0; i < children.length; i++) {
+            let extendA0 = saveExtendA0;
+            let extendA1 = saveExtendA1;
+            if (g instanceof Path_1.Path && children.length > 1) {
+                if (i === 0)
+                    extendA1 = false; // first child can only extend from start
+                else if (i === children.length - 1)
+                    extendA0 = false; // last child can only extend from end
+                else
+                    extendA0 = extendA1 = false; // middle children cannot extend
+            }
+            else if (g instanceof Loop_1.Loop) {
+                extendA0 = extendA1 = false; // Loops cannot extend
+            }
+            this.resetGeometryA(extendA0, extendA1);
+            children[i].dispatchToGeometryHandler(this);
+        }
+        this.resetGeometryA(saveExtendA0, saveExtendA1);
+    }
+    /** Double dispatch handler for strongly typed segment. */
+    handleLineSegment3d(segmentA) {
+        if (this._geometryB instanceof LineSegment3d_1.LineSegment3d) {
+            const segmentB = this._geometryB;
+            this.dispatchSegmentSegment(segmentA, this._extendA0, segmentA.point0Ref, 0.0, segmentA.point1Ref, 1.0, this._extendA1, segmentB, this._extendB0, segmentB.point0Ref, 0.0, segmentB.point1Ref, 1.0, this._extendB1, false);
+        }
+        else if (this._geometryB instanceof LineString3d_1.LineString3d) {
+            this.computeSegmentLineString(segmentA, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
+        }
+        else if (this._geometryB instanceof Arc3d_1.Arc3d) {
+            this.dispatchSegmentArc(segmentA, this._extendA0, segmentA.point0Ref, 0.0, segmentA.point1Ref, 1.0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
+        }
+        else if (this._geometryB instanceof BSplineCurve_1.BSplineCurve3d) {
+            this.dispatchSegmentBsplineCurve(segmentA, this._extendA0, segmentA.point0Ref, 0.0, segmentA.point1Ref, 1.0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
+        }
+        else if (this._geometryB instanceof TransitionSpiral3d_1.TransitionSpiral3d) {
+            this.dispatchCurveSpiral(segmentA, this._extendA0, this._extendA1, this._geometryB, false);
+        }
+        else if (this._geometryB instanceof CurveCollection_1.CurveCollection) {
+            this.dispatchCurveCollection(segmentA, this.handleLineSegment3d.bind(this));
+        }
+        else if (this._geometryB instanceof CurveChainWithDistanceIndex_1.CurveChainWithDistanceIndex) {
+            this.dispatchCurveChainWithDistanceIndex(segmentA, this.handleLineSegment3d.bind(this));
+        }
+        return undefined;
+    }
+    /** Double dispatch handler for strongly typed linestring. */
+    handleLineString3d(lsA) {
+        if (this._geometryB instanceof LineString3d_1.LineString3d) {
+            const lsB = this._geometryB;
+            this.computeLineStringLineString(lsA, this._extendA0, this._extendA1, lsB, this._extendB0, this._extendB1, false);
+        }
+        else if (this._geometryB instanceof LineSegment3d_1.LineSegment3d) {
+            this.computeSegmentLineString(this._geometryB, this._extendB0, this._extendB1, lsA, this._extendA0, this._extendA1, true);
+        }
+        else if (this._geometryB instanceof Arc3d_1.Arc3d) {
+            this.computeArcLineString(this._geometryB, this._extendB0, this._extendB1, lsA, this._extendA0, this._extendA1, true);
+        }
+        else if (this._geometryB instanceof BSplineCurve_1.BSplineCurve3d) {
+            this.dispatchLineStringBSplineCurve(lsA, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
+        }
+        else if (this._geometryB instanceof TransitionSpiral3d_1.TransitionSpiral3d) {
+            this.dispatchCurveSpiral(lsA, this._extendA0, this._extendA1, this._geometryB, false);
+        }
+        else if (this._geometryB instanceof CurveCollection_1.CurveCollection) {
+            this.dispatchCurveCollection(lsA, this.handleLineString3d.bind(this));
+        }
+        else if (this._geometryB instanceof CurveChainWithDistanceIndex_1.CurveChainWithDistanceIndex) {
+            this.dispatchCurveChainWithDistanceIndex(lsA, this.handleLineString3d.bind(this));
+        }
+        return undefined;
+    }
+    /** Double dispatch handler for strongly typed arc. */
+    handleArc3d(arcA) {
+        if (this._geometryB instanceof LineSegment3d_1.LineSegment3d) {
+            this.dispatchSegmentArc(this._geometryB, this._extendB0, this._geometryB.point0Ref, 0.0, this._geometryB.point1Ref, 1.0, this._extendB1, arcA, this._extendA0, this._extendA1, true);
+        }
+        else if (this._geometryB instanceof LineString3d_1.LineString3d) {
+            this.computeArcLineString(arcA, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
+        }
+        else if (this._geometryB instanceof Arc3d_1.Arc3d) {
+            this.dispatchArcArc(arcA, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
+        }
+        else if (this._geometryB instanceof BSplineCurve_1.BSplineCurve3d) {
+            this.dispatchArcBsplineCurve3d(arcA, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
+        }
+        else if (this._geometryB instanceof TransitionSpiral3d_1.TransitionSpiral3d) {
+            this.dispatchCurveSpiral(arcA, this._extendA0, this._extendA1, this._geometryB, false);
+        }
+        else if (this._geometryB instanceof CurveCollection_1.CurveCollection) {
+            this.dispatchCurveCollection(arcA, this.handleArc3d.bind(this));
+        }
+        else if (this._geometryB instanceof CurveChainWithDistanceIndex_1.CurveChainWithDistanceIndex) {
+            this.dispatchCurveChainWithDistanceIndex(arcA, this.handleArc3d.bind(this));
+        }
+        return undefined;
+    }
+    /** Double dispatch handler for strongly typed bspline curve. */
+    handleBSplineCurve3d(curveA) {
+        if (this._geometryB instanceof LineSegment3d_1.LineSegment3d) {
+            this.dispatchSegmentBsplineCurve(this._geometryB, this._extendB0, this._geometryB.point0Ref, 0.0, this._geometryB.point1Ref, 1.0, this._extendB1, curveA, this._extendA0, this._extendA1, true);
+        }
+        else if (this._geometryB instanceof LineString3d_1.LineString3d) {
+            this.dispatchLineStringBSplineCurve(this._geometryB, this._extendB0, this._extendB1, curveA, this._extendA0, this._extendA1, true);
+        }
+        else if (this._geometryB instanceof Arc3d_1.Arc3d) {
+            this.dispatchArcBsplineCurve3d(this._geometryB, this._extendB0, this._extendB1, curveA, this._extendA0, this._extendA1, true);
+        }
+        else if (this._geometryB instanceof BSplineCurve_1.BSplineCurve3dBase) {
+            this.dispatchBSplineCurve3dBSplineCurve3d(curveA, this._geometryB, false);
+        }
+        else if (this._geometryB instanceof TransitionSpiral3d_1.TransitionSpiral3d) {
+            this.dispatchCurveSpiral(curveA, this._extendA0, this._extendA1, this._geometryB, false);
+        }
+        else if (this._geometryB instanceof CurveCollection_1.CurveCollection) {
+            this.dispatchCurveCollection(curveA, this.handleBSplineCurve3d.bind(this));
+        }
+        else if (this._geometryB instanceof CurveChainWithDistanceIndex_1.CurveChainWithDistanceIndex) {
+            this.dispatchCurveChainWithDistanceIndex(curveA, this.handleBSplineCurve3d.bind(this));
+        }
+        return undefined;
+    }
     /** Double dispatch handler for strongly typed spiral curve. */
     handleTransitionSpiral(spiral) {
         if (this._geometryB instanceof CurveChainWithDistanceIndex_1.CurveChainWithDistanceIndex) {
@@ -1136,19 +1128,8 @@ class CurveCurveIntersectXY extends GeometryHandler_1.RecurseToCurvesGeometryHan
     }
     /** Double dispatch handler for strongly typed homogeneous bspline curve. */
     handleBSplineCurve3dH(_curve) {
-        /*
         // NEEDS WORK -- make "dispatch" methods tolerant of both 3d and 3dH .
         // "easy" if both present BezierCurve3dH span loaders
-        if (this._geometryB instanceof LineSegment3d) {
-          this.dispatchSegmentBsplineCurve(
-            this._geometryB, this._extendB, this._geometryB.point0Ref, 0.0, this._geometryB.point1Ref, 1.0, this._extendB,
-            curve, this._extendA, true);
-        } else if (this._geometryB instanceof LineString3d) {
-          this.dispatchLineStringBSplineCurve(this._geometryB, this._extendB, curve, this._extendA, true);
-        } else if (this._geometryB instanceof Arc3d) {
-          this.dispatchArcBsplineCurve3d(this._geometryB, this._extendB, curve, this._extendA, true);
-        }
-        */
         return undefined;
     }
 }