@itwin/core-geometry 5.5.0-dev.4 → 5.5.0-dev.5

package/lib/esm/curve/internalContexts/CurveCurveCloseApproachXY.d.ts

@@ -4,7 +4,7 @@ import { RecurseToCurvesGeometryHandler } from "../../geometry3d/GeometryHandler
 import { Point3d } from "../../geometry3d/Point3dVector3d";
 import { Arc3d } from "../Arc3d";
 import { CurveChainWithDistanceIndex } from "../CurveChainWithDistanceIndex";
-import { CurveLocationDetail, CurveLocationDetailPair } from "../CurveLocationDetail";
+import { CurveLocationDetailPair } from "../CurveLocationDetail";
 import { CurvePrimitive } from "../CurvePrimitive";
 import { AnyCurve } from "../CurveTypes";
 import { LineSegment3d } from "../LineSegment3d";
@@ -31,7 +31,7 @@ export declare class CurveCurveCloseApproachXY extends RecurseToCurvesGeometryHa
      * This is caller defined and can be undefined.
      */
     private _maxDistanceToAccept;
-    /** Squared max distance. This is private, and is forced to at least small metric distance squared. */
+    /** Squared max distance. Default is [[Geometry.smallMetricDistanceSquared]]. */
     private _maxDistanceSquared;
     /**
      * Start and end points of line segments that meet closest approach criteria, i.e., they are perpendicular to
@@ -79,7 +79,6 @@ export declare class CurveCurveCloseApproachXY extends RecurseToCurvesGeometryHa
      * @param fractionB0 start of the second curve
      * @param fractionB1 end of the second curve
      * @param reversed whether to reverse the details in the pair (e.g., so that detailB refers to geometryB).
-     * @param intervalDetails optional CurveLocationDetailPair
      */
     private recordPointWithLocalFractions;
     /**
@@ -96,21 +95,6 @@ export declare class CurveCurveCloseApproachXY extends RecurseToCurvesGeometryHa
      * @param reversed whether to reverse the details in the pair (e.g., so that detailB refers to geometryB).
      */
     private capturePairWithLocalFractions;
-    /**
-     * Emit recordPoint for multiple pairs (on full curve) if within maxDistance.
-     * @param cpA first curve primitive (possibly different from curve in detailA, but fraction compatible)
-     * @param cpB second curve primitive (possibly different from curve in detailA, but fraction compatible)
-     * @param pairs array of pairs
-     * @param reversed whether to reverse the details in the pair (e.g., so that detailB refers to geometryB).
-     */
-    recordPairs(cpA: CurvePrimitive, cpB: CurvePrimitive, pairs: CurveLocationDetailPair[] | undefined, reversed: boolean): void;
-    /**
-     * Record fully assembled (but possibly reversed) detail pair.
-     * @param detailA first detail
-     * @param detailB second detail
-     * @param reversed whether to reverse the details in the pair (e.g., so that detailB refers to geometryB).
-     */
-    captureDetailPair(detailA: CurveLocationDetail | undefined, detailB: CurveLocationDetail | undefined, reversed: boolean): void;
     private static updatePointToSegmentDistance;
     /**
      * Return fractions of close approach within maxDistance between two line segments (a0,a1) and (b0,b1).
@@ -206,13 +190,13 @@ export declare class CurveCurveCloseApproachXY extends RecurseToCurvesGeometryHa
     /** Low level dispatch of (beziers of) a bspline curve with (beziers of) a bspline curve */
     private dispatchBSplineCurve3dBSplineCurve3d;
     /** Low level dispatch of linestring with (beziers of) a bspline curve */
-    dispatchLineStringBSplineCurve(lsA: LineString3d, curveB: BSplineCurve3d, reversed: boolean): any;
+    dispatchLineStringBSplineCurve(lsA: LineString3d, curveB: BSplineCurve3d, reversed: boolean): void;
     /** Low level dispatch of segment with (beziers of) a bspline curve */
-    dispatchSegmentBsplineCurve(segA: LineSegment3d, curveB: BSplineCurve3d, reversed: boolean): any;
+    dispatchSegmentBsplineCurve(segA: LineSegment3d, curveB: BSplineCurve3d, reversed: boolean): void;
     /** Detail computation for segment approaching linestring. */
     computeSegmentLineString(segA: LineSegment3d, lsB: LineString3d, reversed: boolean): void;
     /** Detail computation for arc approaching linestring. */
-    computeArcLineString(arcA: Arc3d, lsB: LineString3d, reversed: boolean): any;
+    computeArcLineString(arcA: Arc3d, lsB: LineString3d, reversed: boolean): void;
     /** Low level dispatch of curve collection. */
     private dispatchCurveCollection;
     /** Low level dispatch to geomA given a CurveChainWithDistanceIndex in geometryB. */

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

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

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

@@ -46,7 +46,7 @@ export class CurveCurveCloseApproachXY extends RecurseToCurvesGeometryHandler {
      * This is caller defined and can be undefined.
      */
     _maxDistanceToAccept;
-    /** Squared max distance. This is private, and is forced to at least small metric distance squared. */
+    /** Squared max distance. Default is [[Geometry.smallMetricDistanceSquared]]. */
     _maxDistanceSquared;
     /**
      * Start and end points of line segments that meet closest approach criteria, i.e., they are perpendicular to
@@ -111,8 +111,9 @@ export class CurveCurveCloseApproachXY extends RecurseToCurvesGeometryHandler {
     testAndRecordPointPairApproach(cpA, fA, pointA, cpB, fB, pointB, reversed) {
         const d2 = pointA.distanceSquaredXY(pointB);
         if (d2 < this._maxDistanceSquared) {
-            const detailA = CurveLocationDetail.createCurveFractionPoint(cpA, fA, pointA);
-            const detailB = CurveLocationDetail.createCurveFractionPoint(cpB, fB, pointB);
+            const d = Math.sqrt(d2);
+            const detailA = CurveLocationDetail.createCurveFractionPointDistance(cpA, fA, pointA, d);
+            const detailB = CurveLocationDetail.createCurveFractionPointDistance(cpB, fB, pointB, d);
             const pair = CurveLocationDetailPair.createCapture(detailA, detailB);
             if (reversed)
                 pair.swapDetails();
@@ -130,27 +131,13 @@ export class CurveCurveCloseApproachXY extends RecurseToCurvesGeometryHandler {
      * @param fractionB0 start of the second curve
      * @param fractionB1 end of the second curve
      * @param reversed whether to reverse the details in the pair (e.g., so that detailB refers to geometryB).
-     * @param intervalDetails optional CurveLocationDetailPair
      */
-    recordPointWithLocalFractions(localFractionA, cpA, fractionA0, fractionA1, localFractionB, cpB, fractionB0, fractionB1, reversed, intervalDetails) {
-        let globalFractionA, globalFractionB;
-        let globalFractionA1, globalFractionB1;
-        const isInterval = intervalDetails !== undefined &&
-            intervalDetails.detailA.hasFraction1 &&
-            intervalDetails.detailB.hasFraction1;
-        if (isInterval) {
-            globalFractionA = Geometry.interpolate(fractionA0, intervalDetails.detailA.fraction, fractionA1);
-            globalFractionB = Geometry.interpolate(fractionB0, intervalDetails.detailB.fraction, fractionB1);
-            globalFractionA1 = Geometry.interpolate(fractionA0, intervalDetails.detailA.fraction1, fractionA1);
-            globalFractionB1 = Geometry.interpolate(fractionB0, intervalDetails.detailB.fraction1, fractionB1);
-        }
-        else {
-            globalFractionA = globalFractionA1 = Geometry.interpolate(fractionA0, localFractionA, fractionA1);
-            globalFractionB = globalFractionB1 = Geometry.interpolate(fractionB0, localFractionB, fractionB1);
-        }
+    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 approach
         const numPrevious = this._results.length;
-        if (numPrevious > 0 && !isInterval) {
+        if (numPrevious > 0) {
             const oldDetailA = this._results[numPrevious - 1].detailA;
             const oldDetailB = this._results[numPrevious - 1].detailB;
             if (reversed) {
@@ -164,25 +151,20 @@ export class CurveCurveCloseApproachXY extends RecurseToCurvesGeometryHandler {
                     return;
             }
         }
-        const detailA = CurveLocationDetail.createCurveFractionPoint(cpA, globalFractionA, cpA.fractionToPoint(globalFractionA));
-        const detailB = CurveLocationDetail.createCurveFractionPoint(cpB, globalFractionB, cpB.fractionToPoint(globalFractionB));
-        if (isInterval) {
-            detailA.captureFraction1Point1(globalFractionA1, cpA.fractionToPoint(globalFractionA1));
-            detailB.captureFraction1Point1(globalFractionB1, cpB.fractionToPoint(globalFractionB1));
-        }
-        else {
-            const d2 = detailA.point.distanceSquaredXY(detailB.point);
-            if (d2 > this._maxDistanceSquared)
-                return;
-            detailA.setIntervalRole(CurveIntervalRole.isolated);
-            detailB.setIntervalRole(CurveIntervalRole.isolated);
-        }
-        if (reversed) {
+        const pointA = cpA.fractionToPoint(globalFractionA);
+        const pointB = cpB.fractionToPoint(globalFractionB);
+        const d2 = pointA.distanceSquaredXY(pointB);
+        if (d2 > this._maxDistanceSquared)
+            return;
+        const d = Math.sqrt(d2);
+        const detailA = CurveLocationDetail.createCurveFractionPointDistance(cpA, globalFractionA, pointA, d);
+        const detailB = CurveLocationDetail.createCurveFractionPointDistance(cpB, globalFractionB, pointB, d);
+        detailA.setIntervalRole(CurveIntervalRole.isolated);
+        detailB.setIntervalRole(CurveIntervalRole.isolated);
+        if (reversed)
             this._results.push(new CurveLocationDetailPair(detailB, detailA));
-        }
-        else {
+        else
             this._results.push(new CurveLocationDetailPair(detailA, detailB));
-        }
     }
     /**
      * Capture a close approach pair that has point and local fraction but not curve.
@@ -219,42 +201,13 @@ export class CurveCurveCloseApproachXY extends RecurseToCurvesGeometryHandler {
         // recompute the points just in case
         CurveLocationDetail.createCurveEvaluatedFraction(cpA, globalFractionA, pair.detailA);
         CurveLocationDetail.createCurveEvaluatedFraction(cpB, globalFractionB, pair.detailB);
+        pair.detailA.a = pair.detailB.a = pair.detailA.point.distanceXY(pair.detailB.point);
         pair.detailA.setIntervalRole(CurveIntervalRole.isolated);
         pair.detailB.setIntervalRole(CurveIntervalRole.isolated);
         if (reversed)
             pair.swapDetails();
         this._results.push(pair);
     }
-    /**
-     * Emit recordPoint for multiple pairs (on full curve) if within maxDistance.
-     * @param cpA first curve primitive (possibly different from curve in detailA, but fraction compatible)
-     * @param cpB second curve primitive (possibly different from curve in detailA, but fraction compatible)
-     * @param pairs array of pairs
-     * @param reversed whether to reverse the details in the pair (e.g., so that detailB refers to geometryB).
-     */
-    recordPairs(cpA, cpB, pairs, reversed) {
-        if (pairs !== undefined) {
-            for (const p of pairs) {
-                this.recordPointWithLocalFractions(p.detailA.fraction, cpA, 0, 1, p.detailB.fraction, cpB, 0, 1, reversed, p);
-            }
-        }
-    }
-    /**
-     * Record fully assembled (but possibly reversed) detail pair.
-     * @param detailA first detail
-     * @param detailB second detail
-     * @param reversed whether to reverse the details in the pair (e.g., so that detailB refers to geometryB).
-     */
-    captureDetailPair(detailA, detailB, reversed) {
-        if (detailA && detailB) {
-            if (reversed) {
-                this._results.push(CurveLocationDetailPair.createCapture(detailB, detailA));
-            }
-            else {
-                this._results.push(CurveLocationDetailPair.createCapture(detailA, detailB));
-            }
-        }
-    }
     static updatePointToSegmentDistance(fractionA, pointA, pointB0, pointB1, fractionB, maxDistanceSquared, closestApproach) {
         let updated = false;
         if (fractionB < 0)
@@ -557,7 +510,8 @@ export class CurveCurveCloseApproachXY extends RecurseToCurvesGeometryHandler {
     dispatchArcArc(cpA, cpB, reversed) {
         const rangeA = cpA.range();
         const rangeB = cpB.range();
-        rangeA.expandInPlace(this._maxDistanceToAccept);
+        if (this._maxDistanceToAccept)
+            rangeA.expandInPlace(this._maxDistanceToAccept);
         if (!rangeB.intersectsRangeXY(rangeA))
             return;
         // 1) endpoints to endpoints or endpoints projection to the other curve
@@ -611,7 +565,8 @@ export class CurveCurveCloseApproachXY extends RecurseToCurvesGeometryHandler {
     computeArcLineString(arcA, lsB, reversed) {
         const rangeA = arcA.range();
         const rangeB = lsB.range();
-        rangeA.expandInPlace(this._maxDistanceToAccept);
+        if (this._maxDistanceToAccept)
+            rangeA.expandInPlace(this._maxDistanceToAccept);
         if (!rangeB.intersectsRangeXY(rangeA))
             return;
         const pointB0 = CurveCurveCloseApproachXY._workPointBB0;
@@ -629,7 +584,6 @@ export class CurveCurveCloseApproachXY extends RecurseToCurvesGeometryHandler {
                 this.dispatchSegmentArc(lsB, pointB0, fB0, pointB1, fB1, arcA, !reversed);
             }
         }
-        return undefined;
     }
     /** Low level dispatch of curve collection. */
     dispatchCurveCollection(geomA, geomAHandler) {
@@ -714,7 +668,8 @@ export class CurveCurveCloseApproachXY extends RecurseToCurvesGeometryHandler {
     computeLineStringLineString(lsA, lsB, reversed) {
         const rangeA = lsA.range();
         const rangeB = lsB.range();
-        rangeA.expandInPlace(this._maxDistanceToAccept);
+        if (this._maxDistanceToAccept)
+            rangeA.expandInPlace(this._maxDistanceToAccept);
         if (!rangeB.intersectsRangeXY(rangeA))
             return;
         let bitB0;
@@ -740,7 +695,8 @@ export class CurveCurveCloseApproachXY extends RecurseToCurvesGeometryHandler {
                 rangeA1.setNull();
                 rangeA1.extendPoint(pointA0);
                 rangeA1.extendPoint(pointA1);
-                rangeA1.expandInPlace(this._maxDistanceToAccept);
+                if (this._maxDistanceToAccept)
+                    rangeA1.expandInPlace(this._maxDistanceToAccept);
                 if (rangeA1.intersectsRangeXY(rangeB)) {
                     lsB.pointAt(0, pointB0);
                     bitB0 = this.classifyBitsPointRangeXY(pointB0.x, pointB0.y, rangeA1);