@itwin/core-geometry 4.2.0-dev.9 → 4.3.0-dev.1

package/lib/esm/curve/{CurveCurveIntersectXYZ.d.ts → internalContexts/CurveCurveIntersectXYZ.d.ts}

@@ -1,19 +1,18 @@
 /** @packageDocumentation
  * @module Curve
  */
-import { BSplineCurve3d } from "../bspline/BSplineCurve";
-import { BSplineCurve3dH } from "../bspline/BSplineCurve3dH";
-import { NullGeometryHandler } from "../geometry3d/GeometryHandler";
-import { Plane3dByOriginAndUnitNormal } from "../geometry3d/Plane3dByOriginAndUnitNormal";
-import { Point3d, Vector3d } from "../geometry3d/Point3dVector3d";
-import { Arc3d } from "./Arc3d";
-import { CurveLocationDetailArrayPair } from "./CurveCurveIntersectXY";
-import { GeometryQuery } from "./GeometryQuery";
-import { LineSegment3d } from "./LineSegment3d";
-import { LineString3d } from "./LineString3d";
+import { BSplineCurve3d } from "../../bspline/BSplineCurve";
+import { BSplineCurve3dH } from "../../bspline/BSplineCurve3dH";
+import { NullGeometryHandler } from "../../geometry3d/GeometryHandler";
+import { Plane3dByOriginAndUnitNormal } from "../../geometry3d/Plane3dByOriginAndUnitNormal";
+import { Point3d, Vector3d } from "../../geometry3d/Point3dVector3d";
+import { Arc3d } from "../Arc3d";
+import { CurveLocationDetailPair } from "../CurveLocationDetail";
+import { AnyCurve } from "../CurveTypes";
+import { LineSegment3d } from "../LineSegment3d";
+import { LineString3d } from "../LineString3d";
 /**
  * Handler class for XYZ intersections between _geometryB and another geometry.
- * * **NOTE:** GeometryQuery input (_geometryB) should really be AnyCurve.
  * * Instances are initialized and called from CurveCurve.
  * * geometryB is saved for later reference.
  * @internal
@@ -28,18 +27,17 @@ export declare class CurveCurveIntersectXYZ extends NullGeometryHandler {
     private static _workPointAA1;
     private static _workPointBB0;
     private static _workPointBB1;
-    private reinitialize;
     /**
      * @param extendA flag to enable using extension of the other geometry.
      * @param geometryB second curve for intersection.  Saved for reference by specific handler methods.
      * @param extendB flag for extension of geometryB.
      */
-    constructor(extendA: boolean, geometryB: GeometryQuery, extendB: boolean);
+    constructor(extendA: boolean, geometryB: AnyCurve, extendB: boolean);
     /**
-     * * Return the results structure for the intersection calculation.
+     * Return the results structure for the intersection calculation, structured as an array of CurveLocationDetailPair.
      * @param reinitialize if true, a new results structure is created for use by later calls.
      */
-    grabResults(reinitialize?: boolean): CurveLocationDetailArrayPair;
+    grabPairedResults(reinitialize?: boolean): CurveLocationDetailPair[];
     private acceptFraction;
     /**
      * Compute intersection of two line segments.
@@ -65,7 +63,7 @@ export declare class CurveCurveIntersectXYZ extends NullGeometryHandler {
      * @param origin plane origin
      * @param vectorA vector which must be in the plane.
      * @param cosineValue largest cosine of the angle theta between vectorA and vectorB to prefer their cross product, e.g.
-     *  passing 0.94 ~ cos(20deg) will switch to using vectorC in the cross product if theta < ~20deg or theta > ~160deg.
+     * passing 0.94 ~ cos(20deg) will switch to using vectorC in the cross product if theta < ~20deg or theta > ~160deg.
      * @param vectorB first candidate for additional in-plane vector
      * @param vectorC second candidate for additional in-plane vector
      */
@@ -82,13 +80,15 @@ export declare class CurveCurveIntersectXYZ extends NullGeometryHandler {
     computeSegmentLineString(lsA: LineSegment3d, extendA: boolean, lsB: LineString3d, extendB: boolean, reversed: boolean): any;
     /** Detail computation for arc intersecting linestring. */
     computeArcLineString(arcA: Arc3d, extendA: boolean, lsB: LineString3d, extendB: boolean, reversed: boolean): any;
+    /** Detail computation for linestring intersecting linestring. */
+    private computeLineStringLineString;
     /** Double dispatch handler for strongly typed segment. */
     handleLineSegment3d(segmentA: LineSegment3d): any;
-    /** double dispatch handler for strongly typed linestring .. */
+    /** double dispatch handler for strongly typed linestring. */
     handleLineString3d(lsA: LineString3d): any;
     /** Double dispatch handler for strongly typed arc. */
     handleArc3d(arc0: Arc3d): any;
-    /** Double dispatch handler for strongly typed bspline curve.. */
+    /** Double dispatch handler for strongly typed bspline curve. */
     handleBSplineCurve3d(curve: BSplineCurve3d): any;
     /** Double dispatch handler for strongly typed homogeneous bspline curve. */
     handleBSplineCurve3dH(_curve: BSplineCurve3dH): any;

package/lib/esm/curve/internalContexts/CurveCurveIntersectXYZ.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CurveCurveIntersectXYZ.d.ts","sourceRoot":"","sources":["../../../../src/curve/internalContexts/CurveCurveIntersectXYZ.ts"],"names":[],"mappings":"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"}

package/lib/esm/curve/{CurveCurveIntersectXYZ.js → internalContexts/CurveCurveIntersectXYZ.js}

@@ -5,30 +5,25 @@
 /** @packageDocumentation
  * @module Curve
  */
-import { BSplineCurve3d, BSplineCurve3dBase } from "../bspline/BSplineCurve";
-import { Geometry } from "../Geometry";
-import { NullGeometryHandler } 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 { Arc3d } from "./Arc3d";
-import { CurveLocationDetailArrayPair } from "./CurveCurveIntersectXY";
-import { CurveIntervalRole, CurveLocationDetail } from "./CurveLocationDetail";
-import { LineSegment3d } from "./LineSegment3d";
-import { LineString3d } from "./LineString3d";
+import { BSplineCurve3d, BSplineCurve3dBase } from "../../bspline/BSplineCurve";
+import { Geometry } from "../../Geometry";
+import { NullGeometryHandler } 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 { Arc3d } from "../Arc3d";
+import { CurveIntervalRole, CurveLocationDetail, CurveLocationDetailPair } from "../CurveLocationDetail";
+import { LineSegment3d } from "../LineSegment3d";
+import { LineString3d } from "../LineString3d";
 // cspell:word XYRR
 /**
  * Handler class for XYZ intersections between _geometryB and another geometry.
- * * **NOTE:** GeometryQuery input (_geometryB) should really be AnyCurve.
  * * Instances are initialized and called from CurveCurve.
  * * geometryB is saved for later reference.
  * @internal
  */
 class CurveCurveIntersectXYZ extends NullGeometryHandler {
-    reinitialize() {
-        this._results = new CurveLocationDetailArrayPair();
-    }
     /**
      * @param extendA flag to enable using extension of the other geometry.
      * @param geometryB second curve for intersection.  Saved for reference by specific handler methods.
@@ -39,16 +34,16 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
         this._extendA = extendA;
         this._geometryB = geometryB;
         this._extendB = extendB;
-        this.reinitialize();
+        this._results = [];
     }
     /**
-     * * Return the results structure for the intersection calculation.
+     * Return the results structure for the intersection calculation, structured as an array of CurveLocationDetailPair.
      * @param reinitialize if true, a new results structure is created for use by later calls.
      */
-    grabResults(reinitialize = false) {
+    grabPairedResults(reinitialize = false) {
         const result = this._results;
         if (reinitialize)
-            this.reinitialize();
+            this._results = [];
         return result;
     }
     acceptFraction(extend0, fraction, extend1) {
@@ -64,15 +59,14 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
      * Reject if evaluated points do not match coordinates (e.g. close approach point).
      * Record with fraction mapping.
      */
-    recordPointWithLocalFractions(localFractionA, cpA, fractionA0, fractionA1, localFractionB, // Computed intersection fraction
-    cpB, fractionB0, fractionB1, reversed) {
+    recordPointWithLocalFractions(localFractionA, cpA, fractionA0, fractionA1, localFractionB, cpB, fractionB0, fractionB1, reversed) {
         const globalFractionA = Geometry.interpolate(fractionA0, localFractionA, fractionA1);
         const globalFractionB = Geometry.interpolate(fractionB0, localFractionB, fractionB1);
         // ignore duplicate of most recent point .  ..
-        const numPrevious = this._results.dataA.length;
+        const numPrevious = this._results.length;
         if (numPrevious > 0) {
-            const topFractionA = this._results.dataA[numPrevious - 1].fraction;
-            const topFractionB = this._results.dataB[numPrevious - 1].fraction;
+            const topFractionA = this._results[numPrevious - 1].detailA.fraction;
+            const topFractionB = this._results[numPrevious - 1].detailB.fraction;
             if (reversed) {
                 if (Geometry.isAlmostEqualNumber(topFractionA, globalFractionB) &&
                     Geometry.isAlmostEqualNumber(topFractionB, globalFractionA))
@@ -93,12 +87,12 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
         const detailB = CurveLocationDetail.createCurveFractionPoint(cpB, globalFractionB, pointB);
         detailB.setIntervalRole(CurveIntervalRole.isolated);
         if (reversed) {
-            this._results.dataA.push(detailB);
-            this._results.dataB.push(detailA);
+            const pair = new CurveLocationDetailPair(detailB, detailA);
+            this._results.push(pair);
         }
         else {
-            this._results.dataA.push(detailA);
-            this._results.dataB.push(detailB);
+            const pair = new CurveLocationDetailPair(detailA, detailB);
+            this._results.push(pair);
         }
     }
     /**
@@ -114,8 +108,8 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
         }
     }
     // Caller accesses data from a line segment and passes to here.
-    // (The line segment in question might be (a) a full line segment or (b) a fragment within a linestring.  The fraction and extend parameters
-    // allow all combinations to be passed in)
+    // The line segment in question might be (a) a full line segment or (b) a fragment within a linestring.
+    // The fraction and extend parameters allow all combinations to be passed in.
     // This method applies transform.
     dispatchSegmentSegment(cpA, extendA0, pointA0, fractionA0, pointA1, fractionA1, extendA1, cpB, extendB0, pointB0, fractionB0, pointB1, fractionB1, extendB1, reversed) {
         this.computeSegmentSegment3D(cpA, extendA0, pointA0, fractionA0, pointA1, fractionA1, extendA1, cpB, extendB0, pointB0, fractionB0, pointB1, fractionB1, extendB1, reversed);
@@ -130,7 +124,7 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
      * @param origin plane origin
      * @param vectorA vector which must be in the plane.
      * @param cosineValue largest cosine of the angle theta between vectorA and vectorB to prefer their cross product, e.g.
-     *  passing 0.94 ~ cos(20deg) will switch to using vectorC in the cross product if theta < ~20deg or theta > ~160deg.
+     * passing 0.94 ~ cos(20deg) will switch to using vectorC in the cross product if theta < ~20deg or theta > ~160deg.
      * @param vectorB first candidate for additional in-plane vector
      * @param vectorC second candidate for additional in-plane vector
      */
@@ -145,8 +139,8 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
         return undefined;
     }
     // Caller accesses data from a linestring or segment and passes it here.
-    // (The line segment in question might be (a) a full line segment or (b) a fragment within a linestring.  The fraction and extend parameters
-    // allow all combinations to be passed in)
+    // The line segment in question might be (a) a full line segment or (b) a fragment within a linestring.
+    // The fraction and extend parameters allow all combinations to be passed in.
     dispatchSegmentArc(cpA, extendA0, pointA0, fractionA0, pointA1, fractionA1, extendA1, arc, extendB0, extendB1, reversed) {
         const lineVector = Vector3d.createStartEnd(pointA0, pointA1);
         const plane = this.createPlaneWithPreferredPerpendicular(pointA0, lineVector, 0.94, arc.perpendicularVector, arc.vector0);
@@ -181,7 +175,7 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
             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 = cpA.sweep.radiansToSignedPeriodicFraction(ellipseRadians[i]);
+                const fractionB = cpB.sweep.radiansToSignedPeriodicFraction(ellipseRadians[i]);
                 // 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)) {
                     this.recordPointWithLocalFractions(fractionA, cpA, 0, 1, fractionB, cpB, 0, 1, reversed);
@@ -190,13 +184,13 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
         }
     }
     // Caller accesses data from two arcs.
-    // Selects the best conditioned arc (in xy parts) as "circle after inversion"
-    // Solves the arc-arc equations
+    // Selects the best conditioned arc (in xy parts) as "circle after inversion".
+    // Solves the arc-arc equations.
     dispatchArcArc(cpA, extendA, cpB, extendB, 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.
-        // If arcs are in parallel planes -- no intersections
+        // If arcs are in parallel planes -- no intersections.
         // If arcs are in the same plane -- xy intersection in that plane.
         const planeA = Plane3dByOriginAndUnitNormal.create(cpA.center, cpA.perpendicularVector);
         const planeB = Plane3dByOriginAndUnitNormal.create(cpB.center, cpB.perpendicularVector);
@@ -204,7 +198,7 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
             return;
         if (planeA.getNormalRef().isParallelTo(planeB.getNormalRef())) {
             if (planeA.isPointInPlane(planeB.getOriginRef()) && planeB.isPointInPlane(planeA.getOriginRef())) {
-                // coplanar !!!
+                // coplanar
                 this.dispatchArcArcInPlane(cpA, extendA, cpB, extendB, reversed);
             }
         }
@@ -226,8 +220,8 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
         }
     }
     // Caller accesses data from two arcs.
-    // Selects the best conditioned arc (in xy parts) as "circle after inversion"
-    // Solves the arc-arc equations
+    // Selects the best conditioned arc (in xy parts) as "circle after inversion".
+    // Solves the arc-arc equations.
     dispatchArcBsplineCurve3d(_arc, _extendA, _cpB, _extendB, _reversed) {
         /*
         // Arc: X = C + cU + sV
@@ -235,7 +229,9 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
         let matrixA: Matrix3d;
         if (this._worldToLocalPerspective) {
           const dataA = cpA.toTransformedPoint4d(this._worldToLocalPerspective);
-          matrixA = Matrix3d.createColumnsXYW(dataA.vector0, dataA.vector0.w, dataA.vector90, dataA.vector90.w, dataA.center, dataA.center.w);
+          matrixA = Matrix3d.createColumnsXYW(
+            dataA.vector0, dataA.vector0.w, dataA.vector90, dataA.vector90.w, dataA.center, dataA.center.w,
+          );
         } else {
           const dataA = cpA.toTransformedVectors(this._worldToLocalAffine);
           matrixA = Matrix3d.createColumnsXYW(dataA.vector0, 0, dataA.vector90, 0, dataA.center, 1);
@@ -247,12 +243,21 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
         const matrixAInverse = matrixA.inverse();
         if (matrixAInverse) {
           const orderF = cpB.order; // order of the beziers for simple coordinates
-          const orderG = 2 * orderF - 1;  // order of the (single) bezier for squared coordinates.
+          const orderG = 2 * orderF - 1; // order of the (single) bezier for squared coordinates.
           const coffF = new Float64Array(orderF);
           const univariateBezierG = new UnivariateBezier(orderG);
-          const axx = matrixAInverse.at(0, 0); const axy = matrixAInverse.at(0, 1); const axz = 0.0; const axw = matrixAInverse.at(0, 2);
-          const ayx = matrixAInverse.at(1, 0); const ayy = matrixAInverse.at(1, 1); const ayz = 0.0; const ayw = matrixAInverse.at(1, 2);
-          const awx = matrixAInverse.at(2, 0); const awy = matrixAInverse.at(2, 1); const awz = 0.0; const aww = matrixAInverse.at(2, 2);
+          const axx = matrixAInverse.at(0, 0);
+          const axy = matrixAInverse.at(0, 1);
+          const axz = 0.0;
+          const axw = matrixAInverse.at(0, 2);
+          const ayx = matrixAInverse.at(1, 0);
+          const ayy = matrixAInverse.at(1, 1);
+          const ayz = 0.0;
+          const ayw = matrixAInverse.at(1, 2);
+          const awx = matrixAInverse.at(2, 0);
+          const awy = matrixAInverse.at(2, 1);
+          const awz = 0.0;
+          const aww = matrixAInverse.at(2, 2);
     
           if (matrixAInverse) {
             let bezier: BezierCurve3dH | undefined;
@@ -279,9 +284,11 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
                   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)) {
-                    this.recordPointWithLocalFractions(arcFraction, cpA, 0, 1,
-                      fractionB, cpB, 0, 1, reversed);
+                  if (this.acceptFraction(extendA, arcFraction, extendA) &&
+                    this.acceptFraction(extendB, fractionB, extendB)) {
+                    this.recordPointWithLocalFractions(
+                      arcFraction, cpA, 0, 1, fractionB, cpB, 0, 1, reversed,
+                    );
                   }
                 }
               }
@@ -291,8 +298,8 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
         */
     }
     /*
-    // apply the transformation to bezier curves. optionally construct ranges.
-    private transformBeziers(beziers: BezierCurve3dH[]) {
+    // Apply the transformation to bezier curves. Optionally construct ranges.
+    private transformBeziers(beziers: BezierCurve3dH[]): void {
       if (this._worldToLocalAffine) {
         for (const bezier of beziers) bezier.tryTransformInPlace(this._worldToLocalAffine);
       } else if (this._worldToLocalPerspective) {
@@ -309,11 +316,6 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
       }
       return ranges;
     }
-    private _xyzwA0?: Point4d;
-    private _xyzwA1?: Point4d;
-    private _xyzwPlane?: Point4d;
-    private _xyzwB?: Point4d;
-  
     private dispatchBezierBezierStrokeFirst(
       bezierA: BezierCurve3dH,
       bcurveA: BSplineCurve3dBase,
@@ -322,11 +324,16 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
       bcurveB: BSplineCurve3dBase,
       _strokeCountB: number,
       univariateBezierB: UnivariateBezier,  // caller-allocated for univariate coefficients.
-      reversed: boolean) {
-      if (!this._xyzwA0) this._xyzwA0 = Point4d.create();
-      if (!this._xyzwA1) this._xyzwA1 = Point4d.create();
-      if (!this._xyzwPlane) this._xyzwPlane = Point4d.create();
-      if (!this._xyzwB) this._xyzwB = Point4d.create();
+      reversed: boolean,
+    ) {
+      if (!this._xyzwA0)
+        this._xyzwA0 = Point4d.create();
+      if (!this._xyzwA1)
+        this._xyzwA1 = Point4d.create();
+      if (!this._xyzwPlane)
+        this._xyzwPlane = Point4d.create();
+      if (!this._xyzwB)
+        this._xyzwB = Point4d.create();
       const roots = univariateBezierG.roots(0.0, true);
       if (roots) {
         for (const root of roots) {
@@ -337,8 +344,9 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
           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)) {
-            this.recordPointWithLocalFractions(arcFraction, cpA, 0, 1,
-              fractionB, cpB, 0, 1, reversed);
+            this.recordPointWithLocalFractions(
+              arcFraction, cpA, 0, 1, fractionB, cpB, 0, 1, reversed,
+            );
           }
         }
       bezierA.fractionToPoint4d(0.0, this._xyzwA0);
@@ -350,7 +358,9 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
         f1 = i * df;
         bezierA.fractionToPoint4d(f1, this._xyzwA1);
         Point4d.createPlanePointPointZ(this._xyzwA0, this._xyzwA1, this._xyzwPlane);
-        bezierB.poleProductsXYZW(univariateBezierB.coffs, this._xyzwPlane.x, this._xyzwPlane.y, this._xyzwPlane.z, this._xyzwPlane.w);
+        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)
@@ -360,7 +370,7 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
             const segmentAFraction = SmallSystem.lineSegment3dHXYClosestPointUnbounded(this._xyzwA0, this._xyzwA1, this._xyzwB);
             if (segmentAFraction && Geometry.isIn01WithTolerance(segmentAFraction, intervalTolerance)) {
               const bezierAFraction = Geometry.interpolate(f0, segmentAFraction, f1);
-              /*- TODO implement newton search
+              // TODO implement newton search
               const xyMatchingFunction = new BezierBezierIntersectionXYRRToRRD(bezierA, bezierB);
               const newtonSearcher = new Newton2dUnboundedWithDerivative(xyMatchingFunction);
               newtonSearcher.setUV(bezierAFraction, bezierBFraction);
@@ -385,9 +395,11 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
                 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);
+              if (this.acceptFraction(false, bcurveAFraction, false) &&
+                this.acceptFraction(false, bcurveBFraction, false)) {
+                this.recordPointWithLocalFractions(
+                  bcurveAFraction, bcurveA, 0, 1, bcurveBFraction, bcurveB, 0, 1, reversed,
+                );
               }
             }
           }
@@ -395,8 +407,8 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
     }
     */
     // Caller accesses data from two arcs.
-    // Selects the best conditioned arc (in xy parts) as "circle after inversion"
-    // Solves the arc-arc equations
+    // Selects the best conditioned arc (in xy parts) as "circle after inversion".
+    // Solves the arc-arc equations.
     dispatchBSplineCurve3dBSplineCurve3d(_bcurveA, _bcurveB, _reversed) {
         /*
         const bezierSpanA = bcurveA.collectBezierSpans(true) as BezierCurve3dH[];
@@ -417,9 +429,13 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
               const strokeCountA = bezierSpanA[a].computeStrokeCountForOptions();
               const strokeCountB = bezierSpanB[b].computeStrokeCountForOptions();
               if (strokeCountA < strokeCountB)
-                this.dispatchBezierBezierStrokeFirst(bezierSpanA[a], bcurveA, strokeCountA, bezierSpanB[b], bcurveB, strokeCountB, univariateCoffsB, !_reversed);
+                this.dispatchBezierBezierStrokeFirst(
+                  bezierSpanA[a], bcurveA, strokeCountA, bezierSpanB[b], bcurveB, strokeCountB, univariateCoffsB, _reversed,
+                );
               else
-                this.dispatchBezierBezierStrokeFirst(bezierSpanB[b], bcurveB, strokeCountB, bezierSpanA[a], bcurveA, strokeCountA, univariateCoffsA, _reversed);
+                this.dispatchBezierBezierStrokeFirst(
+                  bezierSpanB[b], bcurveB, strokeCountB, bezierSpanA[a], bcurveA, strokeCountA, univariateCoffsA, !_reversed,
+                );
             }
           }
         }
@@ -427,9 +443,9 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
     }
     /*
     /**
-     * Apply the projection transform (if any) to (xyz, w)
+     * Apply the projection transform (if any) to (xyz, w).
      * @param xyz xyz parts of input point.
-     * @param w   weight to use for homogeneous effects
+     * @param w weight to use for homogeneous effects.
      */
     /*
     private projectPoint(xyz: XYAndZ, w: number = 1.0): Point4d {
@@ -466,16 +482,19 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
           // NOW .. we have a plane in world space.  Intersect it with the bspline:
         const intersections: CurveLocationDetail[] = [];
         bcurve.appendPlaneIntersectionPoints(planeCoffs, intersections);
-          // intersections has WORLD points with bspline fractions.   (The bspline fractions are all good 0..1 fractions within the spline.)
+          // intersections has WORLD points with bspline fractions.
+          // (the bspline fractions are all good 0..1 fractions within the spline).
           // accept those that are within the segment range.
         for (const detail of intersections) {
           const fractionB = detail.fraction;
           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)) {
-            this.recordPointWithLocalFractions(lineFraction, cpA, fractionA0, fractionA1,
-              fractionB, bcurve, 0, 1, reversed);
+          if (lineFraction !== undefined && this.acceptFraction(extendA0, lineFraction, extendA1) &&
+            this.acceptFraction(extendB, fractionB, extendB)) {
+            this.recordPointWithLocalFractions(
+              lineFraction, cpA, fractionA0, fractionA1, fractionB, bcurve, 0, 1, reversed,
+            );
           }
         }
         */
@@ -492,7 +511,7 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
           const pointA0 = CurveCurveIntersectXYZ._workPointA0;
           const pointA1 = CurveCurveIntersectXYZ._workPointA1;
           lsA.pointAt(0, pointA0);
-          for (let iA = 1; iA < numA; iA++ , pointA0.setFrom(pointA1), fA0 = fA1) {
+          for (let iA = 1; iA < numA; iA++, pointA0.setFrom(pointA1), fA0 = fA1) {
             lsA.pointAt(iA, pointA1);
             fA1 = iA * dfA;
             this.dispatchSegmentBsplineCurve(
@@ -543,6 +562,38 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
         }
         return undefined;
     }
+    /** Detail computation for linestring intersecting linestring. */
+    computeLineStringLineString(lsA, lsB, reversed) {
+        const pointA0 = CurveCurveIntersectXYZ._workPointAA0;
+        const pointA1 = CurveCurveIntersectXYZ._workPointAA1;
+        const pointB0 = CurveCurveIntersectXYZ._workPointBB0;
+        const pointB1 = CurveCurveIntersectXYZ._workPointBB1;
+        const numA = lsA.numPoints();
+        const numB = lsB.numPoints();
+        if (numA > 1 && numB > 1) {
+            lsA.pointAt(0, pointA0);
+            const dfA = 1.0 / (numA - 1);
+            const dfB = 1.0 / (numB - 1);
+            let fA0 = 0.0;
+            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;
+                fB0 = 0.0;
+                lsA.pointAt(ia, pointA1);
+                lsB.pointAt(0, pointB0);
+                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);
+                }
+            }
+        }
+    }
     /** Double dispatch handler for strongly typed segment. */
     handleLineSegment3d(segmentA) {
         if (this._geometryB instanceof LineSegment3d) {
@@ -558,38 +609,13 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
         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);
         }
+        return undefined;
     }
-    /** double dispatch handler for strongly typed linestring .. */
+    /** double dispatch handler for strongly typed linestring. */
     handleLineString3d(lsA) {
         if (this._geometryB instanceof LineString3d) {
             const lsB = this._geometryB;
-            const pointA0 = CurveCurveIntersectXYZ._workPointAA0;
-            const pointA1 = CurveCurveIntersectXYZ._workPointAA1;
-            const pointB0 = CurveCurveIntersectXYZ._workPointBB0;
-            const pointB1 = CurveCurveIntersectXYZ._workPointBB1;
-            const numA = lsA.numPoints();
-            const numB = lsB.numPoints();
-            if (numA > 1 && numB > 1) {
-                lsA.pointAt(0, pointA0);
-                const dfA = 1.0 / (numA - 1);
-                const dfB = 1.0 / (numB - 1);
-                let fA0 = 0.0;
-                let fA1, fB0, 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;
-                    fB0 = 0.0;
-                    lsA.pointAt(ia, pointA1);
-                    lsB.pointAt(0, pointB0);
-                    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, false);
-                    }
-                }
-            }
+            this.computeLineStringLineString(lsA, lsB, false);
         }
         else if (this._geometryB instanceof LineSegment3d) {
             this.computeSegmentLineString(this._geometryB, this._extendB, lsA, this._extendA, true);
@@ -618,7 +644,7 @@ class CurveCurveIntersectXYZ extends NullGeometryHandler {
         }
         return undefined;
     }
-    /** Double dispatch handler for strongly typed bspline curve.. */
+    /** 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);