@itwin/core-geometry 4.2.0-dev.16 → 4.2.0-dev.18

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

@@ -260,7 +260,7 @@ class CurveCurveCloseApproachXY extends GeometryHandler_1.RecurseToCurvesGeometr
             fractionB = 1;
         this._workPointB = pointB0.interpolate(fractionB, pointB1, this._workPointB);
         const distanceSquared = this._workPointB.distanceSquaredXY(pointA);
-        if (distanceSquared < Math.min(maxDistanceSquared, closestApproach.detailA.a)) {
+        if (distanceSquared <= Math.min(maxDistanceSquared, closestApproach.detailA.a)) {
             closestApproach.detailA.setFP(fractionA, pointA, undefined, distanceSquared);
             closestApproach.detailB.setFP(fractionB, this._workPointB, undefined, distanceSquared);
             updated = true;
@@ -303,23 +303,23 @@ class CurveCurveCloseApproachXY extends GeometryHandler_1.RecurseToCurvesGeometr
         closestApproach.detailA.a = 2 * maxDistanceSquared; // init to an approach that's too far away
         let reversed = false;
         const uu = Geometry_1.Geometry.hypotenuseSquaredXY(ux, uy);
-        if (hab0 * hab0 < maxDistanceSquared * uu) { // test distance of b0 to u
+        if (hab0 * hab0 <= maxDistanceSquared * uu) { // test distance of b0 to u
             const fractionA = Geometry_1.Geometry.dotProductXYXY(ux, uy, e00x, e00y) / uu;
             if (this.updatePointToSegmentDistance(0, b0, a0, a1, fractionA, maxDistanceSquared, closestApproach))
                 reversed = true;
         }
-        if (hab1 * hab1 < maxDistanceSquared * uu) { // test distance of b1 to u
+        if (hab1 * hab1 <= maxDistanceSquared * uu) { // test distance of b1 to u
             const fractionA = Geometry_1.Geometry.dotProductXYXY(ux, uy, e01x, e01y) / uu;
             if (this.updatePointToSegmentDistance(1, b1, a0, a1, fractionA, maxDistanceSquared, closestApproach))
                 reversed = true;
         }
         const vv = Geometry_1.Geometry.hypotenuseSquaredXY(vx, vy);
-        if (hba0 * hba0 < maxDistanceSquared * vv) { // test distance of a0 to v
+        if (hba0 * hba0 <= maxDistanceSquared * vv) { // test distance of a0 to v
             const fractionB = -Geometry_1.Geometry.dotProductXYXY(vx, vy, e00x, e00y) / vv;
             if (this.updatePointToSegmentDistance(0, a0, b0, b1, fractionB, maxDistanceSquared, closestApproach))
                 reversed = false;
         }
-        if (hba1 * hba1 < maxDistanceSquared * vv) { // test distance of a1 to v
+        if (hba1 * hba1 <= maxDistanceSquared * vv) { // test distance of a1 to v
             const fractionB = -Geometry_1.Geometry.dotProductXYXY(vx, vy, e10x, e10y) / vv;
             if (this.updatePointToSegmentDistance(1, a1, b0, b1, fractionB, maxDistanceSquared, closestApproach))
                 reversed = false;
@@ -397,10 +397,10 @@ class CurveCurveCloseApproachXY extends GeometryHandler_1.RecurseToCurvesGeometr
      * Low level dispatch of segment with arc.
      * Find close approaches within maxDistance between a line segments (pointA0, pointA1) and an arc.
      * To consider:
-     * 1) arc endpoints to segment endpoints or arc endpoints projection to the segment.
-     * 2) intersection between arc and segment.
+     * 1) intersection between arc and segment.
+     * 2) arc endpoints to segment endpoints or arc endpoints projection to the segment.
      * 3) line parallel to arc tangent.
-     * @param cpA the segment
+     * @param cpA curve A (line segment or line string)
      * @param pointA0 start point of the segment
      * @param fractionA0 fraction of the start of the segment
      * @param pointA1 end point of the segment
@@ -409,9 +409,7 @@ class CurveCurveCloseApproachXY extends GeometryHandler_1.RecurseToCurvesGeometr
      * @param reversed true to have order reversed in final structures
      */
     dispatchSegmentArc(cpA, pointA0, fractionA0, pointA1, fractionA1, arc, reversed) {
-        // 1) arc endpoints to segment endpoints or arc endpoints projection to the segment
-        this.testAndRecordFractionalPairApproach(cpA, 0, 1, true, arc, 0, 1, false, reversed);
-        // 2) intersection between arc and segment
+        // 1) intersection between arc and segment
         // Suppose:
         // Arc: X = C + cU + sV where c = cos(theta) and s = sin(theta)
         // Line: contains points A0 and A1
@@ -420,6 +418,7 @@ class CurveCurveCloseApproachXY extends GeometryHandler_1.RecurseToCurvesGeometr
         // solve for theta.
         // evaluate points.
         // project back to line.
+        let intersectionFound = false;
         const data = arc.toTransformedVectors();
         const pointA0Local = pointA0;
         const pointA1Local = pointA1;
@@ -438,8 +437,13 @@ class CurveCurveCloseApproachXY extends GeometryHandler_1.RecurseToCurvesGeometr
             // only add if the point is within the start and end fractions of both line segment and arc
             if (lineFraction !== undefined && this.acceptFraction(lineFraction) && this.acceptFraction(arcFraction)) {
                 this.recordPointWithLocalFractions(lineFraction, cpA, fractionA0, fractionA1, arcFraction, arc, 0, 1, reversed);
+                intersectionFound = true;
             }
         }
+        if (intersectionFound)
+            return;
+        // 2) endpoints to endpoints or endpoints projection to the other curve
+        this.testAndRecordFractionalPairApproach(cpA, fractionA0, fractionA1, true, arc, 0, 1, false, reversed);
         // 3) line parallel to arc tangent.
         // If line does not intersect the arc, then the closest (and/or the furthest) point on arc to the line is a
         // point where the tangent line on arc at that point is parallel to the line.
@@ -456,48 +460,37 @@ class CurveCurveCloseApproachXY extends GeometryHandler_1.RecurseToCurvesGeometr
             }
         }
     }
-    // Caller accesses data from two arcs, ensures circular, and orders with radiusA >= radiusB
+    /** Low level dispatch of circular arc with circular arc. radiusA must be larger than or equal to radiusB. */
     dispatchCircularCircularOrdered(cpA, radiusA, cpB, radiusB, reversed) {
         const c = cpA.center.distance(cpB.center);
         const e = this._maxDistanceToAccept !== undefined ? this._maxDistanceToAccept : Geometry_1.Geometry.smallMetricDistance;
-        if (c > radiusA + radiusB + e) // widely separated
+        if (c > radiusA + radiusB + e) // distance between circles is more than max distance
             return;
-        // To consider:
-        // 1) endpoint to endpoint or projection
-        // 2) true intersection
-        // 3) line parallel to arc tangent.
+        // TODO: 1) intersection between arcs
+        // 2) endpoints to endpoints
         this.testAndRecordFractionalPairApproach(cpA, 0, 1, false, cpB, 0, 1, false, reversed);
+        // 3) line from one arc to another (perpendicular to arc tangents along center-center line)
         if (!Geometry_1.Geometry.isSmallMetricDistance(c)) {
-            // ?? endpoint hits are recorded.  Maybe also need overlap?
             const vectorAB = Point3dVector3d_1.Vector3d.createStartEnd(cpA.center, cpB.center);
             vectorAB.scaleInPlace(1.0 / c);
-            if (c - radiusA - radiusB > e) {
-                // no approaches possible
-            }
-            else {
-                for (const rA of [-radiusA, radiusA]) {
-                    for (const rB of [-radiusB, radiusB]) {
-                        const tangentDistance = c - rA + rB;
-                        if (tangentDistance < e) {
-                            const detailA = this.resolveDirectionToArcXYFraction(cpA, vectorAB, rA);
-                            if (detailA) {
-                                const detailB = this.resolveDirectionToArcXYFraction(cpB, vectorAB, rB);
-                                if (detailB) {
-                                    this.captureDetailPair(detailA, detailB, reversed);
-                                }
-                            }
+            for (const rA of [-radiusA, radiusA]) {
+                for (const rB of [-radiusB, radiusB]) {
+                    const tangentDistance = c - rA + rB;
+                    if (tangentDistance < e) {
+                        const detailA = this.resolveDirectionToArcXYFraction(cpA, vectorAB, rA);
+                        if (detailA) {
+                            const detailB = this.resolveDirectionToArcXYFraction(cpB, vectorAB, rB);
+                            if (detailB)
+                                this.captureDetailPair(detailA, detailB, reversed);
                         }
                     }
                 }
             }
         }
     }
-    /**
-     * Find the fractional point (if any) on an arc, known to be circular and displayed from the center in the
-     * direction of a scaled vector.
-     */
+    /** Find the fractional point (if any) on the circular `arc` in the direction of `radialVector`. */
     resolveDirectionToArcXYFraction(arc, radialVector, scale) {
-        // The scale ultimately only affects the direction --- easiest way to use it is two multiplies
+        // The scale ultimately only affects the direction --- easiest way to use it is two multiplies.
         const c = scale * arc.matrixRef.columnDotXYZ(0, radialVector.x, radialVector.y, 0);
         const s = scale * arc.matrixRef.columnDotXYZ(1, radialVector.x, radialVector.y, 0);
         const radians = Math.atan2(s, c);
@@ -506,10 +499,13 @@ class CurveCurveCloseApproachXY extends GeometryHandler_1.RecurseToCurvesGeometr
             return CurveLocationDetail_1.CurveLocationDetail.createCurveEvaluatedFraction(arc, fraction);
         return undefined;
     }
-    // Caller accesses data from two arcs.
-    // Selects the best conditioned arc (in xy parts) as "circle after inversion"
-    // Solves the arc-arc equations
+    /** Low level dispatch of arc with arc. Only circular arcs are supported. */
     dispatchArcArc(cpA, cpB, reversed) {
+        const rangeA = cpA.range();
+        const rangeB = cpB.range();
+        rangeA.expandInPlace(this._maxDistanceToAccept);
+        if (!rangeB.intersectsRangeXY(rangeA))
+            return;
         if (this._circularArcB) {
             const radiusB = this._circularRadiusB;
             const radiusA = cpA.circularRadiusXY();
@@ -522,17 +518,13 @@ class CurveCurveCloseApproachXY extends GeometryHandler_1.RecurseToCurvesGeometr
             }
         }
     }
-    // Caller accesses data from two arcs.
-    // Selects the best conditioned arc (in xy parts) as "circle after inversion"
-    // Solves the arc-arc equations
+    /** Low level dispatch of arc with (beziers of) a bspline curve */
     dispatchArcBsplineCurve3d(cpA, cpB, reversed) {
         const ls = LineString3d_1.LineString3d.create();
         cpB.emitStrokes(ls);
         this.computeArcLineString(cpA, ls, reversed);
     }
-    // Caller accesses data from two arcs.
-    // Selects the best conditioned arc (in xy parts) as "circle after inversion"
-    // Solves the arc-arc equations
+    /** Low level dispatch of (beziers of) a bspline curve with (beziers of) a bspline curve */
     dispatchBSplineCurve3dBSplineCurve3d(bcurveA, bcurveB, reversed) {
         const lsA = LineString3d_1.LineString3d.create();
         bcurveA.emitStrokes(lsA);
@@ -570,6 +562,11 @@ class CurveCurveCloseApproachXY extends GeometryHandler_1.RecurseToCurvesGeometr
     }
     /** Detail computation for arc approaching linestring. */
     computeArcLineString(arcA, lsB, reversed) {
+        const rangeA = arcA.range();
+        const rangeB = lsB.range();
+        rangeA.expandInPlace(this._maxDistanceToAccept);
+        if (!rangeB.intersectsRangeXY(rangeA))
+            return;
         const pointB0 = CurveCurveCloseApproachXY._workPointBB0;
         const pointB1 = CurveCurveCloseApproachXY._workPointBB1;
         const numB = lsB.numPoints();
@@ -587,10 +584,10 @@ class CurveCurveCloseApproachXY extends GeometryHandler_1.RecurseToCurvesGeometr
         }
         return undefined;
     }
-    /** Low level dispatch of curve chain.  */
-    dispatchCurveChain(geomA, geomAHandler) {
+    /** Low level dispatch of curve collection. */
+    dispatchCurveCollection(geomA, geomAHandler) {
         const geomB = this._geometryB; // save
-        if (!geomB || !(geomB instanceof CurveCollection_1.CurveChain))
+        if (!geomB || !geomB.children || !(geomB instanceof CurveCollection_1.CurveCollection))
             return;
         for (const child of geomB.children) {
             this.resetGeometry(child);
@@ -613,9 +610,10 @@ class CurveCurveCloseApproachXY extends GeometryHandler_1.RecurseToCurvesGeometr
         else if (this._geometryB instanceof BSplineCurve_1.BSplineCurve3d) {
             this.dispatchSegmentBsplineCurve(segmentA, this._geometryB, false);
         }
-        else if (this._geometryB instanceof CurveCollection_1.CurveChain) {
-            this.dispatchCurveChain(segmentA, this.handleLineSegment3d.bind(this));
+        else if (this._geometryB instanceof CurveCollection_1.CurveCollection) {
+            this.dispatchCurveCollection(segmentA, this.handleLineSegment3d.bind(this));
         }
+        return undefined;
     }
     /**
      * Set bits for comparison to range xy
@@ -623,6 +621,13 @@ class CurveCurveCloseApproachXY extends GeometryHandler_1.RecurseToCurvesGeometr
      * * bit 0x02 => x larger than range.high.x
      * * bit 0x04 => y smaller than range.low.y
      * * bit 0x08 => y larger than range.high.y
+     * * If we divide XY plane into 9 areas using the range, the function returns 0 for points
+     * inside the range. Below is other binary numbers returned by the function for all 9 areas:
+     *   1001 | 1000 | 1010
+     *   ------------------
+     *    1   |  0   |  10
+     *   ------------------
+     *   101  | 100  | 110
      * @param xy point to test
      * @param range range for comparison
      */
@@ -632,12 +637,14 @@ class CurveCurveCloseApproachXY extends GeometryHandler_1.RecurseToCurvesGeometr
             result = 0x01;
         else if (x > range.high.x)
             result = 0x02;
+        // note the OR operation
         if (y < range.low.y)
             result |= 0x04;
         else if (y > range.high.y)
             result |= 0x08;
         return result;
     }
+    /** Low level dispatch of line string with line string. */
     computeLineStringLineString(lsA, lsB, reversed) {
         const rangeA = lsA.range();
         const rangeB = lsB.range();
@@ -654,7 +661,6 @@ class CurveCurveCloseApproachXY extends GeometryHandler_1.RecurseToCurvesGeometr
         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;
@@ -664,6 +670,7 @@ class CurveCurveCloseApproachXY extends GeometryHandler_1.RecurseToCurvesGeometr
                 fA1 = ia * dfA;
                 fB0 = 0.0;
                 lsA.pointAt(ia, pointA1);
+                // rangeA1 is around line segment [A0,A1] expanded by max distance
                 rangeA1.setNull();
                 rangeA1.extendPoint(pointA0);
                 rangeA1.extendPoint(pointA1);
@@ -675,10 +682,10 @@ class CurveCurveCloseApproachXY extends GeometryHandler_1.RecurseToCurvesGeometr
                         lsB.pointAt(ib, pointB1);
                         bitB1 = this.classifyBitsPointRangeXY(pointB1.x, pointB1.y, rangeA1);
                         fB1 = ib * dfB;
-                        // Do NOT study the segment in detail if both bitB bits are on for any of the 4 planes . ..
-                        if ((bitB0 & bitB1) === 0) {
+                        // DO NOT study the segment in detail if both bitB bits are on for any of the 4 planes
+                        // (i.e., no intersection between rangeA1 and the range around line segment [B0,B1])
+                        if ((bitB0 & bitB1) === 0)
                             this.dispatchSegmentSegment(lsA, pointA0, fA0, pointA1, fA1, lsB, pointB0, fB0, pointB1, fB1, reversed);
-                        }
                     }
                 }
             }
@@ -699,8 +706,8 @@ class CurveCurveCloseApproachXY extends GeometryHandler_1.RecurseToCurvesGeometr
         else if (this._geometryB instanceof BSplineCurve_1.BSplineCurve3d) {
             this.dispatchLineStringBSplineCurve(lsA, this._geometryB, false);
         }
-        else if (this._geometryB instanceof CurveCollection_1.CurveChain) {
-            this.dispatchCurveChain(lsA, this.handleLineString3d.bind(this));
+        else if (this._geometryB instanceof CurveCollection_1.CurveCollection) {
+            this.dispatchCurveCollection(lsA, this.handleLineString3d.bind(this));
         }
         return undefined;
     }
@@ -718,8 +725,8 @@ class CurveCurveCloseApproachXY extends GeometryHandler_1.RecurseToCurvesGeometr
         else if (this._geometryB instanceof BSplineCurve_1.BSplineCurve3d) {
             this.dispatchArcBsplineCurve3d(arc0, this._geometryB, false);
         }
-        else if (this._geometryB instanceof CurveCollection_1.CurveChain) {
-            this.dispatchCurveChain(arc0, this.handleArc3d.bind(this));
+        else if (this._geometryB instanceof CurveCollection_1.CurveCollection) {
+            this.dispatchCurveCollection(arc0, this.handleArc3d.bind(this));
         }
         return undefined;
     }
@@ -737,8 +744,8 @@ class CurveCurveCloseApproachXY extends GeometryHandler_1.RecurseToCurvesGeometr
         else if (this._geometryB instanceof BSplineCurve_1.BSplineCurve3dBase) {
             this.dispatchBSplineCurve3dBSplineCurve3d(curve, this._geometryB, false);
         }
-        else if (this._geometryB instanceof CurveCollection_1.CurveChain) {
-            this.dispatchCurveChain(curve, this.handleBSplineCurve3d.bind(this));
+        else if (this._geometryB instanceof CurveCollection_1.CurveCollection) {
+            this.dispatchCurveCollection(curve, this.handleBSplineCurve3d.bind(this));
         }
         return undefined;
     }