@itwin/core-geometry 4.10.0-dev.3 → 4.10.0-dev.31

package/lib/esm/curve/internalContexts/CurveCurveIntersectXYZ.js

@@ -12,13 +12,16 @@ import { RecurseToCurvesGeometryHandler } from "../../geometry3d/GeometryHandler
 import { Plane3dByOriginAndUnitNormal } from "../../geometry3d/Plane3dByOriginAndUnitNormal";
 import { Vector2d } from "../../geometry3d/Point2dVector2d";
 import { Point3d, Vector3d } from "../../geometry3d/Point3dVector3d";
-import { SmallSystem, TrigPolynomial } from "../../numerics/Polynomials";
+import { TrigPolynomial } from "../../numerics/Polynomials";
+import { SmallSystem } from "../../numerics/SmallSystem";
 import { Arc3d } from "../Arc3d";
 import { CurveChainWithDistanceIndex } from "../CurveChainWithDistanceIndex";
 import { CurveCollection } from "../CurveCollection";
 import { CurveIntervalRole, CurveLocationDetail, CurveLocationDetailPair } from "../CurveLocationDetail";
 import { LineSegment3d } from "../LineSegment3d";
 import { LineString3d } from "../LineString3d";
+import { Loop } from "../Loop";
+import { Path } from "../Path";
 // cspell:word XYRR
 /**
  * Handler class for XYZ intersections between _geometryB and another geometry.
@@ -34,9 +37,11 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
      */
     constructor(extendA, geometryB, extendB) {
         super();
-        this._extendA = extendA;
+        this._extendA0 = extendA;
+        this._extendA1 = extendA;
         this._geometryB = geometryB;
-        this._extendB = extendB;
+        this._extendB0 = extendB;
+        this._extendB1 = extendB;
         this._results = [];
     }
     /** Reset the geometry, leaving all other parts unchanged (and preserving accumulated intersections). */
@@ -53,10 +58,12 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
             this._results = [];
         return result;
     }
-    acceptFraction(extend0, fraction, extend1) {
-        if (!extend0 && fraction < 0.0)
+    /** Accept the fraction if it falls inside (possibly extended) fraction range. */
+    acceptFraction(extend0, fraction, extend1, fractionTol = 1.0e-12) {
+        // Note that default tol is tighter than Geometry.smallFraction. We aggressively toss intersections past endpoints.
+        if (!extend0 && fraction < -fractionTol)
             return false;
-        if (!extend1 && fraction > 1.0)
+        if (!extend1 && fraction > 1.0 + fractionTol)
             return false;
         return true;
     }
@@ -158,13 +165,13 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
             let lineFraction;
             let linePoint;
             for (const c of candidates) {
-                if (this.acceptFraction(extendB0, c.fraction, extendB1)) {
+                const arcFraction = arc.sweep.fractionToSignedPeriodicFraction(c.fraction, extendB0);
+                if (this.acceptFraction(extendB0, arcFraction, extendB1)) {
                     lineFraction = SmallSystem.lineSegment3dClosestPointUnbounded(pointA0, pointA1, c.point);
                     if (lineFraction !== undefined) {
                         linePoint = pointA0.interpolate(lineFraction, pointA1, linePoint);
-                        if (linePoint.isAlmostEqualMetric(c.point)
-                            && this.acceptFraction(extendA0, lineFraction, extendA1)) {
-                            this.recordPointWithLocalFractions(lineFraction, cpA, fractionA0, fractionA1, c.fraction, arc, 0, 1, reversed);
+                        if (linePoint.isAlmostEqualMetric(c.point) && this.acceptFraction(extendA0, lineFraction, extendA1)) {
+                            this.recordPointWithLocalFractions(lineFraction, cpA, fractionA0, fractionA1, arcFraction, arc, 0, 1, reversed);
                         }
                     }
                 }
@@ -175,17 +182,17 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
     // Passes "other" as {center, vector0, vector90} in local xy space of cpA
     // Solves the arc-arc equations for that local ellipse with unit circle.
     // Solution fractions map directly to original arcs.
-    dispatchArcArcInPlane(cpA, extendA, cpB, extendB, reversed) {
+    dispatchArcArcInPlane(cpA, extendA0, extendA1, cpB, extendB0, extendB1, reversed) {
         const otherVectors = cpA.otherArcAsLocalVectors(cpB);
         if (otherVectors !== undefined) {
             const ellipseRadians = [];
             const circleRadians = [];
             TrigPolynomial.solveUnitCircleHomogeneousEllipseIntersection(otherVectors.center.x, otherVectors.center.y, 1.0, otherVectors.vector0.x, otherVectors.vector0.y, 0.0, otherVectors.vector90.x, otherVectors.vector90.y, 0.0, ellipseRadians, circleRadians);
             for (let i = 0; i < ellipseRadians.length; i++) {
-                const fractionA = cpA.sweep.radiansToSignedPeriodicFraction(circleRadians[i]);
-                const fractionB = cpB.sweep.radiansToSignedPeriodicFraction(ellipseRadians[i]);
+                const fractionA = cpA.sweep.radiansToSignedFraction(circleRadians[i], extendA0);
+                const fractionB = cpB.sweep.radiansToSignedFraction(ellipseRadians[i], extendB0);
                 // hm .. do we really need to check the fractions?  We know they are internal to the beziers
-                if (this.acceptFraction(extendA, fractionA, extendA) && this.acceptFraction(extendB, fractionB, extendB)) {
+                if (this.acceptFraction(extendA0, fractionA, extendA1) && this.acceptFraction(extendB0, fractionB, extendB1)) {
                     this.recordPointWithLocalFractions(fractionA, cpA, 0, 1, fractionB, cpB, 0, 1, reversed);
                 }
             }
@@ -194,7 +201,7 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
     // Caller accesses data from two arcs.
     // Selects the best conditioned arc (in xy parts) as "circle after inversion".
     // Solves the arc-arc equations.
-    dispatchArcArc(cpA, extendA, cpB, extendB, reversed) {
+    dispatchArcArc(cpA, extendA0, extendA1, cpB, extendB0, extendB1, reversed) {
         // If arcs are in different planes:
         // 1) Intersect each plane with the other arc (quadratic)
         // 2) accept points that appear in both intersection sets.
@@ -205,10 +212,8 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
         if (planeA === undefined || planeB === undefined)
             return;
         if (planeA.getNormalRef().isParallelTo(planeB.getNormalRef())) {
-            if (planeA.isPointInPlane(planeB.getOriginRef()) && planeB.isPointInPlane(planeA.getOriginRef())) {
-                // coplanar
-                this.dispatchArcArcInPlane(cpA, extendA, cpB, extendB, reversed);
-            }
+            if (planeA.isPointInPlane(planeB.getOriginRef()) && planeB.isPointInPlane(planeA.getOriginRef()))
+                this.dispatchArcArcInPlane(cpA, extendA0, extendA1, cpB, extendB0, extendB1, reversed);
         }
         else {
             const arcBPoints = [];
@@ -218,9 +223,11 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
             for (const detailB of arcBPoints) {
                 for (const detailA of arcAPoints) {
                     if (detailA.point.isAlmostEqual(detailB.point)) {
-                        if (this.acceptFraction(extendA, detailA.fraction, extendA)
-                            && this.acceptFraction(extendB, detailB.fraction, extendB)) {
-                            this.recordPointWithLocalFractions(detailA.fraction, cpA, 0, 1, detailB.fraction, cpB, 0, 1, reversed);
+                        const arcFractionA = cpA.sweep.fractionToSignedPeriodicFraction(detailA.fraction, extendA0);
+                        const arcFractionB = cpB.sweep.fractionToSignedPeriodicFraction(detailB.fraction, extendB0);
+                        if (this.acceptFraction(extendA0, arcFractionA, extendA1)
+                            && this.acceptFraction(extendB0, arcFractionB, extendB1)) {
+                            this.recordPointWithLocalFractions(arcFractionA, cpA, 0, 1, arcFractionB, cpB, 0, 1, reversed);
                         }
                     }
                 }
@@ -230,7 +237,8 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
     // Caller accesses data from two arcs.
     // Selects the best conditioned arc (in xy parts) as "circle after inversion".
     // Solves the arc-arc equations.
-    dispatchArcBsplineCurve3d(_arc, _extendA, _cpB, _extendB, _reversed) {
+    dispatchArcBsplineCurve3d(_arc, _extendA0, _extendA1, _cpB, _extendB0, _extendB1, _reversed) {
+        // TODO: B-spline XYZ intersection implementation
         /*
         // Arc: X = C + cU + sV
         // implicitize the arc as viewed.  This "3d" matrix is homogeneous "XYW" not "xyz"
@@ -291,9 +299,9 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
                   const bcurvePoint4d = bezier.fractionToPoint4d(root);
                   const c = bcurvePoint4d.dotProductXYZW(axx, axy, axz, axw);
                   const s = bcurvePoint4d.dotProductXYZW(ayx, ayy, ayz, ayw);
-                  const arcFraction = cpA.sweep.radiansToSignedPeriodicFraction(Math.atan2(s, c));
-                  if (this.acceptFraction(extendA, arcFraction, extendA) &&
-                    this.acceptFraction(extendB, fractionB, extendB)) {
+                  const arcFraction = cpA.sweep.radiansToSignedFraction(Math.atan2(s, c), _extendA0);
+                  if (this.acceptFraction(_extendA0, arcFraction, _extendA1) &&
+                    this.acceptFraction(_extendB0, fractionB, _extendB1)) {
                     this.recordPointWithLocalFractions(
                       arcFraction, cpA, 0, 1, fractionB, cpB, 0, 1, reversed,
                     );
@@ -305,6 +313,7 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
         }
         */
     }
+    // TODO: Bezier XYZ intersection implementation
     /*
     // Apply the transformation to bezier curves. Optionally construct ranges.
     private transformBeziers(beziers: BezierCurve3dH[]): void {
@@ -350,8 +359,8 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
           const bcurvePoint4d = bezier.fractionToPoint4d(root);
           const c = bcurvePoint4d.dotProductXYZW(axx, axy, axz, axw);
           const s = bcurvePoint4d.dotProductXYZW(ayx, ayy, ayz, ayw);
-          const arcFraction = cpA.sweep.radiansToSignedPeriodicFraction(Math.atan2(s, c));
-          if (this.acceptFraction(extendA, arcFraction, extendA) && this.acceptFraction(extendB, fractionB, extendB)) {
+          const arcFraction = cpA.sweep.radiansToSignedFraction(Math.atan2(s, c), extendA0);
+          if (this.acceptFraction(extendA0, arcFraction, extendA1) && this.acceptFraction(extendB0, fractionB, extendB1)) {
             this.recordPointWithLocalFractions(
               arcFraction, cpA, 0, 1, fractionB, cpB, 0, 1, reversed,
             );
@@ -418,6 +427,7 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
     // Selects the best conditioned arc (in xy parts) as "circle after inversion".
     // Solves the arc-arc equations.
     dispatchBSplineCurve3dBSplineCurve3d(_bcurveA, _bcurveB, _reversed) {
+        // TODO: B-spline XYZ intersection implementation
         /*
         const bezierSpanA = bcurveA.collectBezierSpans(true) as BezierCurve3dH[];
         const bezierSpanB = bcurveB.collectBezierSpans(true) as BezierCurve3dH[];
@@ -481,7 +491,8 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
     // Caller accesses data from segment and bsplineCurve
     // Selects the best conditioned arc (in xy parts) as "circle after inversion"
     // Solves the arc-arc equations
-    dispatchSegmentBsplineCurve(_cpA, _extendA0, _pointA0, _fractionA0, _pointA1, _fractionA1, _extendA1, _bcurve, _extendB, _reversed) {
+    dispatchSegmentBsplineCurve(_cpA, _extendA0, _pointA0, _fractionA0, _pointA1, _fractionA1, _extendA1, _bcurve, _extendB0, _extendB1, _reversed) {
+        // TODO: B-spline XYZ intersection implementation
         /*
         const pointA0H = this.projectPoint(pointA0);
         const pointA1H = this.projectPoint(pointA1);
@@ -498,8 +509,8 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
           const curvePoint = detail.point;
           const curvePointH = this.projectPoint(curvePoint);
           const lineFraction = SmallSystem.lineSegment3dHXYClosestPointUnbounded(pointA0H, pointA1H, curvePointH);
-          if (lineFraction !== undefined && this.acceptFraction(extendA0, lineFraction, extendA1) &&
-            this.acceptFraction(extendB, fractionB, extendB)) {
+          if (lineFraction !== undefined && this.acceptFraction(_extendA0, lineFraction, _extendA1) &&
+            this.acceptFraction(_extendB0, fractionB, _extendB1)) {
             this.recordPointWithLocalFractions(
               lineFraction, cpA, fractionA0, fractionA1, fractionB, bcurve, 0, 1, reversed,
             );
@@ -508,7 +519,8 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
         */
     }
     /** Low level dispatch of linestring with (beziers of) a bspline curve */
-    dispatchLineStringBSplineCurve(_lsA, _extendA, _curveB, _extendB, _reversed) {
+    dispatchLineStringBSplineCurve(_lsA, _extendA0, _extendA1, _curveB, _extendB0, _extendB1, _reversed) {
+        // TODO: B-spline XYZ intersection implementation
         /*
         const numA = lsA.numPoints();
         if (numA > 1) {
@@ -523,15 +535,15 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
             lsA.pointAt(iA, pointA1);
             fA1 = iA * dfA;
             this.dispatchSegmentBsplineCurve(
-              lsA, iA === 1 && extendA, pointA0, fA0, pointA1, fA1, (iA + 1) === numA && extendA,
-              curveB, extendB, reversed);
+              lsA, iA === 1 && _extendA0, pointA0, fA0, pointA1, fA1, (iA + 1) === numA && _extendA1,
+              curveB, _extendB0, _extendB1 reversed);
           }
         }
         return undefined;
         */
     }
     /** Detail computation for segment intersecting linestring. */
-    computeSegmentLineString(lsA, extendA, lsB, extendB, reversed) {
+    computeSegmentLineString(lsA, extendA0, extendA1, lsB, extendB0, extendB1, reversed) {
         const pointA0 = lsA.point0Ref;
         const pointA1 = lsA.point1Ref;
         const pointB0 = CurveCurveIntersectXYZ._workPointBB0;
@@ -546,13 +558,13 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
             for (let ib = 1; ib < numB; ib++, pointB0.setFrom(pointB1), fB0 = fB1) {
                 lsB.pointAt(ib, pointB1);
                 fB1 = ib * dfB;
-                this.dispatchSegmentSegment(lsA, extendA, pointA0, 0.0, pointA1, 1.0, extendA, lsB, ib === 1 && extendB, pointB0, fB0, pointB1, fB1, (ib + 1) === numB && extendB, reversed);
+                this.dispatchSegmentSegment(lsA, extendA0, pointA0, 0.0, pointA1, 1.0, extendA1, lsB, ib === 1 && extendB0, pointB0, fB0, pointB1, fB1, (ib + 1) === numB && extendB1, reversed);
             }
         }
         return undefined;
     }
     /** Detail computation for arc intersecting linestring. */
-    computeArcLineString(arcA, extendA, lsB, extendB, reversed) {
+    computeArcLineString(arcA, extendA0, extendA1, lsB, extendB0, extendB1, reversed) {
         const pointB0 = CurveCurveIntersectXYZ._workPointBB0;
         const pointB1 = CurveCurveIntersectXYZ._workPointBB1;
         const numB = lsB.numPoints();
@@ -565,7 +577,7 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
             for (let ib = 1; ib < numB; ib++, pointB0.setFrom(pointB1), fB0 = fB1) {
                 lsB.pointAt(ib, pointB1);
                 fB1 = ib * dfB;
-                this.dispatchSegmentArc(lsB, ib === 1 && extendB, pointB0, fB0, pointB1, fB1, (ib + 1) === numB && extendB, arcA, extendA, extendA, !reversed);
+                this.dispatchSegmentArc(lsB, ib === 1 && extendB0, pointB0, fB0, pointB1, fB1, (ib + 1) === numB && extendB1, arcA, extendA0, extendA1, !reversed);
             }
         }
         return undefined;
@@ -586,8 +598,6 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
             let fB0;
             let fA1;
             let fB1;
-            const extendA = this._extendA;
-            const extendB = this._extendB;
             lsA.pointAt(0, pointA0);
             for (let ia = 1; ia < numA; ia++, pointA0.setFrom(pointA1), fA0 = fA1) {
                 fA1 = ia * dfA;
@@ -597,53 +607,99 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
                 for (let ib = 1; ib < numB; ib++, pointB0.setFrom(pointB1), fB0 = fB1) {
                     lsB.pointAt(ib, pointB1);
                     fB1 = ib * dfB;
-                    this.dispatchSegmentSegment(lsA, ia === 1 && extendA, pointA0, fA0, pointA1, fA1, (ia + 1) === numA && extendA, lsB, ib === 1 && extendB, pointB0, fB0, pointB1, fB1, (ib + 1) === numB && extendB, reversed);
+                    this.dispatchSegmentSegment(lsA, ia === 1 && this._extendA0, pointA0, fA0, pointA1, fA1, (ia + 1) === numA && this._extendA1, lsB, ib === 1 && this._extendB0, pointB0, fB0, pointB1, fB1, (ib + 1) === numB && this._extendB1, reversed);
                 }
             }
         }
     }
-    /** Low level dispatch of curve collection. */
+    /**
+     * Low level dispatch of curve collection.
+     * We take care of extend variables of geometry's children here if geometry is Path or Loop.
+     */
     dispatchCurveCollection(geomA, geomAHandler) {
         const geomB = this._geometryB; // save
         if (!geomB || !geomB.children || !(geomB instanceof CurveCollection))
             return;
-        for (const child of geomB.children) {
-            this.resetGeometry(child);
+        const children = geomB.children;
+        const extendB0 = this._extendB0; // save
+        const extendB1 = this._extendB1; // save
+        for (let i = 0; i < children.length; i++) {
+            this.resetGeometry(children[i]);
+            if (geomB instanceof Path && children.length > 1) {
+                if (i === 0)
+                    this._extendB1 = false; // first child can only extend from start
+                else if (i === children.length - 1)
+                    this._extendB0 = false; // last child can only extend from end
+                else
+                    this._extendB0 = this._extendB1 = false; // middle children cannot extend
+            }
+            else if (geomB instanceof Loop) {
+                this._extendB0 = this._extendB1 = false; // Loops cannot extend
+            }
             geomAHandler(geomA);
+            this._extendB0 = extendB0; // restore
+            this._extendB1 = extendB1; // restore
         }
-        this._geometryB = geomB; // restore
+        this.resetGeometry(geomB); // restore
     }
-    /** Low level dispatch to geomA given a CurveChainWithDistanceIndex in geometryB. */
+    /**
+     * Low level dispatch of CurveChainWithDistanceIndex.
+     * We take care of extend variables of geometry's children here if geometry.path is Path or Loop.
+     */
     dispatchCurveChainWithDistanceIndex(geomA, geomAHandler) {
         if (!this._geometryB || !(this._geometryB instanceof CurveChainWithDistanceIndex))
             return;
         if (geomA instanceof CurveChainWithDistanceIndex) {
-            assert(!"call handleCurveChainWithDistanceIndex(geomA) instead");
+            assert(false, "call handleCurveChainWithDistanceIndex(geomA) instead");
             return;
         }
         const index0 = this._results.length;
         const geomB = this._geometryB; // save
-        for (const child of geomB.path.children) {
-            this.resetGeometry(child);
-            geomAHandler(geomA);
-        }
+        this.resetGeometry(geomB.path);
+        this.dispatchCurveCollection(geomA, geomAHandler);
         this.resetGeometry(geomB); // restore
         this._results = CurveChainWithDistanceIndex.convertChildDetailToChainDetail(this._results, index0, undefined, geomB, true);
     }
+    /**
+   * Invoke `child.dispatchToGeometryHandler(this)` for each child in the array returned by the query `g.children`.
+   * We take care of extend variables of geometry's children here if geometry is Path or Loop.
+   */
+    handleChildren(g) {
+        const children = g.children;
+        const extendA0 = this._extendA0; // save
+        const extendA1 = this._extendA1; // save
+        if (children)
+            for (let i = 0; i < children.length; i++) {
+                if (g instanceof Path && children.length > 1) {
+                    if (i === 0)
+                        this._extendA1 = false; // first child can only extend from start
+                    else if (i === children.length - 1)
+                        this._extendA0 = false; // last child can only extend from end
+                    else
+                        this._extendA0 = this._extendA1 = false; // middle children cannot extend
+                }
+                else if (g instanceof Loop) {
+                    this._extendA0 = this._extendA1 = false; // Loops cannot extend
+                }
+                children[i].dispatchToGeometryHandler(this);
+                this._extendA0 = extendA0; // restore
+                this._extendA1 = extendA1; // restore
+            }
+    }
     /** Double dispatch handler for strongly typed segment. */
     handleLineSegment3d(segmentA) {
         if (this._geometryB instanceof LineSegment3d) {
             const segmentB = this._geometryB;
-            this.dispatchSegmentSegment(segmentA, this._extendA, segmentA.point0Ref, 0.0, segmentA.point1Ref, 1.0, this._extendA, segmentB, this._extendB, segmentB.point0Ref, 0.0, segmentB.point1Ref, 1.0, this._extendB, false);
+            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) {
-            this.computeSegmentLineString(segmentA, this._extendA, this._geometryB, this._extendB, false);
+            this.computeSegmentLineString(segmentA, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
         }
         else if (this._geometryB instanceof Arc3d) {
-            this.dispatchSegmentArc(segmentA, this._extendA, segmentA.point0Ref, 0.0, segmentA.point1Ref, 1.0, this._extendA, this._geometryB, this._extendB, this._extendB, false);
+            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 BSplineCurve3d) {
-            this.dispatchSegmentBsplineCurve(segmentA, this._extendA, segmentA.point0Ref, 0.0, segmentA.point1Ref, 1.0, this._extendA, this._geometryB, this._extendB, false);
+            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 CurveCollection) {
             this.dispatchCurveCollection(segmentA, this.handleLineSegment3d.bind(this));
@@ -660,13 +716,13 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
             this.computeLineStringLineString(lsA, lsB, false);
         }
         else if (this._geometryB instanceof LineSegment3d) {
-            this.computeSegmentLineString(this._geometryB, this._extendB, lsA, this._extendA, true);
+            this.computeSegmentLineString(this._geometryB, this._extendB0, this._extendB1, lsA, this._extendA0, this._extendA1, true);
         }
         else if (this._geometryB instanceof Arc3d) {
-            this.computeArcLineString(this._geometryB, this._extendB, lsA, this._extendA, true);
+            this.computeArcLineString(this._geometryB, this._extendB0, this._extendB1, lsA, this._extendA0, this._extendA1, true);
         }
         else if (this._geometryB instanceof BSplineCurve3d) {
-            this.dispatchLineStringBSplineCurve(lsA, this._extendA, this._geometryB, this._extendB, false);
+            this.dispatchLineStringBSplineCurve(lsA, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
         }
         else if (this._geometryB instanceof CurveCollection) {
             this.dispatchCurveCollection(lsA, this.handleLineString3d.bind(this));
@@ -679,16 +735,16 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
     /** Double dispatch handler for strongly typed arc. */
     handleArc3d(arc0) {
         if (this._geometryB instanceof LineSegment3d) {
-            this.dispatchSegmentArc(this._geometryB, this._extendB, this._geometryB.point0Ref, 0.0, this._geometryB.point1Ref, 1.0, this._extendB, arc0, this._extendA, this._extendA, true);
+            this.dispatchSegmentArc(this._geometryB, this._extendB0, this._geometryB.point0Ref, 0.0, this._geometryB.point1Ref, 1.0, this._extendB1, arc0, this._extendA0, this._extendA1, true);
         }
         else if (this._geometryB instanceof LineString3d) {
-            this.computeArcLineString(arc0, this._extendA, this._geometryB, this._extendB, false);
+            this.computeArcLineString(arc0, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
         }
         else if (this._geometryB instanceof Arc3d) {
-            this.dispatchArcArc(arc0, this._extendA, this._geometryB, this._extendB, false);
+            this.dispatchArcArc(arc0, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
         }
         else if (this._geometryB instanceof BSplineCurve3d) {
-            this.dispatchArcBsplineCurve3d(arc0, this._extendA, this._geometryB, this._extendB, false);
+            this.dispatchArcBsplineCurve3d(arc0, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
         }
         else if (this._geometryB instanceof CurveCollection) {
             this.dispatchCurveCollection(arc0, this.handleArc3d.bind(this));
@@ -701,13 +757,13 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
     /** Double dispatch handler for strongly typed bspline curve. */
     handleBSplineCurve3d(curve) {
         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);
+            this.dispatchSegmentBsplineCurve(this._geometryB, this._extendB0, this._geometryB.point0Ref, 0.0, this._geometryB.point1Ref, 1.0, this._extendB1, curve, this._extendA0, this._extendA1, true);
         }
         else if (this._geometryB instanceof LineString3d) {
-            this.dispatchLineStringBSplineCurve(this._geometryB, this._extendB, curve, this._extendA, true);
+            this.dispatchLineStringBSplineCurve(this._geometryB, this._extendB0, this._extendB1, curve, this._extendA0, this._extendA1, true);
         }
         else if (this._geometryB instanceof Arc3d) {
-            this.dispatchArcBsplineCurve3d(this._geometryB, this._extendB, curve, this._extendA, true);
+            this.dispatchArcBsplineCurve3d(this._geometryB, this._extendB0, this._extendB1, curve, this._extendA0, this._extendA1, true);
         }
         else if (this._geometryB instanceof BSplineCurve3dBase) {
             this.dispatchBSplineCurve3dBSplineCurve3d(curve, this._geometryB, false);
@@ -733,12 +789,17 @@ export class CurveCurveIntersectXYZ extends RecurseToCurvesGeometryHandler {
         // "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);
+            this._geometryB, this._extendB0, this._geometryB.point0Ref, 0.0, this._geometryB.point1Ref, 1.0, this._extendB1,
+            curve, this._extendA0, this.extendA1, true,
+          );
         } else if (this._geometryB instanceof LineString3d) {
-          this.dispatchLineStringBSplineCurve(this._geometryB, this._extendB, curve, this._extendA, true);
+          this.dispatchLineStringBSplineCurve(
+            this._geometryB, this._extendB0, this._extendB1, curve, this._extendA0, this._extendA1, true,
+          );
         } else if (this._geometryB instanceof Arc3d) {
-          this.dispatchArcBsplineCurve3d(this._geometryB, this._extendB, curve, this._extendA, true);
+          this.dispatchArcBsplineCurve3d(
+            this._geometryB, this._extendB0, this._extendB1, curve, this._extendA0, this._extendA1, true,
+          );
         }
         */
         return undefined;