@itwin/ecschema-rpcinterface-tests 5.9.0-dev.15 → 5.9.0-dev.16

package/lib/dist/bundled-tests.js

@@ -29047,7 +29047,7 @@ class DbQueryError extends _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.Bent
         this.request = request;
     }
     static throwIfError(response, request) {
-        if (response.status >= DbResponseStatus.Error) {
+        if (response.status >= (DbResponseStatus.Error)) {
             throw new DbQueryError(response, request);
         }
         if (response.status === DbResponseStatus.Cancel) {
@@ -34959,12 +34959,11 @@ var HiddenLine;
          */
         width;
         constructor(json, hidden) {
-            if (_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.JsonUtils.isEmptyObjectOrUndefined(json)) {
+            if (!json || _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.JsonUtils.isEmptyObjectOrUndefined(json)) {
                 if (hidden)
                     this.pattern = _LinePixels__WEBPACK_IMPORTED_MODULE_2__.LinePixels.HiddenLine;
                 return;
             }
-            json = json; // per JsonUtils.isEmptyObjectOrUndefined()
             if (undefined !== json.color && false !== json.ovrColor)
                 this.color = _ColorDef__WEBPACK_IMPORTED_MODULE_1__.ColorDef.fromJSON(json.color);
             if (undefined !== json.pattern) {
@@ -65681,7 +65680,7 @@ var XmlSerializationUtils;
     async function writePrimitiveProperty(propertyClass, propertyValue, propertyElement) {
         let primitiveType;
         if (propertyClass.isEnumeration()) {
-            const enumeration = await propertyClass.enumeration;
+            const enumeration = await (propertyClass).enumeration;
             if (!enumeration)
                 throw new _Exception__WEBPACK_IMPORTED_MODULE_1__.ECSchemaError(_Exception__WEBPACK_IMPORTED_MODULE_1__.ECSchemaStatus.ClassNotFound, `The enumeration on property class '${propertyClass.fullName}' could not be found in the current schema context.`);
             if (enumeration.type === undefined)
@@ -68135,7 +68134,7 @@ class IncrementalSchemaLocater {
      * @returns The SchemaProps object.
      */
     async createSchemaProps(schemaKey, schemaContext) {
-        const schemaInfo = await schemaContext.getSchemaInfo(schemaKey, _ECObjects__WEBPACK_IMPORTED_MODULE_2__.SchemaMatchType.Latest);
+        const schemaInfo = await schemaContext.getSchemaInfo(schemaKey, _ECObjects__WEBPACK_IMPORTED_MODULE_2__.SchemaMatchType.Latest); // eslint-disable-line @typescript-eslint/no-unnecessary-type-assertion
         if (!schemaInfo)
             throw new Error(`Schema ${schemaKey.name} could not be found.`);
         const schemaReferences = [];
@@ -92993,41 +92992,77 @@ var PerModelCategoryVisibility;
     }
     PerModelCategoryVisibility.createOverrides = createOverrides;
 })(PerModelCategoryVisibility || (PerModelCategoryVisibility = {}));
-class PerModelCategoryVisibilityOverride {
-    modelId;
-    categoryId;
-    visible;
-    constructor(modelId, categoryId, visible) {
-        this.modelId = modelId;
-        this.categoryId = categoryId;
-        this.visible = visible;
-    }
-    reset(modelId, categoryId, visible) {
-        this.modelId = modelId;
-        this.categoryId = categoryId;
-        this.visible = visible;
-    }
-}
-function compareCategoryOverrides(lhs, rhs) {
-    const cmp = (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.compareStrings)(lhs.modelId, rhs.modelId);
-    return 0 === cmp ? (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.compareStrings)(lhs.categoryId, rhs.categoryId) : cmp;
-}
 /** The Viewport-specific implementation of PerModelCategoryVisibility.Overrides. */
-class PerModelCategoryVisibilityOverrides extends _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.SortedArray {
-    _scratch = new PerModelCategoryVisibilityOverride("0", "0", false);
+class PerModelCategoryVisibilityOverrides {
+    _map = new Map();
+    /** Flat set of all override entries, providing O(1) iteration via [Symbol.iterator]. Kept in sync with `_map`. */
+    _set = new Set();
     _vp;
     constructor(vp) {
-        super(compareCategoryOverrides);
         this._vp = vp;
     }
+    [Symbol.iterator]() {
+        return this._set[Symbol.iterator]();
+    }
     getOverride(modelId, categoryId) {
-        this._scratch.reset(modelId, categoryId, false);
-        const ovr = this.findEqual(this._scratch);
+        const ovr = this._map.get(modelId)?.get(categoryId);
         if (undefined !== ovr)
             return ovr.visible ? PerModelCategoryVisibility.Override.Show : PerModelCategoryVisibility.Override.Hide;
         else
             return PerModelCategoryVisibility.Override.None;
     }
+    getModelEntry({ modelId, override }) {
+        let modelEntry = this._map.get(modelId);
+        if (modelEntry) {
+            return modelEntry;
+        }
+        if (override === PerModelCategoryVisibility.Override.None) {
+            return undefined;
+        }
+        modelEntry = new Map();
+        this._map.set(modelId, modelEntry);
+        return modelEntry;
+    }
+    addOrRemoveOverrideEntry({ modelEntry, categoryId, modelId, override }) {
+        const overrideEntry = modelEntry.get(categoryId);
+        if (override === PerModelCategoryVisibility.Override.None) {
+            if (overrideEntry === undefined) {
+                return false;
+            }
+            this._set.delete(overrideEntry);
+            modelEntry.delete(categoryId);
+            return true;
+        }
+        const visible = override === PerModelCategoryVisibility.Override.Show;
+        if (overrideEntry === undefined) {
+            const ovr = { modelId, categoryId, visible };
+            modelEntry.set(categoryId, ovr);
+            this._set.add(ovr);
+            return true;
+        }
+        if (overrideEntry.visible !== visible) {
+            overrideEntry.visible = visible;
+            return true;
+        }
+        return false;
+    }
+    applyOverride(modelId, categoryIds, override, catIdsToLoad) {
+        const modelEntry = this.getModelEntry({ modelId, override });
+        let changed = false;
+        if (!modelEntry)
+            return changed;
+        for (const categoryId of categoryIds) {
+            if (this.addOrRemoveOverrideEntry({ modelEntry, categoryId, modelId, override })) {
+                changed = true;
+                if (catIdsToLoad && override !== PerModelCategoryVisibility.Override.None)
+                    catIdsToLoad.push(categoryId);
+            }
+        }
+        if (modelEntry.size === 0) {
+            this._map.delete(modelId);
+        }
+        return changed;
+    }
     /**
      * set the overrides for multiple perModelCategoryVisibility props, loading categoryIds from the iModel if necessary.
      * @see [[PerModelCategoryVisibility]]
@@ -93042,19 +93077,11 @@ class PerModelCategoryVisibilityOverrides extends _itwin_core_bentley__WEBPACK_I
         const catIdsToLoad = [];
         const iModelToUse = iModel ? iModel : this._vp.iModel;
         for (const override of perModelCategoryVisibility) {
-            const modelId = override.modelId;
             // The caller may pass a single categoryId as a string, if we don't convert this to an array we will iterate
             // over each individual character of that string, which is not the desired behavior.
             const categoryIds = typeof override.categoryIds === "string" ? [override.categoryIds] : override.categoryIds;
-            const visOverride = override.visOverride;
-            for (const categoryId of categoryIds) {
-                if (this.findAndUpdateOverrideInArray(modelId, categoryId, visOverride)) {
-                    anyChanged = true;
-                    if (PerModelCategoryVisibility.Override.None !== visOverride) {
-                        catIdsToLoad.push(categoryId);
-                    }
-                }
-            }
+            if (this.applyOverride(override.modelId, categoryIds, override.visOverride, catIdsToLoad))
+                anyChanged = true;
         }
         if (anyChanged) {
             this._vp.setViewedCategoriesPerModelChanged();
@@ -93062,44 +93089,17 @@ class PerModelCategoryVisibilityOverrides extends _itwin_core_bentley__WEBPACK_I
                 this._vp.subcategories.push(iModelToUse.subcategories, catIdsToLoad, () => this._vp.setViewedCategoriesPerModelChanged());
             }
         }
-        return;
-    }
-    /** Find and update the override in the array of overrides. If override not found, adds it to the array.
-     *  If the array was changed, returns true. */
-    findAndUpdateOverrideInArray(modelId, categoryId, override) {
-        const ovr = this._scratch;
-        ovr.reset(modelId, categoryId, false);
-        let changed = false;
-        const index = this.indexOf(ovr);
-        if (-1 === index) {
-            if (PerModelCategoryVisibility.Override.None !== override) {
-                this.insert(new PerModelCategoryVisibilityOverride(modelId, categoryId, PerModelCategoryVisibility.Override.Show === override));
-                changed = true;
-            }
-        }
-        else {
-            if (PerModelCategoryVisibility.Override.None === override) {
-                this._array.splice(index, 1);
-                changed = true;
-            }
-            else if (this._array[index].visible !== (PerModelCategoryVisibility.Override.Show === override)) {
-                this._array[index].visible = (PerModelCategoryVisibility.Override.Show === override);
-                changed = true;
-            }
-        }
-        return changed;
     }
     setOverride(modelIds, categoryIds, override) {
+        const categoryIdIterable = _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.Id64.iterable(categoryIds);
         let changed = false;
         for (const modelId of _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.Id64.iterable(modelIds)) {
-            for (const categoryId of _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.Id64.iterable(categoryIds)) {
-                if (this.findAndUpdateOverrideInArray(modelId, categoryId, override))
-                    changed = true;
-            }
+            if (this.applyOverride(modelId, categoryIdIterable, override))
+                changed = true;
         }
         if (changed) {
             this._vp.setViewedCategoriesPerModelChanged();
-            if (PerModelCategoryVisibility.Override.None !== override) {
+            if (override !== PerModelCategoryVisibility.Override.None) {
                 // Ensure subcategories loaded.
                 this._vp.subcategories.push(this._vp.iModel.subcategories, categoryIds, () => this._vp.setViewedCategoriesPerModelChanged());
             }
@@ -93107,30 +93107,32 @@ class PerModelCategoryVisibilityOverrides extends _itwin_core_bentley__WEBPACK_I
     }
     clearOverrides(modelIds) {
         if (undefined === modelIds) {
-            if (0 < this.length) {
-                this.clear();
+            if (this._map.size > 0) {
+                this._map.clear();
+                this._set.clear();
                 this._vp.setViewedCategoriesPerModelChanged();
             }
             return;
         }
-        for (let i = 0; i < this.length;) {
-            const ovr = this._array[i];
-            let removed = false;
-            for (const modelId of _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.Id64.iterable(modelIds)) {
-                if (modelId === ovr.modelId) {
-                    this._array.splice(i, 1);
-                    this._vp.setViewedCategoriesPerModelChanged();
-                    removed = true;
-                    break;
-                }
+        let changed = false;
+        for (const modelId of _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.Id64.iterable(modelIds)) {
+            const modelEntry = this._map.get(modelId);
+            if (!modelEntry) {
+                continue;
             }
-            if (!removed)
-                ++i;
+            changed = true;
+            for (const overrideEntry of modelEntry.values()) {
+                this._set.delete(overrideEntry);
+            }
+            this._map.delete(modelId);
+        }
+        if (changed) {
+            this._vp.setViewedCategoriesPerModelChanged();
         }
     }
     addOverrides(fs, ovrs) {
         const cache = this._vp.iModel.subcategories;
-        for (const ovr of this._array) {
+        for (const ovr of this._set) {
             const subcats = cache.getSubCategories(ovr.categoryId);
             if (undefined === subcats)
                 continue;
@@ -93140,7 +93142,6 @@ class PerModelCategoryVisibilityOverrides extends _itwin_core_bentley__WEBPACK_I
             /* if (!this._vp.view.viewsModel(ovr.modelId))
               continue; */
             // ###TODO: Avoid recomputing upper and lower portions of modelId if modelId repeated.
-            // (Array is sorted first by modelId).
             // Also avoid computing if no effective overrides.
             const modelLo = _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.Id64.getLowerUint32(ovr.modelId);
             const modelHi = _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.Id64.getUpperUint32(ovr.modelId);
@@ -211734,7 +211735,9 @@ class Loop extends _CurveCollection__WEBPACK_IMPORTED_MODULE_0__.CurveChain {
     }
     /** Create a new `Loop` with no children */
     cloneEmptyPeer() {
-        return new Loop();
+        const emptyClone = new Loop();
+        emptyClone.isInner = this.isInner;
+        return emptyClone;
     }
     /** Second step of double dispatch:  call `handler.handleLoop(this)` */
     dispatchToGeometryHandler(handler) {
@@ -217569,25 +217572,25 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   CurveCurveCloseApproachXY: () => (/* binding */ CurveCurveCloseApproachXY)
 /* harmony export */ });
 /* harmony import */ var _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @itwin/core-bentley */ "../../core/bentley/lib/esm/core-bentley.js");
-/* harmony import */ var _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../../bspline/BSplineCurve */ "../../core/geometry/lib/esm/bspline/BSplineCurve.js");
+/* harmony import */ var _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../../bspline/BSplineCurve */ "../../core/geometry/lib/esm/bspline/BSplineCurve.js");
 /* harmony import */ var _Geometry__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../Geometry */ "../../core/geometry/lib/esm/Geometry.js");
 /* harmony import */ var _geometry3d_GeometryHandler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../geometry3d/GeometryHandler */ "../../core/geometry/lib/esm/geometry3d/GeometryHandler.js");
 /* harmony import */ var _geometry3d_GrowableFloat64Array__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../geometry3d/GrowableFloat64Array */ "../../core/geometry/lib/esm/geometry3d/GrowableFloat64Array.js");
 /* harmony import */ var _geometry3d_Point3dVector3d__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../geometry3d/Point3dVector3d */ "../../core/geometry/lib/esm/geometry3d/Point3dVector3d.js");
-/* harmony import */ var _geometry3d_Range__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../../geometry3d/Range */ "../../core/geometry/lib/esm/geometry3d/Range.js");
+/* harmony import */ var _geometry3d_Range__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../../geometry3d/Range */ "../../core/geometry/lib/esm/geometry3d/Range.js");
 /* harmony import */ var _numerics_Newton__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../../numerics/Newton */ "../../core/geometry/lib/esm/numerics/Newton.js");
 /* harmony import */ var _numerics_Polynomials__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../numerics/Polynomials */ "../../core/geometry/lib/esm/numerics/Polynomials.js");
 /* harmony import */ var _numerics_SmallSystem__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../numerics/SmallSystem */ "../../core/geometry/lib/esm/numerics/SmallSystem.js");
 /* harmony import */ var _Arc3d__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../Arc3d */ "../../core/geometry/lib/esm/curve/Arc3d.js");
-/* harmony import */ var _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../CurveChainWithDistanceIndex */ "../../core/geometry/lib/esm/curve/CurveChainWithDistanceIndex.js");
-/* harmony import */ var _CurveCollection__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../CurveCollection */ "../../core/geometry/lib/esm/curve/CurveCollection.js");
-/* harmony import */ var _CurveCurve__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../CurveCurve */ "../../core/geometry/lib/esm/curve/CurveCurve.js");
+/* harmony import */ var _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../CurveChainWithDistanceIndex */ "../../core/geometry/lib/esm/curve/CurveChainWithDistanceIndex.js");
+/* harmony import */ var _CurveCollection__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../CurveCollection */ "../../core/geometry/lib/esm/curve/CurveCollection.js");
+/* harmony import */ var _CurveCurve__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../CurveCurve */ "../../core/geometry/lib/esm/curve/CurveCurve.js");
 /* harmony import */ var _CurveLocationDetail__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../CurveLocationDetail */ "../../core/geometry/lib/esm/curve/CurveLocationDetail.js");
 /* harmony import */ var _CurvePrimitive__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../CurvePrimitive */ "../../core/geometry/lib/esm/curve/CurvePrimitive.js");
-/* harmony import */ var _LineSegment3d__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../LineSegment3d */ "../../core/geometry/lib/esm/curve/LineSegment3d.js");
-/* harmony import */ var _LineString3d__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../LineString3d */ "../../core/geometry/lib/esm/curve/LineString3d.js");
+/* harmony import */ var _LineSegment3d__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../LineSegment3d */ "../../core/geometry/lib/esm/curve/LineSegment3d.js");
+/* harmony import */ var _LineString3d__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../LineString3d */ "../../core/geometry/lib/esm/curve/LineString3d.js");
 /* harmony import */ var _ProxyCurve__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../ProxyCurve */ "../../core/geometry/lib/esm/curve/ProxyCurve.js");
-/* harmony import */ var _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../spiral/TransitionSpiral3d */ "../../core/geometry/lib/esm/curve/spiral/TransitionSpiral3d.js");
+/* harmony import */ var _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../spiral/TransitionSpiral3d */ "../../core/geometry/lib/esm/curve/spiral/TransitionSpiral3d.js");
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
@@ -218021,32 +218024,6 @@ class CurveCurveCloseApproachXY extends _geometry3d_GeometryHandler__WEBPACK_IMP
         // 2) perpendicular line between 2 arcs (includes intersections)
         this.allPerpendicularsArcArcBounded(cpA, cpB, reversed);
     }
-    /** Low level dispatch of arc with (beziers of) a bspline curve */
-    dispatchArcBsplineCurve3d(cpA, cpB, reversed) {
-        const ls = _LineString3d__WEBPACK_IMPORTED_MODULE_11__.LineString3d.create();
-        cpB.emitStrokes(ls);
-        this.computeArcLineString(cpA, ls, reversed);
-    }
-    /** Low level dispatch of (beziers of) a bspline curve with (beziers of) a bspline curve */
-    dispatchBSplineCurve3dBSplineCurve3d(bcurveA, bcurveB, reversed) {
-        const lsA = _LineString3d__WEBPACK_IMPORTED_MODULE_11__.LineString3d.create();
-        bcurveA.emitStrokes(lsA);
-        const lsB = _LineString3d__WEBPACK_IMPORTED_MODULE_11__.LineString3d.create();
-        bcurveB.emitStrokes(lsB);
-        this.computeLineStringLineString(lsA, lsB, reversed);
-    }
-    /** Low level dispatch of linestring with (beziers of) a bspline curve */
-    dispatchLineStringBSplineCurve(lsA, curveB, reversed) {
-        const lsB = _LineString3d__WEBPACK_IMPORTED_MODULE_11__.LineString3d.create();
-        curveB.emitStrokes(lsB);
-        this.computeLineStringLineString(lsA, lsB, reversed);
-    }
-    /** Low level dispatch of segment with (beziers of) a bspline curve */
-    dispatchSegmentBsplineCurve(segA, curveB, reversed) {
-        const lsB = _LineString3d__WEBPACK_IMPORTED_MODULE_11__.LineString3d.create();
-        curveB.emitStrokes(lsB);
-        this.computeSegmentLineString(segA, lsB, reversed);
-    }
     /** Detail computation for segment approaching linestring. */
     computeSegmentLineString(segA, lsB, reversed) {
         const numB = lsB.numPoints();
@@ -218074,7 +218051,7 @@ class CurveCurveCloseApproachXY extends _geometry3d_GeometryHandler__WEBPACK_IMP
         const v0 = CurveCurveCloseApproachXY._workPointBB0;
         const v1 = CurveCurveCloseApproachXY._workPointBB1;
         // 1. record intersections
-        const intersections = _CurveCurve__WEBPACK_IMPORTED_MODULE_12__.CurveCurve.intersectionXYPairs(arcA, false, lsB, false, this._xyTolerance);
+        const intersections = _CurveCurve__WEBPACK_IMPORTED_MODULE_11__.CurveCurve.intersectionXYPairs(arcA, false, lsB, false, this._xyTolerance);
         for (const intersection of intersections)
             this.testAndRecordPair(intersection, reversed);
         // 2. record linestring interior vertex projections onto arc
@@ -218132,7 +218109,7 @@ class CurveCurveCloseApproachXY extends _geometry3d_GeometryHandler__WEBPACK_IMP
             return;
         let bitB0;
         let bitB1;
-        const rangeA1 = _geometry3d_Range__WEBPACK_IMPORTED_MODULE_13__.Range3d.createNull();
+        const rangeA1 = _geometry3d_Range__WEBPACK_IMPORTED_MODULE_12__.Range3d.createNull();
         const pointA0 = CurveCurveCloseApproachXY._workPointAA0;
         const pointA1 = CurveCurveCloseApproachXY._workPointAA1;
         const pointB0 = CurveCurveCloseApproachXY._workPointBB0;
@@ -218174,7 +218151,7 @@ class CurveCurveCloseApproachXY extends _geometry3d_GeometryHandler__WEBPACK_IMP
     /** Low level dispatch of curve collection. */
     dispatchCurveCollection(geomA, geomAHandler) {
         const geomB = this._geometryB; // save
-        if (!geomB || !geomB.children || !(geomB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_14__.CurveCollection))
+        if (!geomB || !geomB.children || !(geomB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_13__.CurveCollection))
             return;
         for (const child of geomB.children) {
             this.resetGeometry(child);
@@ -218184,9 +218161,9 @@ class CurveCurveCloseApproachXY extends _geometry3d_GeometryHandler__WEBPACK_IMP
     }
     /** Low level dispatch to geomA given a CurveChainWithDistanceIndex in geometryB. */
     dispatchCurveChainWithDistanceIndex(geomA, geomAHandler) {
-        if (!this._geometryB || !(this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_15__.CurveChainWithDistanceIndex))
+        if (!this._geometryB || !(this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_14__.CurveChainWithDistanceIndex))
             return;
-        if (geomA instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_15__.CurveChainWithDistanceIndex)
+        if (geomA instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_14__.CurveChainWithDistanceIndex)
             (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(false, "call handleCurveChainWithDistanceIndex(geomA) instead");
         const saveResults = this.grabPairedResults();
         const geomB = this._geometryB;
@@ -218197,133 +218174,36 @@ class CurveCurveCloseApproachXY extends _geometry3d_GeometryHandler__WEBPACK_IMP
         this.resetGeometry(geomB);
         const childResults = this._results.extractArray();
         childResults.forEach((pair) => {
-            _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_15__.CurveChainWithDistanceIndex.convertChildDetailToChainDetailSingle(pair, undefined, geomB);
+            _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_14__.CurveChainWithDistanceIndex.convertChildDetailToChainDetailSingle(pair, undefined, geomB);
             this._results.insert(pair);
         });
         saveResults.forEach((pair) => this._results.insert(pair));
     }
-    /** Double dispatch handler for strongly typed segment. */
-    handleLineSegment3d(segmentA) {
-        if (this._geometryB instanceof _LineSegment3d__WEBPACK_IMPORTED_MODULE_16__.LineSegment3d) {
-            const segmentB = this._geometryB;
-            this.computeSegmentSegment(segmentA, segmentA.point0Ref, 0.0, segmentA.point1Ref, 1.0, segmentB, segmentB.point0Ref, 0.0, segmentB.point1Ref, 1.0, false);
-        }
-        else if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_11__.LineString3d) {
-            this.computeSegmentLineString(segmentA, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof _Arc3d__WEBPACK_IMPORTED_MODULE_6__.Arc3d) {
-            this.computeSegmentArc(segmentA, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_17__.BSplineCurve3d) {
-            this.dispatchSegmentBsplineCurve(segmentA, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_18__.TransitionSpiral3d) {
-            this.dispatchCurveSpiral(segmentA, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_14__.CurveCollection) {
-            this.dispatchCurveCollection(segmentA, this.handleLineSegment3d.bind(this));
-        }
-        else if (this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_15__.CurveChainWithDistanceIndex) {
-            this.dispatchCurveChainWithDistanceIndex(segmentA, this.handleLineSegment3d.bind(this));
-        }
-        return undefined;
-    }
-    /** Double dispatch handler for strongly typed linestring. */
-    handleLineString3d(lsA) {
-        if (this._geometryB instanceof _LineSegment3d__WEBPACK_IMPORTED_MODULE_16__.LineSegment3d) {
-            this.computeSegmentLineString(this._geometryB, lsA, true);
-        }
-        else if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_11__.LineString3d) {
-            this.computeLineStringLineString(lsA, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof _Arc3d__WEBPACK_IMPORTED_MODULE_6__.Arc3d) {
-            this.computeArcLineString(this._geometryB, lsA, true);
-        }
-        else if (this._geometryB instanceof _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_17__.BSplineCurve3d) {
-            this.dispatchLineStringBSplineCurve(lsA, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_18__.TransitionSpiral3d) {
-            this.dispatchCurveSpiral(lsA, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_14__.CurveCollection) {
-            this.dispatchCurveCollection(lsA, this.handleLineString3d.bind(this));
-        }
-        else if (this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_15__.CurveChainWithDistanceIndex) {
-            this.dispatchCurveChainWithDistanceIndex(lsA, this.handleLineString3d.bind(this));
-        }
-        return undefined;
-    }
-    /** Double dispatch handler for strongly typed arc. */
-    handleArc3d(arcA) {
-        if (this._geometryB instanceof _LineSegment3d__WEBPACK_IMPORTED_MODULE_16__.LineSegment3d) {
-            this.computeSegmentArc(this._geometryB, arcA, true);
-        }
-        else if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_11__.LineString3d) {
-            this.computeArcLineString(arcA, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof _Arc3d__WEBPACK_IMPORTED_MODULE_6__.Arc3d) {
-            this.dispatchArcArc(arcA, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_17__.BSplineCurve3d) {
-            this.dispatchArcBsplineCurve3d(arcA, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_18__.TransitionSpiral3d) {
-            this.dispatchCurveSpiral(arcA, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_14__.CurveCollection) {
-            this.dispatchCurveCollection(arcA, this.handleArc3d.bind(this));
-        }
-        else if (this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_15__.CurveChainWithDistanceIndex) {
-            this.dispatchCurveChainWithDistanceIndex(arcA, this.handleArc3d.bind(this));
-        }
-        return undefined;
-    }
-    /** Double dispatch handler for strongly typed bspline curve. */
-    handleBSplineCurve3d(curveA) {
-        if (this._geometryB instanceof _LineSegment3d__WEBPACK_IMPORTED_MODULE_16__.LineSegment3d) {
-            this.dispatchSegmentBsplineCurve(this._geometryB, curveA, true);
-        }
-        else if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_11__.LineString3d) {
-            this.dispatchLineStringBSplineCurve(this._geometryB, curveA, true);
-        }
-        else if (this._geometryB instanceof _Arc3d__WEBPACK_IMPORTED_MODULE_6__.Arc3d) {
-            this.dispatchArcBsplineCurve3d(this._geometryB, curveA, true);
-        }
-        else if (this._geometryB instanceof _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_17__.BSplineCurve3dBase) {
-            this.dispatchBSplineCurve3dBSplineCurve3d(curveA, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_18__.TransitionSpiral3d) {
-            this.dispatchCurveSpiral(curveA, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_14__.CurveCollection) {
-            this.dispatchCurveCollection(curveA, this.handleBSplineCurve3d.bind(this));
-        }
-        else if (this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_15__.CurveChainWithDistanceIndex) {
-            this.dispatchCurveChainWithDistanceIndex(curveA, this.handleBSplineCurve3d.bind(this));
-        }
-        return undefined;
+    /** Specifies whether the curve needs to be stroked for close approach computation. */
+    needsStroking(curve) {
+        return curve instanceof _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_15__.BSplineCurve3dBase || curve instanceof _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_16__.TransitionSpiral3d;
     }
     /**
-     * Process seeds for xy close approach between the curve and spiral.
+     * Process seeds for xy close approach between one curve and another curve to be stroked.
      * * Refine each result via Newton iteration. If it doesn't converge, remove it.
-     * @param seeds The initial seed results to refine.
-     * @param curveA The other curve primitive. May also be a transition spiral.
-     * @param spiralB The transition spiral.
-     * @param reversed whether `spiralB` data is in `detailA` of each recorded pair, and `curveA` data in `detailB`.
+     * @param seeds the initial seed results to refine.
+     * @param curveA curve to find its XY close approach with curveB.
+     * @param curveB the other curve to be stroked.
+     * @param reversed whether `curveB` data is in `detailA` of each recorded pair, and `curveA` data in `detailB`.
      */
-    refineSpiralResultsByNewton(seeds, curveA, spiralB, reversed = false) {
-        const xyMatchingFunction = new _numerics_Newton__WEBPACK_IMPORTED_MODULE_10__.CurveCurveCloseApproachXYRRtoRRD(curveA, spiralB);
+    refineStrokedResultsByNewton(seeds, curveA, curveB, reversed = false) {
+        const xyMatchingFunction = new _numerics_Newton__WEBPACK_IMPORTED_MODULE_10__.CurveCurveCloseApproachXYRRtoRRD(curveA, curveB);
         const newtonSearcher = new _numerics_Newton__WEBPACK_IMPORTED_MODULE_10__.Newton2dUnboundedWithDerivative(xyMatchingFunction, 50, this._newtonTolerance); // seen: 47
         for (const seed of seeds) {
             const detailA = reversed ? seed.detailB : seed.detailA;
             const detailB = reversed ? seed.detailA : seed.detailB;
-            (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(detailB.curve instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_11__.LineString3d, "Caller has discretized the spiral");
-            newtonSearcher.setUV(detailA.fraction, detailB.fraction); // use linestring fraction as spiral param; it generally yields a closer point than fractional length!
+            (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(detailB.curve instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_17__.LineString3d, "Caller has discretized the curve");
+            newtonSearcher.setUV(detailA.fraction, detailB.fraction); // use the linestring fraction as initial curveB fraction (ASSUME it's close enough)
             if (newtonSearcher.runIterations()) {
                 const fractionA = newtonSearcher.getU();
                 const fractionB = newtonSearcher.getV();
                 if (this.acceptFraction(fractionA) && this.acceptFraction(fractionB))
-                    this.testAndRecordPointPair(curveA, fractionA, undefined, spiralB, fractionB, undefined, reversed);
+                    this.testAndRecordPointPair(curveA, fractionA, undefined, curveB, fractionB, undefined, reversed);
             } // ignore failure to converge
         }
     }
@@ -218335,7 +218215,7 @@ class CurveCurveCloseApproachXY extends _geometry3d_GeometryHandler__WEBPACK_IMP
      * @param result object to receive appended stroke points; if omitted, a new object is created, populated, and returned.
      */
     strokeCurve(curve, options, result) {
-        const ls = result ? result : _LineString3d__WEBPACK_IMPORTED_MODULE_11__.LineString3d.create();
+        const ls = result ? result : _LineString3d__WEBPACK_IMPORTED_MODULE_17__.LineString3d.create();
         curve.emitStrokes(ls, options);
         return ls;
     }
@@ -218359,40 +218239,120 @@ class CurveCurveCloseApproachXY extends _geometry3d_GeometryHandler__WEBPACK_IMP
         return discreteResults;
     }
     /**
-     * Compute the XY close approach of a curve and a spiral.
-     * @param curveA curve to find its close approach with spiralB. May also be a transition spiral.
-     * @param spiralB transition spiral to find its close approach with curveA.
-     * @param reversed whether `spiralB` data will be recorded in `detailA` of each result, and `curveA` data in `detailB`.
+     * Compute the XY close approach of a curve and another curve to be stroked.
+     * @param curveA curve to find its XY close approach with curveB.
+     * @param curveB the other curve to be stroked.
+     * @param reversed whether `curveB` data will be recorded in `detailA` of each result, and `curveA` data in `detailB`.
      */
-    dispatchCurveSpiral(curveA, spiralB, reversed) {
+    dispatchCurveStrokedCurve(curveA, curveB, reversed) {
         // explicit search for intersections (Newton converges too slowly on DirectSpiral3d tangent intersections)
-        const intersections = _CurveCurve__WEBPACK_IMPORTED_MODULE_12__.CurveCurve.intersectionXYPairs(curveA, false, spiralB, false, this._xyTolerance);
+        const intersections = _CurveCurve__WEBPACK_IMPORTED_MODULE_11__.CurveCurve.intersectionXYPairs(curveA, false, curveB, false, this._xyTolerance);
         for (const intersection of intersections)
             this.testAndRecordPair(intersection, reversed);
         // append seeds computed by solving the discretized spiral close approach problem, then refine the seeds via Newton
         let cpA = curveA;
-        if (curveA instanceof _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_18__.TransitionSpiral3d)
+        if (this.needsStroking(curveA))
             cpA = this.strokeCurve(curveA);
-        const cpB = this.strokeCurve(spiralB);
+        const cpB = this.strokeCurve(curveB);
         const seeds = this.computeDiscreteCloseApproachResults(cpA, cpB, reversed);
-        this.refineSpiralResultsByNewton(seeds, curveA, spiralB, reversed);
-        if (curveA instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_11__.LineString3d) { // explicitly test corners (where Newton converges too slowly)
+        this.refineStrokedResultsByNewton(seeds, curveA, curveB, reversed);
+        if (curveA instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_17__.LineString3d) { // explicitly test corners (where Newton converges too slowly)
             const fStep = _Geometry__WEBPACK_IMPORTED_MODULE_3__.Geometry.safeDivideFraction(1.0, curveA.numEdges(), 0);
             const v0 = CurveCurveCloseApproachXY._workPointBB0;
             for (let i = 1; i < curveA.numEdges(); ++i)
-                this.testAndRecordProjection(curveA, i * fStep, curveA.pointAtUnchecked(i, v0), spiralB, reversed);
+                this.testAndRecordProjection(curveA, i * fStep, curveA.pointAtUnchecked(i, v0), curveB, reversed);
+        }
+        this.testAndRecordEndPointApproaches(curveA, curveB, reversed);
+    }
+    /** Double dispatch handler for strongly typed segment. */
+    handleLineSegment3d(segmentA) {
+        if (this._geometryB instanceof _LineSegment3d__WEBPACK_IMPORTED_MODULE_18__.LineSegment3d) {
+            const segmentB = this._geometryB;
+            this.computeSegmentSegment(segmentA, segmentA.point0Ref, 0.0, segmentA.point1Ref, 1.0, segmentB, segmentB.point0Ref, 0.0, segmentB.point1Ref, 1.0, false);
+        }
+        else if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_17__.LineString3d) {
+            this.computeSegmentLineString(segmentA, this._geometryB, false);
+        }
+        else if (this._geometryB instanceof _Arc3d__WEBPACK_IMPORTED_MODULE_6__.Arc3d) {
+            this.computeSegmentArc(segmentA, this._geometryB, false);
+        }
+        else if (this.needsStroking(this._geometryB)) {
+            this.dispatchCurveStrokedCurve(segmentA, this._geometryB, false);
+        }
+        else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_13__.CurveCollection) {
+            this.dispatchCurveCollection(segmentA, this.handleLineSegment3d.bind(this));
+        }
+        else if (this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_14__.CurveChainWithDistanceIndex) {
+            this.dispatchCurveChainWithDistanceIndex(segmentA, this.handleLineSegment3d.bind(this));
+        }
+        return undefined;
+    }
+    /** Double dispatch handler for strongly typed linestring. */
+    handleLineString3d(lsA) {
+        if (this._geometryB instanceof _LineSegment3d__WEBPACK_IMPORTED_MODULE_18__.LineSegment3d) {
+            this.computeSegmentLineString(this._geometryB, lsA, true);
+        }
+        else if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_17__.LineString3d) {
+            this.computeLineStringLineString(lsA, this._geometryB, false);
         }
-        this.testAndRecordEndPointApproaches(curveA, spiralB, reversed);
+        else if (this._geometryB instanceof _Arc3d__WEBPACK_IMPORTED_MODULE_6__.Arc3d) {
+            this.computeArcLineString(this._geometryB, lsA, true);
+        }
+        else if (this.needsStroking(this._geometryB)) {
+            this.dispatchCurveStrokedCurve(lsA, this._geometryB, false);
+        }
+        else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_13__.CurveCollection) {
+            this.dispatchCurveCollection(lsA, this.handleLineString3d.bind(this));
+        }
+        else if (this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_14__.CurveChainWithDistanceIndex) {
+            this.dispatchCurveChainWithDistanceIndex(lsA, this.handleLineString3d.bind(this));
+        }
+        return undefined;
+    }
+    /** Double dispatch handler for strongly typed arc. */
+    handleArc3d(arcA) {
+        if (this._geometryB instanceof _LineSegment3d__WEBPACK_IMPORTED_MODULE_18__.LineSegment3d) {
+            this.computeSegmentArc(this._geometryB, arcA, true);
+        }
+        else if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_17__.LineString3d) {
+            this.computeArcLineString(arcA, this._geometryB, false);
+        }
+        else if (this._geometryB instanceof _Arc3d__WEBPACK_IMPORTED_MODULE_6__.Arc3d) {
+            this.dispatchArcArc(arcA, this._geometryB, false);
+        }
+        else if (this.needsStroking(this._geometryB)) {
+            this.dispatchCurveStrokedCurve(arcA, this._geometryB, false);
+        }
+        else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_13__.CurveCollection) {
+            this.dispatchCurveCollection(arcA, this.handleArc3d.bind(this));
+        }
+        else if (this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_14__.CurveChainWithDistanceIndex) {
+            this.dispatchCurveChainWithDistanceIndex(arcA, this.handleArc3d.bind(this));
+        }
+        return undefined;
+    }
+    /** Double dispatch handler for strongly typed bspline curve. */
+    handleBSplineCurve3d(curveA) {
+        if (this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_14__.CurveChainWithDistanceIndex) {
+            this.dispatchCurveChainWithDistanceIndex(curveA, this.handleBSplineCurve3d.bind(this));
+        }
+        else if (this._geometryB instanceof _CurvePrimitive__WEBPACK_IMPORTED_MODULE_19__.CurvePrimitive) {
+            this.dispatchCurveStrokedCurve(this._geometryB, curveA, true);
+        }
+        else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_13__.CurveCollection) {
+            this.dispatchCurveCollection(curveA, this.handleBSplineCurve3d.bind(this));
+        }
+        return undefined;
     }
     /** Double dispatch handler for strongly typed spiral curve. */
     handleTransitionSpiral(spiral) {
-        if (this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_15__.CurveChainWithDistanceIndex) {
+        if (this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_14__.CurveChainWithDistanceIndex) {
             this.dispatchCurveChainWithDistanceIndex(spiral, this.handleTransitionSpiral.bind(this));
         }
         else if (this._geometryB instanceof _CurvePrimitive__WEBPACK_IMPORTED_MODULE_19__.CurvePrimitive) {
-            this.dispatchCurveSpiral(this._geometryB, spiral, true);
+            this.dispatchCurveStrokedCurve(this._geometryB, spiral, true);
         }
-        else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_14__.CurveCollection) {
+        else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_13__.CurveCollection) {
             this.dispatchCurveCollection(spiral, this.handleTransitionSpiral.bind(this));
         }
         return undefined;
@@ -218403,25 +218363,13 @@ class CurveCurveCloseApproachXY extends _geometry3d_GeometryHandler__WEBPACK_IMP
         // if _geometryB is also a CurveChainWithDistanceIndex, it will already have been converted by dispatchCurveChainWithDistanceIndex
         const childResults = this._results.extractArray();
         childResults.forEach((pair) => {
-            _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_15__.CurveChainWithDistanceIndex.convertChildDetailToChainDetailSingle(pair, chain, undefined);
+            _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_14__.CurveChainWithDistanceIndex.convertChildDetailToChainDetailSingle(pair, chain, undefined);
             this._results.insert(pair);
         });
     }
     /** Double dispatch handler for strongly typed homogeneous bspline curve .. */
     handleBSplineCurve3dH(_curve) {
-        /*
-        //NEEDS WORK -- make "dispatch" methods tolerant of both 3d and 3dH.
-        // "easy" if both present BezierCurve3dH span loaders
-        if (this._geometryB instanceof LineSegment3d) {
-          this.dispatchSegmentBsplineCurve(
-            this._geometryB, this._extendB, this._geometryB.point0Ref, 0.0, this._geometryB.point1Ref, 1.0, this._extendB,
-            curve, this._extendA, true);
-        } else if (this._geometryB instanceof LineString3d) {
-          this.dispatchLineStringBSplineCurve(this._geometryB, this._extendB, curve, this._extendA, true);
-        } else if (this._geometryB instanceof Arc3d) {
-          this.dispatchArcBsplineCurve3d(this._geometryB, this._extendB, curve, this._extendA, true);
-        }
-        */
+        // NEEDS WORK -- make "dispatch" methods tolerant of both 3d and 3dH
         return undefined;
     }
 }
@@ -218441,7 +218389,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   CurveCurveIntersectXY: () => (/* binding */ CurveCurveIntersectXY)
 /* harmony export */ });
 /* harmony import */ var _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @itwin/core-bentley */ "../../core/bentley/lib/esm/core-bentley.js");
-/* harmony import */ var _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../../bspline/BSplineCurve */ "../../core/geometry/lib/esm/bspline/BSplineCurve.js");
+/* harmony import */ var _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ../../bspline/BSplineCurve */ "../../core/geometry/lib/esm/bspline/BSplineCurve.js");
 /* harmony import */ var _Geometry__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../Geometry */ "../../core/geometry/lib/esm/Geometry.js");
 /* harmony import */ var _geometry3d_CoincidentGeometryOps__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../geometry3d/CoincidentGeometryOps */ "../../core/geometry/lib/esm/geometry3d/CoincidentGeometryOps.js");
 /* harmony import */ var _geometry3d_GeometryHandler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../geometry3d/GeometryHandler */ "../../core/geometry/lib/esm/geometry3d/GeometryHandler.js");
@@ -218453,18 +218401,18 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _numerics_Newton__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../../numerics/Newton */ "../../core/geometry/lib/esm/numerics/Newton.js");
 /* harmony import */ var _numerics_Polynomials__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../../numerics/Polynomials */ "../../core/geometry/lib/esm/numerics/Polynomials.js");
 /* harmony import */ var _numerics_SmallSystem__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../numerics/SmallSystem */ "../../core/geometry/lib/esm/numerics/SmallSystem.js");
-/* harmony import */ var _Arc3d__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../Arc3d */ "../../core/geometry/lib/esm/curve/Arc3d.js");
+/* harmony import */ var _Arc3d__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../Arc3d */ "../../core/geometry/lib/esm/curve/Arc3d.js");
 /* harmony import */ var _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../CurveChainWithDistanceIndex */ "../../core/geometry/lib/esm/curve/CurveChainWithDistanceIndex.js");
 /* harmony import */ var _CurveCollection__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../CurveCollection */ "../../core/geometry/lib/esm/curve/CurveCollection.js");
-/* harmony import */ var _CurveCurve__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ../CurveCurve */ "../../core/geometry/lib/esm/curve/CurveCurve.js");
+/* harmony import */ var _CurveCurve__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../CurveCurve */ "../../core/geometry/lib/esm/curve/CurveCurve.js");
 /* harmony import */ var _CurveLocationDetail__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../CurveLocationDetail */ "../../core/geometry/lib/esm/curve/CurveLocationDetail.js");
 /* harmony import */ var _CurvePrimitive__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ../CurvePrimitive */ "../../core/geometry/lib/esm/curve/CurvePrimitive.js");
-/* harmony import */ var _LineSegment3d__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../LineSegment3d */ "../../core/geometry/lib/esm/curve/LineSegment3d.js");
-/* harmony import */ var _LineString3d__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../LineString3d */ "../../core/geometry/lib/esm/curve/LineString3d.js");
+/* harmony import */ var _LineSegment3d__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../LineSegment3d */ "../../core/geometry/lib/esm/curve/LineSegment3d.js");
+/* harmony import */ var _LineString3d__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../LineString3d */ "../../core/geometry/lib/esm/curve/LineString3d.js");
 /* harmony import */ var _Loop__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../Loop */ "../../core/geometry/lib/esm/curve/Loop.js");
 /* harmony import */ var _Path__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../Path */ "../../core/geometry/lib/esm/curve/Path.js");
 /* harmony import */ var _ProxyCurve__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../ProxyCurve */ "../../core/geometry/lib/esm/curve/ProxyCurve.js");
-/* harmony import */ var _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../spiral/TransitionSpiral3d */ "../../core/geometry/lib/esm/curve/spiral/TransitionSpiral3d.js");
+/* harmony import */ var _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../spiral/TransitionSpiral3d */ "../../core/geometry/lib/esm/curve/spiral/TransitionSpiral3d.js");
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
@@ -218619,7 +218567,8 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
      * @param fractionB1 end of the subcurve of cpB
      * @param reversed whether to reverse the details in the recorded intersection pair
      * @param intervalDetails optional data for a coincident segment intersection
-     * @param fractionTol relative tolerance for comparing fractions to avoid duplicating the last intersection. Defaults to [[Geometry.smallAngleRadians]].
+     * @param fractionTol relative tolerance for comparing fractions to avoid duplicating the last intersection. Defaults
+     * to [[Geometry.smallAngleRadians]].
      */
     recordPointWithLocalFractions(localFractionA, cpA, fractionA0, fractionA1, localFractionB, cpB, fractionB0, fractionB1, reversed, intervalDetails, fractionTol) {
         let globalFractionA, globalFractionB;
@@ -219046,9 +218995,9 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
             bezierA.fractionToPoint4d(f1, this._xyzwA1);
             _geometry4d_Point4d__WEBPACK_IMPORTED_MODULE_2__.Point4d.createPlanePointPointZ(this._xyzwA0, this._xyzwA1, this._xyzwPlane);
             bezierB.poleProductsXYZW(univariateBezierB.coffs, this._xyzwPlane.x, this._xyzwPlane.y, this._xyzwPlane.z, this._xyzwPlane.w);
-            let errors = 0;
             const roots = univariateBezierB.roots(0.0, true);
             if (roots) {
+                const strictTolerance = this._coincidentGeometryContext.tolerance * 0.0001;
                 for (const r of roots) {
                     let bezierBFraction = r;
                     bezierB.fractionToPoint4d(bezierBFraction, this._xyzwB);
@@ -219060,15 +219009,19 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
                         const xyMatchingFunction = new _numerics_Newton__WEBPACK_IMPORTED_MODULE_13__.CurveCurveIntersectionXYRRToRRD(bezierA, bezierB);
                         const newtonSearcher = new _numerics_Newton__WEBPACK_IMPORTED_MODULE_13__.Newton2dUnboundedWithDerivative(xyMatchingFunction);
                         newtonSearcher.setUV(bezierAFraction, bezierBFraction);
-                        if (newtonSearcher.runIterations()) {
-                            bezierAFraction = newtonSearcher.getU();
-                            bezierBFraction = newtonSearcher.getV();
-                        }
+                        let converged = newtonSearcher.runIterations();
+                        bezierAFraction = newtonSearcher.getU();
+                        bezierBFraction = newtonSearcher.getV();
                         const bcurveAFraction = bezierA.fractionToParentFraction(bezierAFraction);
                         const bcurveBFraction = bezierB.fractionToParentFraction(bezierBFraction);
-                        if (false) {}
                         if (this.acceptFraction(false, bcurveAFraction, false) && this.acceptFraction(false, bcurveBFraction, false)) {
-                            this.recordPointWithLocalFractions(bcurveAFraction, bcurveA, 0, 1, bcurveBFraction, bcurveB, 0, 1, reversed);
+                            const pointA = bezierA.fractionToPoint(bezierAFraction, CurveCurveIntersectXY._workPointA0);
+                            const pointB = bezierB.fractionToPoint(bezierBFraction, CurveCurveIntersectXY._workPointB0);
+                            if (!converged) { // Newton may have found close points even if it didn't converge parametrically
+                                converged = pointA.isAlmostEqualXY(pointB, strictTolerance); // we can afford to be choosy
+                            }
+                            if (converged)
+                                this.recordPointWithLocalFractions(bcurveAFraction, bcurveA, 0, 1, bcurveBFraction, bcurveB, 0, 1, reversed);
                         }
                     }
                 }
@@ -219297,137 +219250,6 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
         this.resetGeometryB(geomB); // restore
         this._results = _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_17__.CurveChainWithDistanceIndex.convertChildDetailToChainDetail(this._results, index0, undefined, geomB, true);
     }
-    /**
-     * Invoke dispatch on each child of `g` as "geometryA".
-     * * If `g` is a `Path` or `Loop`, adjust extension flags for geometryA accordingly.
-     */
-    handleChildren(g) {
-        const children = g.children;
-        if (!children)
-            return;
-        const saveExtendA0 = this._extendA0;
-        const saveExtendA1 = this._extendA1;
-        for (let i = 0; i < children.length; i++) {
-            let extendA0 = saveExtendA0;
-            let extendA1 = saveExtendA1;
-            if (g instanceof _Path__WEBPACK_IMPORTED_MODULE_15__.Path && children.length > 1) {
-                if (i === 0)
-                    extendA1 = false; // first child can only extend from start
-                else if (i === children.length - 1)
-                    extendA0 = false; // last child can only extend from end
-                else
-                    extendA0 = extendA1 = false; // middle children cannot extend
-            }
-            else if (g instanceof _Loop__WEBPACK_IMPORTED_MODULE_16__.Loop) {
-                extendA0 = extendA1 = false; // Loops cannot extend
-            }
-            this.resetGeometryA(extendA0, extendA1);
-            children[i].dispatchToGeometryHandler(this);
-        }
-        this.resetGeometryA(saveExtendA0, saveExtendA1);
-    }
-    /** Double dispatch handler for strongly typed segment. */
-    handleLineSegment3d(segmentA) {
-        if (this._geometryB instanceof _LineSegment3d__WEBPACK_IMPORTED_MODULE_18__.LineSegment3d) {
-            const segmentB = this._geometryB;
-            this.dispatchSegmentSegment(segmentA, this._extendA0, segmentA.point0Ref, 0.0, segmentA.point1Ref, 1.0, this._extendA1, segmentB, this._extendB0, segmentB.point0Ref, 0.0, segmentB.point1Ref, 1.0, this._extendB1, false);
-        }
-        else if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_19__.LineString3d) {
-            this.computeSegmentLineString(segmentA, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
-        }
-        else if (this._geometryB instanceof _Arc3d__WEBPACK_IMPORTED_MODULE_20__.Arc3d) {
-            this.dispatchSegmentArc(segmentA, this._extendA0, segmentA.point0Ref, 0.0, segmentA.point1Ref, 1.0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
-        }
-        else if (this._geometryB instanceof _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_21__.BSplineCurve3d) {
-            this.dispatchSegmentBsplineCurve(segmentA, this._extendA0, segmentA.point0Ref, 0.0, segmentA.point1Ref, 1.0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
-        }
-        else if (this._geometryB instanceof _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_22__.TransitionSpiral3d) {
-            this.dispatchCurveSpiral(segmentA, this._extendA0, this._extendA1, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_14__.CurveCollection) {
-            this.dispatchCurveCollection(segmentA, this.handleLineSegment3d.bind(this));
-        }
-        else if (this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_17__.CurveChainWithDistanceIndex) {
-            this.dispatchCurveChainWithDistanceIndex(segmentA, this.handleLineSegment3d.bind(this));
-        }
-        return undefined;
-    }
-    /** Double dispatch handler for strongly typed linestring. */
-    handleLineString3d(lsA) {
-        if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_19__.LineString3d) {
-            const lsB = this._geometryB;
-            this.computeLineStringLineString(lsA, this._extendA0, this._extendA1, lsB, this._extendB0, this._extendB1, false);
-        }
-        else if (this._geometryB instanceof _LineSegment3d__WEBPACK_IMPORTED_MODULE_18__.LineSegment3d) {
-            this.computeSegmentLineString(this._geometryB, this._extendB0, this._extendB1, lsA, this._extendA0, this._extendA1, true);
-        }
-        else if (this._geometryB instanceof _Arc3d__WEBPACK_IMPORTED_MODULE_20__.Arc3d) {
-            this.computeArcLineString(this._geometryB, this._extendB0, this._extendB1, lsA, this._extendA0, this._extendA1, true);
-        }
-        else if (this._geometryB instanceof _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_21__.BSplineCurve3d) {
-            this.dispatchLineStringBSplineCurve(lsA, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
-        }
-        else if (this._geometryB instanceof _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_22__.TransitionSpiral3d) {
-            this.dispatchCurveSpiral(lsA, this._extendA0, this._extendA1, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_14__.CurveCollection) {
-            this.dispatchCurveCollection(lsA, this.handleLineString3d.bind(this));
-        }
-        else if (this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_17__.CurveChainWithDistanceIndex) {
-            this.dispatchCurveChainWithDistanceIndex(lsA, this.handleLineString3d.bind(this));
-        }
-        return undefined;
-    }
-    /** Double dispatch handler for strongly typed arc. */
-    handleArc3d(arcA) {
-        if (this._geometryB instanceof _LineSegment3d__WEBPACK_IMPORTED_MODULE_18__.LineSegment3d) {
-            this.dispatchSegmentArc(this._geometryB, this._extendB0, this._geometryB.point0Ref, 0.0, this._geometryB.point1Ref, 1.0, this._extendB1, arcA, this._extendA0, this._extendA1, true);
-        }
-        else if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_19__.LineString3d) {
-            this.computeArcLineString(arcA, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
-        }
-        else if (this._geometryB instanceof _Arc3d__WEBPACK_IMPORTED_MODULE_20__.Arc3d) {
-            this.dispatchArcArc(arcA, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
-        }
-        else if (this._geometryB instanceof _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_21__.BSplineCurve3d) {
-            this.dispatchArcBsplineCurve3d(arcA, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
-        }
-        else if (this._geometryB instanceof _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_22__.TransitionSpiral3d) {
-            this.dispatchCurveSpiral(arcA, this._extendA0, this._extendA1, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_14__.CurveCollection) {
-            this.dispatchCurveCollection(arcA, this.handleArc3d.bind(this));
-        }
-        else if (this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_17__.CurveChainWithDistanceIndex) {
-            this.dispatchCurveChainWithDistanceIndex(arcA, this.handleArc3d.bind(this));
-        }
-        return undefined;
-    }
-    /** Double dispatch handler for strongly typed bspline curve. */
-    handleBSplineCurve3d(curveA) {
-        if (this._geometryB instanceof _LineSegment3d__WEBPACK_IMPORTED_MODULE_18__.LineSegment3d) {
-            this.dispatchSegmentBsplineCurve(this._geometryB, this._extendB0, this._geometryB.point0Ref, 0.0, this._geometryB.point1Ref, 1.0, this._extendB1, curveA, this._extendA0, this._extendA1, true);
-        }
-        else if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_19__.LineString3d) {
-            this.dispatchLineStringBSplineCurve(this._geometryB, this._extendB0, this._extendB1, curveA, this._extendA0, this._extendA1, true);
-        }
-        else if (this._geometryB instanceof _Arc3d__WEBPACK_IMPORTED_MODULE_20__.Arc3d) {
-            this.dispatchArcBsplineCurve3d(this._geometryB, this._extendB0, this._extendB1, curveA, this._extendA0, this._extendA1, true);
-        }
-        else if (this._geometryB instanceof _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_21__.BSplineCurve3dBase) {
-            this.dispatchBSplineCurve3dBSplineCurve3d(curveA, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_22__.TransitionSpiral3d) {
-            this.dispatchCurveSpiral(curveA, this._extendA0, this._extendA1, this._geometryB, false);
-        }
-        else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_14__.CurveCollection) {
-            this.dispatchCurveCollection(curveA, this.handleBSplineCurve3d.bind(this));
-        }
-        else if (this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_17__.CurveChainWithDistanceIndex) {
-            this.dispatchCurveChainWithDistanceIndex(curveA, this.handleBSplineCurve3d.bind(this));
-        }
-        return undefined;
-    }
     /**
      * Process tail of `this._results` for xy-intersections between the curve and spiral.
      * * Refine each result via Newton iteration. If it doesn't converge, remove it.
@@ -219458,7 +219280,7 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
             const pair = this._results[i];
             const detailA = reversed ? pair.detailB : pair.detailA;
             const detailB = reversed ? pair.detailA : pair.detailB;
-            (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(detailB.curve instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_19__.LineString3d, "Caller has discretized the spiral");
+            (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(detailB.curve instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_18__.LineString3d, "Caller has discretized the spiral");
             const extendA0 = reversed ? this._extendB0 : this._extendA0;
             const extendA1 = reversed ? this._extendB1 : this._extendA1;
             newtonSearcher.setUV(detailA.fraction, detailB.fraction); // use linestring fraction as spiral param; it generally yields a closer point than fractional length!
@@ -219484,7 +219306,7 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
      * @param result object to receive appended stroke points; if omitted, a new object is created, populated, and returned.
      */
     strokeCurve(curve, options, result) {
-        const ls = result ? result : _LineString3d__WEBPACK_IMPORTED_MODULE_19__.LineString3d.create();
+        const ls = result ? result : _LineString3d__WEBPACK_IMPORTED_MODULE_18__.LineString3d.create();
         curve.emitStrokes(ls, options);
         return ls;
     }
@@ -219502,7 +219324,7 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
                 if (spiral0.closestPoint(midPoint, false, detail))
                     maxError = detail.a;
             }
-            if (spiral1 && spiral1 instanceof _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_22__.TransitionSpiral3d && ls1 && ls1 instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_19__.LineString3d) {
+            if (spiral1 && spiral1 instanceof _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_19__.TransitionSpiral3d && ls1 && ls1 instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_18__.LineString3d) {
                 const maxError1 = this.computeMaxSpiralStrokeError(spiral1, ls1);
                 if (maxError1 > maxError)
                     maxError = maxError1;
@@ -219538,7 +219360,7 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
      */
     appendDiscreteCloseApproachResults(curveA, lsB, maxDistance, reversed) {
         const i0 = this._results.length;
-        const closeApproachPairs = _CurveCurve__WEBPACK_IMPORTED_MODULE_23__.CurveCurve.closeApproachProjectedXYPairs(reversed ? lsB : curveA, reversed ? curveA : lsB, maxDistance);
+        const closeApproachPairs = _CurveCurve__WEBPACK_IMPORTED_MODULE_20__.CurveCurve.closeApproachProjectedXYPairs(reversed ? lsB : curveA, reversed ? curveA : lsB, maxDistance);
         closeApproachPairs.sort((p0, p1) => p0.detailA.a - p1.detailA.a);
         this._results.push(...closeApproachPairs);
         return this._results.length - i0;
@@ -219554,7 +219376,7 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
      */
     dispatchCurveSpiral(curveA, extendA0, extendA1, spiralB, reversed) {
         let cpA = curveA;
-        if (curveA instanceof _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_22__.TransitionSpiral3d) {
+        if (curveA instanceof _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_19__.TransitionSpiral3d) {
             cpA = this.strokeCurve(curveA);
             extendA0 = extendA1 = false;
         }
@@ -219566,6 +219388,137 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
         this.appendDiscreteCloseApproachResults(cpA, cpB, maxError, reversed); // seeds for finding tangent intersections
         this.refineSpiralResultsByNewton(curveA, spiralB, index0, reversed);
     }
+    /**
+    * Invoke dispatch on each child of `g` as "geometryA".
+    * * If `g` is a `Path` or `Loop`, adjust extension flags for geometryA accordingly.
+    */
+    handleChildren(g) {
+        const children = g.children;
+        if (!children)
+            return;
+        const saveExtendA0 = this._extendA0;
+        const saveExtendA1 = this._extendA1;
+        for (let i = 0; i < children.length; i++) {
+            let extendA0 = saveExtendA0;
+            let extendA1 = saveExtendA1;
+            if (g instanceof _Path__WEBPACK_IMPORTED_MODULE_15__.Path && children.length > 1) {
+                if (i === 0)
+                    extendA1 = false; // first child can only extend from start
+                else if (i === children.length - 1)
+                    extendA0 = false; // last child can only extend from end
+                else
+                    extendA0 = extendA1 = false; // middle children cannot extend
+            }
+            else if (g instanceof _Loop__WEBPACK_IMPORTED_MODULE_16__.Loop) {
+                extendA0 = extendA1 = false; // Loops cannot extend
+            }
+            this.resetGeometryA(extendA0, extendA1);
+            children[i].dispatchToGeometryHandler(this);
+        }
+        this.resetGeometryA(saveExtendA0, saveExtendA1);
+    }
+    /** Double dispatch handler for strongly typed segment. */
+    handleLineSegment3d(segmentA) {
+        if (this._geometryB instanceof _LineSegment3d__WEBPACK_IMPORTED_MODULE_21__.LineSegment3d) {
+            const segmentB = this._geometryB;
+            this.dispatchSegmentSegment(segmentA, this._extendA0, segmentA.point0Ref, 0.0, segmentA.point1Ref, 1.0, this._extendA1, segmentB, this._extendB0, segmentB.point0Ref, 0.0, segmentB.point1Ref, 1.0, this._extendB1, false);
+        }
+        else if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_18__.LineString3d) {
+            this.computeSegmentLineString(segmentA, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
+        }
+        else if (this._geometryB instanceof _Arc3d__WEBPACK_IMPORTED_MODULE_22__.Arc3d) {
+            this.dispatchSegmentArc(segmentA, this._extendA0, segmentA.point0Ref, 0.0, segmentA.point1Ref, 1.0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
+        }
+        else if (this._geometryB instanceof _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_23__.BSplineCurve3d) {
+            this.dispatchSegmentBsplineCurve(segmentA, this._extendA0, segmentA.point0Ref, 0.0, segmentA.point1Ref, 1.0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
+        }
+        else if (this._geometryB instanceof _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_19__.TransitionSpiral3d) {
+            this.dispatchCurveSpiral(segmentA, this._extendA0, this._extendA1, this._geometryB, false);
+        }
+        else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_14__.CurveCollection) {
+            this.dispatchCurveCollection(segmentA, this.handleLineSegment3d.bind(this));
+        }
+        else if (this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_17__.CurveChainWithDistanceIndex) {
+            this.dispatchCurveChainWithDistanceIndex(segmentA, this.handleLineSegment3d.bind(this));
+        }
+        return undefined;
+    }
+    /** Double dispatch handler for strongly typed linestring. */
+    handleLineString3d(lsA) {
+        if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_18__.LineString3d) {
+            const lsB = this._geometryB;
+            this.computeLineStringLineString(lsA, this._extendA0, this._extendA1, lsB, this._extendB0, this._extendB1, false);
+        }
+        else if (this._geometryB instanceof _LineSegment3d__WEBPACK_IMPORTED_MODULE_21__.LineSegment3d) {
+            this.computeSegmentLineString(this._geometryB, this._extendB0, this._extendB1, lsA, this._extendA0, this._extendA1, true);
+        }
+        else if (this._geometryB instanceof _Arc3d__WEBPACK_IMPORTED_MODULE_22__.Arc3d) {
+            this.computeArcLineString(this._geometryB, this._extendB0, this._extendB1, lsA, this._extendA0, this._extendA1, true);
+        }
+        else if (this._geometryB instanceof _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_23__.BSplineCurve3d) {
+            this.dispatchLineStringBSplineCurve(lsA, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
+        }
+        else if (this._geometryB instanceof _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_19__.TransitionSpiral3d) {
+            this.dispatchCurveSpiral(lsA, this._extendA0, this._extendA1, this._geometryB, false);
+        }
+        else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_14__.CurveCollection) {
+            this.dispatchCurveCollection(lsA, this.handleLineString3d.bind(this));
+        }
+        else if (this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_17__.CurveChainWithDistanceIndex) {
+            this.dispatchCurveChainWithDistanceIndex(lsA, this.handleLineString3d.bind(this));
+        }
+        return undefined;
+    }
+    /** Double dispatch handler for strongly typed arc. */
+    handleArc3d(arcA) {
+        if (this._geometryB instanceof _LineSegment3d__WEBPACK_IMPORTED_MODULE_21__.LineSegment3d) {
+            this.dispatchSegmentArc(this._geometryB, this._extendB0, this._geometryB.point0Ref, 0.0, this._geometryB.point1Ref, 1.0, this._extendB1, arcA, this._extendA0, this._extendA1, true);
+        }
+        else if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_18__.LineString3d) {
+            this.computeArcLineString(arcA, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
+        }
+        else if (this._geometryB instanceof _Arc3d__WEBPACK_IMPORTED_MODULE_22__.Arc3d) {
+            this.dispatchArcArc(arcA, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
+        }
+        else if (this._geometryB instanceof _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_23__.BSplineCurve3d) {
+            this.dispatchArcBsplineCurve3d(arcA, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
+        }
+        else if (this._geometryB instanceof _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_19__.TransitionSpiral3d) {
+            this.dispatchCurveSpiral(arcA, this._extendA0, this._extendA1, this._geometryB, false);
+        }
+        else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_14__.CurveCollection) {
+            this.dispatchCurveCollection(arcA, this.handleArc3d.bind(this));
+        }
+        else if (this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_17__.CurveChainWithDistanceIndex) {
+            this.dispatchCurveChainWithDistanceIndex(arcA, this.handleArc3d.bind(this));
+        }
+        return undefined;
+    }
+    /** Double dispatch handler for strongly typed bspline curve. */
+    handleBSplineCurve3d(curveA) {
+        if (this._geometryB instanceof _LineSegment3d__WEBPACK_IMPORTED_MODULE_21__.LineSegment3d) {
+            this.dispatchSegmentBsplineCurve(this._geometryB, this._extendB0, this._geometryB.point0Ref, 0.0, this._geometryB.point1Ref, 1.0, this._extendB1, curveA, this._extendA0, this._extendA1, true);
+        }
+        else if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_18__.LineString3d) {
+            this.dispatchLineStringBSplineCurve(this._geometryB, this._extendB0, this._extendB1, curveA, this._extendA0, this._extendA1, true);
+        }
+        else if (this._geometryB instanceof _Arc3d__WEBPACK_IMPORTED_MODULE_22__.Arc3d) {
+            this.dispatchArcBsplineCurve3d(this._geometryB, this._extendB0, this._extendB1, curveA, this._extendA0, this._extendA1, true);
+        }
+        else if (this._geometryB instanceof _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_23__.BSplineCurve3dBase) {
+            this.dispatchBSplineCurve3dBSplineCurve3d(curveA, this._geometryB, false);
+        }
+        else if (this._geometryB instanceof _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_19__.TransitionSpiral3d) {
+            this.dispatchCurveSpiral(curveA, this._extendA0, this._extendA1, this._geometryB, false);
+        }
+        else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_14__.CurveCollection) {
+            this.dispatchCurveCollection(curveA, this.handleBSplineCurve3d.bind(this));
+        }
+        else if (this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_17__.CurveChainWithDistanceIndex) {
+            this.dispatchCurveChainWithDistanceIndex(curveA, this.handleBSplineCurve3d.bind(this));
+        }
+        return undefined;
+    }
     /** Double dispatch handler for strongly typed spiral curve. */
     handleTransitionSpiral(spiral) {
         if (this._geometryB instanceof _CurveChainWithDistanceIndex__WEBPACK_IMPORTED_MODULE_17__.CurveChainWithDistanceIndex) {
@@ -219587,19 +219540,8 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
     }
     /** Double dispatch handler for strongly typed homogeneous bspline curve. */
     handleBSplineCurve3dH(_curve) {
-        /*
         // NEEDS WORK -- make "dispatch" methods tolerant of both 3d and 3dH .
         // "easy" if both present BezierCurve3dH span loaders
-        if (this._geometryB instanceof LineSegment3d) {
-          this.dispatchSegmentBsplineCurve(
-            this._geometryB, this._extendB, this._geometryB.point0Ref, 0.0, this._geometryB.point1Ref, 1.0, this._extendB,
-            curve, this._extendA, true);
-        } else if (this._geometryB instanceof LineString3d) {
-          this.dispatchLineStringBSplineCurve(this._geometryB, this._extendB, curve, this._extendA, true);
-        } else if (this._geometryB instanceof Arc3d) {
-          this.dispatchArcBsplineCurve3d(this._geometryB, this._extendB, curve, this._extendA, true);
-        }
-        */
         return undefined;
     }
 }
@@ -242877,9 +242819,8 @@ class Point4dArray {
      * @return packed weighted point array
      */
     static packPointsAndWeightsToFloat64Array(data, weights, result) {
-        let points;
         if (Array.isArray(data) && data[0] instanceof _Point3dVector3d__WEBPACK_IMPORTED_MODULE_1__.Point3d) {
-            points = data;
+            const points = data;
             if (points.length !== weights.length)
                 return undefined;
             const numValues = 4 * points.length;
@@ -242893,18 +242834,18 @@ class Point4dArray {
             }
             return result;
         }
-        points = data;
+        const numericData = data;
         const numPoints = weights.length;
-        if (points.length !== 3 * numPoints)
+        if (numericData.length !== 3 * numPoints)
             return undefined;
         const numValues1 = 4 * numPoints;
         if (!result || result.length < numValues1)
             result = new Float64Array(numValues1);
         for (let i = 0, k = 0; k < numPoints; k++) {
             const k0 = 3 * k;
-            result[i++] = points[k0];
-            result[i++] = points[k0 + 1];
-            result[i++] = points[k0 + 2];
+            result[i++] = numericData[k0];
+            result[i++] = numericData[k0 + 1];
+            result[i++] = numericData[k0 + 2];
             result[i++] = weights[k];
         }
         return result;
@@ -326458,7 +326399,7 @@ var loadLanguages = instance.loadLanguages;
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@itwin/core-frontend","version":"5.9.0-dev.15","description":"iTwin.js frontend components","main":"lib/cjs/core-frontend.js","module":"lib/esm/core-frontend.js","typings":"lib/cjs/core-frontend","license":"MIT","scripts":{"build":"npm run -s copy:public && npm run -s build:cjs && npm run -s build:esm && npm run -s webpackWorkers && npm run -s copy:workers && npm run -s copy:draco","build:cjs":"npm run -s copy:js:cjs && tsc 1>&2 --outDir lib/cjs","build:esm":"npm run -s copy:js:esm && tsc 1>&2 --module ES2022 --outDir lib/esm","clean":"rimraf -g lib .rush/temp/package-deps*.json","copy:public":"cpx \\"./src/public/**/*\\" ./lib/public","copy:js:cjs":"cpx \\"./src/**/*.js\\" ./lib/cjs","copy:js:esm":"cpx \\"./src/**/*.js\\" ./lib/esm","copy:workers":"cpx \\"./lib/workers/webpack/parse-imdl-worker.js\\" ./lib/public/scripts","copy:draco":"cpx \\"./node_modules/@loaders.gl/draco/dist/libs/*\\" ./lib/public/scripts","docs":"betools docs --json=../../generated-docs/core/core-frontend/file.json --tsIndexFile=./core-frontend.ts --onlyJson --excludes=webgl/**/*,**/map/*.d.ts,**/tile/*.d.ts,**/*-css.ts && npm run -s extract","extract":"betools extract --fileExt=ts --extractFrom=./src/test/example-code --recursive --out=../../generated-docs/extract","extract-api":"betools extract-api --entry=core-frontend && npm run extract-extension-api","extract-extension-api":"eslint --no-inline-config -c extraction.eslint.config.js  \\"./src/**/*.ts\\" 1>&2","lint":"eslint \\"./src/**/*.ts\\" 1>&2","lint-fix":"eslint --fix -f visualstudio \\"./src/**/*.ts\\" 1>&2","lint-deprecation":"eslint --fix -f visualstudio --no-inline-config -c ../../common/config/eslint/eslint.config.deprecation-policy.js \\"./src/**/*.ts\\"","pseudolocalize":"betools pseudolocalize --englishDir ./src/public/locales/en --out ./public/locales/en-PSEUDO","test":"npm run webpackTestWorker && vitest --run","cover":"npm run webpackTestWorker && vitest --run","webpackTests":"webpack --config ./src/test/utils/webpack.config.js 1>&2 && npm run -s webpackTestWorker","webpackTestWorker":"webpack --config ./src/test/worker/webpack.config.js 1>&2 && cpx \\"./lib/test/test-worker.js\\" ./lib/test","webpackWorkers":"webpack --config ./src/workers/ImdlParser/webpack.config.js 1>&2"},"repository":{"type":"git","url":"https://github.com/iTwin/itwinjs-core.git","directory":"core/frontend"},"keywords":["Bentley","BIM","iModel","digital-twin","iTwin"],"author":{"name":"Bentley Systems, Inc.","url":"http://www.bentley.com"},"peerDependencies":{"@itwin/appui-abstract":"workspace:*","@itwin/core-bentley":"workspace:*","@itwin/core-common":"workspace:*","@itwin/core-geometry":"workspace:*","@itwin/core-orbitgt":"workspace:*","@itwin/core-quantity":"workspace:*","@itwin/ecschema-metadata":"workspace:*","@itwin/ecschema-rpcinterface-common":"workspace:*"},"//devDependencies":["NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install","NOTE: All tools used by scripts in this package must be listed as devDependencies"],"devDependencies":{"@bentley/aec-units-schema":"^1.0.3","@bentley/formats-schema":"^1.0.0","@bentley/units-schema":"^1.0.9","@itwin/appui-abstract":"workspace:*","@itwin/build-tools":"workspace:*","@itwin/core-bentley":"workspace:*","@itwin/core-common":"workspace:*","@itwin/core-geometry":"workspace:*","@itwin/core-orbitgt":"workspace:*","@itwin/core-quantity":"workspace:*","@itwin/ecschema-metadata":"workspace:*","@itwin/ecschema-rpcinterface-common":"workspace:*","@itwin/object-storage-core":"^3.0.4","@itwin/eslint-plugin":"^6.0.0","@types/chai-as-promised":"^7","@types/draco3d":"^1.4.10","@types/sinon":"^17.0.2","@vitest/browser":"^3.0.6","@vitest/coverage-v8":"^3.0.6","cpx2":"^8.0.0","eslint":"^9.31.0","glob":"^10.5.0","playwright":"~1.56.1","rimraf":"^6.0.1","sinon":"^17.0.2","source-map-loader":"^5.0.0","typescript":"~5.6.2","vitest":"^3.0.6","vite-multiple-assets":"^1.3.1","vite-plugin-static-copy":"2.2.0","webpack":"^5.97.1"},"//dependencies":["NOTE: these dependencies should be only for things that DO NOT APPEAR IN THE API","NOTE: core-frontend should remain UI technology agnostic, so no react/angular dependencies are allowed"],"dependencies":{"@itwin/core-i18n":"workspace:*","@itwin/webgl-compatibility":"workspace:*","@loaders.gl/core":"~4.3.4","@loaders.gl/draco":"~4.3.4","fuse.js":"^3.3.0","wms-capabilities":"0.4.0"}}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@itwin/core-frontend","version":"5.9.0-dev.16","description":"iTwin.js frontend components","main":"lib/cjs/core-frontend.js","module":"lib/esm/core-frontend.js","typings":"lib/cjs/core-frontend","license":"MIT","scripts":{"build":"npm run -s copy:public && npm run -s build:cjs && npm run -s build:esm && npm run -s webpackWorkers && npm run -s copy:workers && npm run -s copy:draco","build:cjs":"npm run -s copy:js:cjs && tsc 1>&2 --outDir lib/cjs","build:esm":"npm run -s copy:js:esm && tsc 1>&2 --module ES2022 --outDir lib/esm","clean":"rimraf -g lib .rush/temp/package-deps*.json","copy:public":"cpx \\"./src/public/**/*\\" ./lib/public","copy:js:cjs":"cpx \\"./src/**/*.js\\" ./lib/cjs","copy:js:esm":"cpx \\"./src/**/*.js\\" ./lib/esm","copy:workers":"cpx \\"./lib/workers/webpack/parse-imdl-worker.js\\" ./lib/public/scripts","copy:draco":"cpx \\"./node_modules/@loaders.gl/draco/dist/libs/*\\" ./lib/public/scripts","docs":"betools docs --json=../../generated-docs/core/core-frontend/file.json --tsIndexFile=./core-frontend.ts --onlyJson --excludes=webgl/**/*,**/map/*.d.ts,**/tile/*.d.ts,**/*-css.ts && npm run -s extract","extract":"betools extract --fileExt=ts --extractFrom=./src/test/example-code --recursive --out=../../generated-docs/extract","extract-api":"betools extract-api --entry=core-frontend && npm run extract-extension-api","extract-extension-api":"eslint --no-inline-config -c extraction.eslint.config.js  \\"./src/**/*.ts\\" 1>&2","lint":"eslint \\"./src/**/*.ts\\" 1>&2","lint-fix":"eslint --fix -f visualstudio \\"./src/**/*.ts\\" 1>&2","lint-deprecation":"eslint --fix -f visualstudio --no-inline-config -c ../../common/config/eslint/eslint.config.deprecation-policy.js \\"./src/**/*.ts\\"","pseudolocalize":"betools pseudolocalize --englishDir ./src/public/locales/en --out ./public/locales/en-PSEUDO","test":"npm run webpackTestWorker && vitest --run","cover":"npm run webpackTestWorker && vitest --run","webpackTests":"webpack --config ./src/test/utils/webpack.config.js 1>&2 && npm run -s webpackTestWorker","webpackTestWorker":"webpack --config ./src/test/worker/webpack.config.js 1>&2 && cpx \\"./lib/test/test-worker.js\\" ./lib/test","webpackWorkers":"webpack --config ./src/workers/ImdlParser/webpack.config.js 1>&2"},"repository":{"type":"git","url":"https://github.com/iTwin/itwinjs-core.git","directory":"core/frontend"},"keywords":["Bentley","BIM","iModel","digital-twin","iTwin"],"author":{"name":"Bentley Systems, Inc.","url":"http://www.bentley.com"},"peerDependencies":{"@itwin/appui-abstract":"workspace:*","@itwin/core-bentley":"workspace:*","@itwin/core-common":"workspace:*","@itwin/core-geometry":"workspace:*","@itwin/core-orbitgt":"workspace:*","@itwin/core-quantity":"workspace:*","@itwin/ecschema-metadata":"workspace:*","@itwin/ecschema-rpcinterface-common":"workspace:*"},"//devDependencies":["NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install","NOTE: All tools used by scripts in this package must be listed as devDependencies"],"devDependencies":{"@bentley/aec-units-schema":"^1.0.3","@bentley/formats-schema":"^1.0.0","@bentley/units-schema":"^1.0.9","@itwin/appui-abstract":"workspace:*","@itwin/build-tools":"workspace:*","@itwin/core-bentley":"workspace:*","@itwin/core-common":"workspace:*","@itwin/core-geometry":"workspace:*","@itwin/core-orbitgt":"workspace:*","@itwin/core-quantity":"workspace:*","@itwin/ecschema-metadata":"workspace:*","@itwin/ecschema-rpcinterface-common":"workspace:*","@itwin/object-storage-core":"^3.0.4","@itwin/eslint-plugin":"^6.0.0","@types/chai-as-promised":"^7","@types/draco3d":"^1.4.10","@types/sinon":"^17.0.2","@vitest/browser":"^3.0.6","@vitest/coverage-v8":"^3.0.6","cpx2":"^8.0.0","eslint":"^9.31.0","glob":"^10.5.0","playwright":"~1.56.1","rimraf":"^6.0.1","sinon":"^17.0.2","source-map-loader":"^5.0.0","typescript":"~5.6.2","vitest":"^3.0.6","vite-multiple-assets":"^1.3.1","vite-plugin-static-copy":"2.2.0","webpack":"^5.97.1"},"//dependencies":["NOTE: these dependencies should be only for things that DO NOT APPEAR IN THE API","NOTE: core-frontend should remain UI technology agnostic, so no react/angular dependencies are allowed"],"dependencies":{"@itwin/core-i18n":"workspace:*","@itwin/webgl-compatibility":"workspace:*","@loaders.gl/core":"~4.3.4","@loaders.gl/draco":"~4.3.4","fuse.js":"^3.3.0","wms-capabilities":"0.4.0"}}');
 
 /***/ })