@itwin/ecschema-rpcinterface-tests 5.12.0-dev.11 → 5.12.0-dev.13

package/lib/dist/bundled-tests.js

@@ -87584,14 +87584,13 @@ class DrawingViewState extends _ViewState__WEBPACK_IMPORTED_MODULE_14__.ViewStat
         let displaySpatialView = false;
         try {
             const ecsql = `
-        SELECT spatialView,
+        SELECT spatialView.Id as spatialViewId,
           json_extract(jsonProperties, '$.drawingToSpatialTransform') as drawingToSpatialTransform,
           CAST(json_extract(jsonProperties, '$.displaySpatialView') as BOOLEAN) as displaySpatialView
         FROM bis.SectionDrawing
         WHERE ECInstanceId=${this.baseModelId}`;
-            // eslint-disable-next-line @typescript-eslint/no-deprecated
-            for await (const row of this.iModel.createQueryReader(ecsql, undefined, { rowFormat: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.QueryRowFormat.UseJsPropertyNames })) {
-                spatialView = _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.Id64.fromJSON(row.spatialView?.id);
+            for await (const row of this.iModel.createQueryReader(ecsql, undefined, { rowFormat: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.QueryRowFormat.UseECSqlPropertyNames })) {
+                spatialView = _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.Id64.fromJSON(row.spatialViewId);
                 displaySpatialView = !!row.displaySpatialView;
                 try {
                     drawingToSpatialTransform = JSON.parse(row.drawingToSpatialTransform);
@@ -92814,24 +92813,24 @@ class SnapshotConnection extends IModelConnection {
                 return [];
             const select3d = `
         SELECT
-          ECInstanceId,
+          ECInstanceId as id,
           Origin.x as x, Origin.y as y, Origin.z as z,
           BBoxLow.x as lx, BBoxLow.y as ly, BBoxLow.z as lz,
           BBoxHigh.x as hx, BBoxHigh.y as hy, BBoxHigh.z as hz,
-          Yaw, Pitch, Roll,
-          NULL as Rotation
+          Yaw as yaw, Pitch as pitch, Roll as roll,
+          NULL as rotation
         FROM bis.GeometricElement3d
         WHERE Origin IS NOT NULL AND BBoxLow IS NOT NULL AND BBoxHigh IS NOT NULL`;
             // Note: For the UNION ALL statement, the column aliases in select2d are ignored - so they
             // must match those in select3d.
             const select2d = `
         SELECT
-          ECInstanceId,
+          ECInstanceId as id,
           Origin.x as x, Origin.y as y, NULL as z,
           BBoxLow.x as lx, BBoxLow.y as ly, NULL as lz,
           BBoxHigh.x as hx, BBoxHigh.y as hy, NULL as hz,
           NULL as yaw, NULL as pitch, NULL as roll,
-          Rotation
+          Rotation as rotation
         FROM bis.GeometricElement2d
         WHERE Origin IS NOT NULL AND BBoxLow IS NOT NULL AND BBoxHigh IS NOT NULL`;
             const idCriterion = `ECInstanceId IN (${ids.join(",")})`;
@@ -92853,8 +92852,7 @@ class SnapshotConnection extends IModelConnection {
                     break;
             }
             const placements = new Array();
-            // eslint-disable-next-line @typescript-eslint/no-deprecated
-            for await (const queryRow of this._iModel.createQueryReader(ecsql, undefined, { rowFormat: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.QueryRowFormat.UseJsPropertyNames })) {
+            for await (const queryRow of this._iModel.createQueryReader(ecsql, undefined, { rowFormat: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.QueryRowFormat.UseECSqlPropertyNames })) {
                 const row = queryRow.toRow();
                 const origin = [row.x, row.y, row.z];
                 const bbox = {
@@ -99669,10 +99667,9 @@ class ViewCreator2d {
     async _addSheetViewProps(modelId, props) {
         let width = 0;
         let height = 0;
-        // eslint-disable-next-line @typescript-eslint/no-deprecated
-        for await (const row of this._imodel.createQueryReader(`SELECT Width, Height FROM bis.Sheet WHERE ECInstanceId = ?`, _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.QueryBinder.from([modelId]), { rowFormat: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.QueryRowFormat.UseJsPropertyNames })) {
-            width = row.width;
-            height = row.height;
+        for await (const row of this._imodel.createQueryReader(`SELECT Width, Height FROM bis.Sheet WHERE ECInstanceId = ?`, _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.QueryBinder.from([modelId]), { rowFormat: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.QueryRowFormat.UseECSqlPropertyNames })) {
+            width = row.Width;
+            height = row.Height;
             break;
         }
         const sheetProps = {
@@ -99716,7 +99713,7 @@ class ViewCreator2d {
      * @param modelId of target model.
      */
     async _getViewDefinitionsIdForModel(modelId) {
-        const query = `SELECT ECInstanceId from Bis.ViewDefinition2D WHERE BaseModel.Id = ${modelId} AND isPrivate = false LIMIT 1`;
+        const query = `SELECT ECInstanceId as id from Bis.ViewDefinition2D WHERE BaseModel.Id = ${modelId} AND isPrivate = false LIMIT 1`;
         const viewDefinitionsId = await this._executeQuery(query);
         return (viewDefinitionsId.length) > 0 ? viewDefinitionsId[0] : undefined;
     }
@@ -99724,7 +99721,7 @@ class ViewCreator2d {
      * Get all drawing categories
      */
     async _getAllCategories() {
-        const query = "SELECT ECInstanceId from BisCore.DrawingCategory";
+        const query = "SELECT ECInstanceId as id from BisCore.DrawingCategory";
         const categories = await this._executeQuery(query);
         return categories;
     }
@@ -99733,7 +99730,7 @@ class ViewCreator2d {
      * @param modelId of target model.
      */
     async _getSheetAttachments(modelId) {
-        const query = `SELECT ECInstanceId FROM Bis.ViewAttachment WHERE Model.Id = ${modelId}`;
+        const query = `SELECT ECInstanceId as id FROM Bis.ViewAttachment WHERE Model.Id = ${modelId}`;
         const attachments = await this._executeQuery(query);
         return attachments;
     }
@@ -99743,8 +99740,7 @@ class ViewCreator2d {
      */
     _executeQuery = async (query) => {
         const rows = [];
-        // eslint-disable-next-line @typescript-eslint/no-deprecated
-        for await (const row of this._imodel.createQueryReader(query, undefined, { rowFormat: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.QueryRowFormat.UseJsPropertyNames }))
+        for await (const row of this._imodel.createQueryReader(query, undefined, { rowFormat: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.QueryRowFormat.UseECSqlPropertyNames }))
             rows.push(row.id);
         return rows;
     };
@@ -166246,6 +166242,9 @@ class GltfReader {
             }
             case _common_gltf_GltfSchema__WEBPACK_IMPORTED_MODULE_12__.GltfMeshMode.LineStrip: {
                 (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(undefined !== bufferView); // compiler can't seem to infer this...
+                // Per the KHR_mesh_primitive_restart extension (https://github.com/KhronosGroup/glTF/pull/2569), the indices accessor may contain
+                // "primitive restart" values - the maximum value for the accessor's component type - each of which terminates the current line strip
+                // and begins a new one. This permits many strips to be batched into a single primitive.
                 const restart = _common_gltf_GltfSchema__WEBPACK_IMPORTED_MODULE_12__.GltfDataType.UnsignedByte === bufferView.type ? 0xff : (_common_gltf_GltfSchema__WEBPACK_IMPORTED_MODULE_12__.GltfDataType.UnsignedShort === bufferView.type ? 0xffff : 0xffffffff);
                 for (const index of data.buffer) {
                     if (index === restart) {
@@ -181956,8 +181955,7 @@ class ElementSetTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_9__.Primiti
             // When assembly parent is selected, pick all geometric elements with it as the parent.
             // When assembly member is selected, pick the parent as well as all the other members.
             const ecsql = `SELECT ECInstanceId as id, Parent.Id as parentId FROM BisCore.GeometricElement WHERE Parent.Id IN (SELECT Parent.Id as parentId FROM BisCore.GeometricElement WHERE (parent.Id IS NOT NULL AND ECInstanceId IN (${id})) OR parent.Id IN (${id}))`;
-            // eslint-disable-next-line @typescript-eslint/no-deprecated
-            for await (const row of this.iModel.createQueryReader(ecsql, undefined, { rowFormat: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.QueryRowFormat.UseJsPropertyNames })) {
+            for await (const row of this.iModel.createQueryReader(ecsql, undefined, { rowFormat: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.QueryRowFormat.UseECSqlPropertyNames })) {
                 ids.add(row.parentId);
                 ids.add(row.id);
             }
@@ -221619,12 +221617,14 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
         return true;
     }
     /** Test the fraction by strict parameter, but allow toleranced distance test at ends. */
-    acceptFractionOnLine(extend0, fraction, extend1, pointA, pointB, tolerance = _Geometry__WEBPACK_IMPORTED_MODULE_4__.Geometry.smallMetricDistance) {
+    acceptFractionOnLine(extend0, fraction, extend1, pointA, pointB) {
         if (!extend0 && fraction < 0) {
-            return _Geometry__WEBPACK_IMPORTED_MODULE_4__.Geometry.isDistanceWithinTol(fraction * pointA.distanceXY(pointB), tolerance);
+            return _Geometry__WEBPACK_IMPORTED_MODULE_4__.Geometry.isDistanceWithinTol(fraction * fraction * pointA.distanceSquaredXY(pointB), this._coincidentGeometryContext.tolerance * this._coincidentGeometryContext.tolerance);
+        }
+        else if (!extend1 && fraction > 1.0) {
+            const f = fraction - 1;
+            return _Geometry__WEBPACK_IMPORTED_MODULE_4__.Geometry.isDistanceWithinTol(f * f * pointA.distanceSquaredXY(pointB), this._coincidentGeometryContext.tolerance * this._coincidentGeometryContext.tolerance);
         }
-        else if (!extend1 && fraction > 1.0)
-            return _Geometry__WEBPACK_IMPORTED_MODULE_4__.Geometry.isDistanceWithinTol((fraction - 1.0) * pointA.distanceXY(pointB), tolerance);
         return true;
     }
     /**
@@ -221638,7 +221638,7 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
         return result;
     }
     /**
-     * Record the pre-computed intersection between two curves. Filter by extension rules. Record with fraction mapping.
+     * Record the pre-computed intersection between two curves. Record with fraction mapping.
      * @param localFractionA intersection fraction local to the subcurve of cpA between fractionA0 and fractionA1
      * @param cpA the first curve
      * @param fractionA0 start of the subcurve of cpA
@@ -221718,8 +221718,7 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
     computeSegmentSegment3D(cpA, extendA0, pointA0, fractionA0, pointA1, fractionA1, extendA1, cpB, extendB0, pointB0, fractionB0, pointB1, fractionB1, extendB1, reversed) {
         const aDir = { x: pointA1.x - pointA0.x, y: pointA1.y - pointA0.y };
         const bDir = { x: pointB1.x - pointB0.x, y: pointB1.y - pointB0.y };
-        const tol = this._coincidentGeometryContext.tolerance;
-        const fractions = _numerics_SmallSystem__WEBPACK_IMPORTED_MODULE_8__.SmallSystem.lineSegmentXYUVIntersectionUnbounded(pointA0, aDir, pointB0, bDir, tol);
+        const fractions = _numerics_SmallSystem__WEBPACK_IMPORTED_MODULE_8__.SmallSystem.lineSegmentXYUVIntersectionUnbounded(pointA0, aDir, pointB0, bDir, this._coincidentGeometryContext.tolerance);
         if (!fractions)
             return;
         if (fractions.f1) { // the lines are coincident
@@ -221732,8 +221731,8 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
                 this.recordPointWithLocalFractions(overlap.detailA.fraction, cpA, fractionA0, fractionA1, overlap.detailB.fraction, cpB, fractionB0, fractionB1, reversed, overlap);
         }
         else { // the lines have a transverse intersection
-            if (this.acceptFractionOnLine(extendA0, fractions.f0.x, extendA1, pointA0, pointA1, tol)) {
-                if (this.acceptFractionOnLine(extendB0, fractions.f0.y, extendB1, pointB0, pointB1, tol))
+            if (this.acceptFractionOnLine(extendA0, fractions.f0.x, extendA1, pointA0, pointA1)) {
+                if (this.acceptFractionOnLine(extendB0, fractions.f0.y, extendB1, pointB0, pointB1))
                     this.recordPointWithLocalFractions(fractions.f0.x, cpA, fractionA0, fractionA1, fractions.f0.y, cpB, fractionB0, fractionB1, reversed);
             }
         }
@@ -221798,10 +221797,6 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
         // solve for theta; evaluate points; project back to line
         if (this._worldToLocalPerspective) {
             const data = arc.toTransformedPoint4d(this._worldToLocalPerspective);
-            const radians0 = data.sweep.fractionToRadians(0);
-            const pointB0H = data.center.plus2Scaled(data.vector0, Math.cos(radians0), data.vector90, Math.sin(radians0));
-            const radians1 = data.sweep.fractionToRadians(1);
-            const pointB1H = data.center.plus2Scaled(data.vector0, Math.cos(radians1), data.vector90, Math.sin(radians1));
             const pointA0H = this._worldToLocalPerspective.multiplyPoint3d(pointA0, 1);
             const pointA1H = this._worldToLocalPerspective.multiplyPoint3d(pointA1, 1);
             const alpha = _Geometry__WEBPACK_IMPORTED_MODULE_4__.Geometry.tripleProductPoint4dXYW(pointA0H, pointA1H, data.center);
@@ -221810,35 +221805,49 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
             let numRoots = _numerics_Polynomials__WEBPACK_IMPORTED_MODULE_10__.AnalyticRoots.appendImplicitLineUnitCircleIntersections(alpha, beta, gamma, cosines, sines, radians, tol2);
             const closeApproach = (0 === numRoots);
             if (closeApproach)
-                numRoots = 1; // we returned the arc's closest approach as the first "root"; if within tolerance and at endpoints, we record it
-            const acceptSolution = (iRoot, checkOnlyEndPointDistance = false) => {
-                const arcPoint = data.center.plus2Scaled(data.vector0, cosines.atUncheckedIndex(iRoot), data.vector90, sines.atUncheckedIndex(iRoot));
-                let fArc = data.sweep.radiansToSignedFraction(radians.atUncheckedIndex(iRoot), extendB0);
-                let fLine = _numerics_SmallSystem__WEBPACK_IMPORTED_MODULE_8__.SmallSystem.lineSegment3dHXYClosestPointUnbounded(pointA0H, pointA1H, arcPoint);
-                if (fLine === undefined)
-                    return undefined;
-                if (!checkOnlyEndPointDistance && this.acceptFraction(extendA0, fLine, extendA1) && this.acceptFraction(extendB0, fArc, extendB1))
-                    return { fLine, fArc };
-                // check for an endpoint intersection that is beyond parametric tolerance but within point tolerance
-                fLine = fLine < 0.5 ? 0 : 1;
-                fArc = data.sweep.fractionToSignedPeriodicFraction(fArc) < 0.5 ? 0 : 1;
-                const pointAH = fLine ? pointA1H : pointA0H;
-                const pointBH = fArc ? pointB1H : pointB0H;
-                const dist2 = pointAH.realDistanceSquaredXY(pointBH);
-                return (dist2 !== undefined && _Geometry__WEBPACK_IMPORTED_MODULE_4__.Geometry.isDistanceWithinTol(dist2, tol2)) ? { fLine, fArc } : undefined;
-            };
+                numRoots = 1; // arc closest approach is the first entry
+            let numAccepted = 0;
             for (let i = 0; i < numRoots; i++) {
-                const result = acceptSolution(i, closeApproach);
-                if (result)
-                    this.recordPointWithLocalFractions(result.fLine, cpA, fractionA0, fractionA1, result.fArc, arc, 0, 1, reversed);
+                const arcPoint = data.center.plus2Scaled(data.vector0, cosines.atUncheckedIndex(i), data.vector90, sines.atUncheckedIndex(i));
+                const fArc = data.sweep.radiansToSignedFraction(radians.atUncheckedIndex(i), extendB0);
+                const fLine = _numerics_SmallSystem__WEBPACK_IMPORTED_MODULE_8__.SmallSystem.lineSegment3dHXYClosestPointUnbounded(pointA0H, pointA1H, arcPoint);
+                if (fLine === undefined)
+                    continue;
+                if (closeApproach) {
+                    const linePoint = pointA0H.interpolate(fLine, pointA1H);
+                    const dist2 = arcPoint.realDistanceSquaredXY(linePoint);
+                    if (dist2 === undefined || !_Geometry__WEBPACK_IMPORTED_MODULE_4__.Geometry.isDistanceWithinTol(dist2, tol2))
+                        continue;
+                }
+                if (this.acceptFraction(extendA0, fLine, extendA1) && this.acceptFraction(extendB0, fArc, extendB1)) {
+                    this.recordPointWithLocalFractions(fLine, cpA, fractionA0, fractionA1, fArc, arc, 0, 1, reversed);
+                    numAccepted++;
+                }
+            }
+            if (numAccepted === 0 && !arc.sweep.isFullCircle) {
+                // check for endpoint intersection beyond parametric tolerance but within point tolerance
+                const pointB0H = this._worldToLocalPerspective.multiplyPoint3d(arc.startPoint(), 1);
+                const pointB1H = this._worldToLocalPerspective.multiplyPoint3d(arc.endPoint(), 1);
+                const dist2 = [];
+                let d2 = pointA0H.realDistanceSquaredXY(pointB0H);
+                if (d2 !== undefined)
+                    dist2.push({ d2, fA: 0, fB: 0 });
+                d2 = pointA0H.realDistanceSquaredXY(pointB1H);
+                if (d2 !== undefined)
+                    dist2.push({ d2, fA: 0, fB: 1 });
+                d2 = pointA1H.realDistanceSquaredXY(pointB0H);
+                if (d2 !== undefined)
+                    dist2.push({ d2, fA: 1, fB: 0 });
+                d2 = pointA1H.realDistanceSquaredXY(pointB1H);
+                if (d2 !== undefined)
+                    dist2.push({ d2, fA: 1, fB: 1 });
+                dist2.sort((a, b) => a.d2 - b.d2);
+                if (_Geometry__WEBPACK_IMPORTED_MODULE_4__.Geometry.isDistanceWithinTol(dist2[0].d2, tol2))
+                    this.recordPointWithLocalFractions(dist2[0].fA, cpA, fractionA0, fractionA1, dist2[0].fB, arc, 0, 1, reversed);
             }
         }
         else {
             const data = arc.toTransformedVectors(this._worldToLocalAffine);
-            const radians0 = data.sweep.fractionToRadians(0);
-            const pointB0Local = data.center.plus2Scaled(data.vector0, Math.cos(radians0), data.vector90, Math.sin(radians0));
-            const radians1 = data.sweep.fractionToRadians(1);
-            const pointB1Local = data.center.plus2Scaled(data.vector0, Math.cos(radians1), data.vector90, Math.sin(radians1));
             let pointA0Local = pointA0;
             let pointA1Local = pointA1;
             if (this._worldToLocalAffine) {
@@ -221851,27 +221860,40 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
             let numRoots = _numerics_Polynomials__WEBPACK_IMPORTED_MODULE_10__.AnalyticRoots.appendImplicitLineUnitCircleIntersections(alpha, beta, gamma, cosines, sines, radians, tol2);
             const closeApproach = (0 === numRoots);
             if (closeApproach)
-                numRoots = 1; // we returned the arc's closest approach as the first "root"; if within tolerance and at endpoints, we record it
-            const acceptSolution = (iRoot, checkOnlyEndPointDistance = false) => {
-                const arcPoint = data.center.plus2Scaled(data.vector0, cosines.atUncheckedIndex(iRoot), data.vector90, sines.atUncheckedIndex(iRoot));
-                let fArc = data.sweep.radiansToSignedFraction(radians.atUncheckedIndex(iRoot), extendB0);
-                let fLine = _numerics_SmallSystem__WEBPACK_IMPORTED_MODULE_8__.SmallSystem.lineSegment3dXYClosestPointUnbounded(pointA0Local, pointA1Local, arcPoint);
-                if (fLine === undefined)
-                    return undefined;
-                if (!checkOnlyEndPointDistance && this.acceptFraction(extendA0, fLine, extendA1) && this.acceptFraction(extendB0, fArc, extendB1))
-                    return { fLine, fArc };
-                // check for an endpoint intersection that is beyond parametric tolerance but within point tolerance
-                fLine = fLine < 0.5 ? 0 : 1;
-                fArc = data.sweep.fractionToSignedPeriodicFraction(fArc) < 0.5 ? 0 : 1;
-                const pointALocal = fLine ? pointA1Local : pointA0Local;
-                const pointBLocal = fArc ? pointB1Local : pointB0Local;
-                const dist2 = pointALocal.distanceSquaredXY(pointBLocal);
-                return _Geometry__WEBPACK_IMPORTED_MODULE_4__.Geometry.isDistanceWithinTol(dist2, tol2) ? { fLine, fArc } : undefined;
-            };
+                numRoots = 1; // arc closest approach is the first entry
+            let numAccepted = 0;
             for (let i = 0; i < numRoots; i++) {
-                const result = acceptSolution(i, closeApproach);
-                if (result)
-                    this.recordPointWithLocalFractions(result.fLine, cpA, fractionA0, fractionA1, result.fArc, arc, 0, 1, reversed);
+                const arcPoint = data.center.plus2Scaled(data.vector0, cosines.atUncheckedIndex(i), data.vector90, sines.atUncheckedIndex(i));
+                const fArc = data.sweep.radiansToSignedFraction(radians.atUncheckedIndex(i), extendB0);
+                const fLine = _numerics_SmallSystem__WEBPACK_IMPORTED_MODULE_8__.SmallSystem.lineSegment3dXYClosestPointUnbounded(pointA0Local, pointA1Local, arcPoint);
+                if (fLine === undefined)
+                    continue;
+                if (closeApproach) {
+                    const linePoint = pointA0Local.interpolate(fLine, pointA1Local);
+                    if (!_Geometry__WEBPACK_IMPORTED_MODULE_4__.Geometry.isDistanceWithinTol(arcPoint.distanceSquaredXY(linePoint), tol2))
+                        continue;
+                }
+                if (this.acceptFraction(extendA0, fLine, extendA1) && this.acceptFraction(extendB0, fArc, extendB1)) {
+                    this.recordPointWithLocalFractions(fLine, cpA, fractionA0, fractionA1, fArc, arc, 0, 1, reversed);
+                    numAccepted++;
+                }
+            }
+            if (numAccepted === 0 && !arc.sweep.isFullCircle) {
+                // check for endpoint intersection beyond parametric tolerance but within point tolerance
+                const pointB0Local = arc.startPoint();
+                const pointB1Local = arc.endPoint();
+                if (this._worldToLocalAffine) {
+                    this._worldToLocalAffine.multiplyXYAndZInPlace(pointB0Local);
+                    this._worldToLocalAffine.multiplyXYAndZInPlace(pointB1Local);
+                }
+                const dist2 = [];
+                dist2.push({ d2: pointA0Local.distanceSquaredXY(pointB0Local), fA: 0, fB: 0 });
+                dist2.push({ d2: pointA0Local.distanceSquaredXY(pointB1Local), fA: 0, fB: 1 });
+                dist2.push({ d2: pointA1Local.distanceSquaredXY(pointB0Local), fA: 1, fB: 0 });
+                dist2.push({ d2: pointA1Local.distanceSquaredXY(pointB1Local), fA: 1, fB: 1 });
+                dist2.sort((a, b) => a.d2 - b.d2);
+                if (_Geometry__WEBPACK_IMPORTED_MODULE_4__.Geometry.isDistanceWithinTol(dist2[0].d2, tol2))
+                    this.recordPointWithLocalFractions(dist2[0].fA, cpA, fractionA0, fractionA1, dist2[0].fB, arc, 0, 1, reversed);
             }
         }
     }
@@ -252818,10 +252840,7 @@ class Transform {
         // Tx = Mx + o so we return Mx + o
         return _Matrix3d__WEBPACK_IMPORTED_MODULE_2__.Matrix3d.xyzPlusMatrixTimesXYZ(this._origin, this._matrix, point, result);
     }
-    /**
-     * Transform the input 3d point in place (using `Tp = M*p + o`).
-     * Return as a new point or in the pre-allocated result (if result is given).
-     */
+    /** Transform the input 3d point in place (using `Tp = M*p + o`). */
     multiplyXYAndZInPlace(point) {
         return _Matrix3d__WEBPACK_IMPORTED_MODULE_2__.Matrix3d.xyzPlusMatrixTimesXYZInPlace(this._origin, this._matrix, point);
     }
@@ -259828,11 +259847,11 @@ class AnalyticRoots {
      *   * -2 -- all coefficients identically 0.   The entire c, s plane-- and therefore the entire unit circle-- is a solution.
      *   * -1 -- beta, gamma are zero, alpha is not.There is no line defined.There are no solutions.
      *   * 0 -- the line is well defined, but passes completely outside the unit circle.
-     *     * In this case, (c1, s1) is the circle point closest to the line and(c2, s2) is the line point closest to the circle.
+     *     * In this case, (c[0], s[0]) is the circle point closest to the line and (c[1], s[1]) is the line point closest to the circle.
      *   * 1 -- the line is tangent to the unit circle.
      *     * Tangency is determined by tolerances, which calls a "close approach" point a tangency.
-     *       * (c1, s1) is the closest circle point
-     *       * (c2, s2) is the line point.
+     *       * (c[0], s[0]) is the closest circle point
+     *       * (c[1], s[1]) is the line point.
      *   * 2 -- two simple intersections.
      * @param alpha constant coefficient on line
      * @param beta x cosine coefficient on line
@@ -259863,15 +259882,15 @@ class AnalyticRoots {
             if (D2 < -twoTol) {
                 const delta = Math.sqrt(delta2);
                 const iota = (alpha < 0) ? (1.0 / delta) : (-1.0 / delta);
-                this.appendCosSinRadians(lambda * beta, lambda * gamma, cosValues, sinValues, radiansValues);
                 this.appendCosSinRadians(beta * iota, gamma * iota, cosValues, sinValues, radiansValues);
+                this.appendCosSinRadians(lambda * beta, lambda * gamma, cosValues, sinValues, radiansValues);
                 solutionType = 0;
             }
             else if (D2 < twoTol) {
                 const delta = Math.sqrt(delta2);
                 const iota = (alpha < 0) ? (1.0 / delta) : (-1.0 / delta);
-                this.appendCosSinRadians(lambda * beta, lambda * gamma, cosValues, sinValues, radiansValues);
                 this.appendCosSinRadians(beta * iota, gamma * iota, cosValues, sinValues, radiansValues);
+                this.appendCosSinRadians(lambda * beta, lambda * gamma, cosValues, sinValues, radiansValues);
                 solutionType = 1;
             }
             else {
@@ -333045,7 +333064,7 @@ var loadLanguages = instance.loadLanguages;
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@itwin/core-frontend","version":"5.12.0-dev.11","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.10","@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/node":"~20.17.0","@types/sinon":"^17.0.2","@vitest/browser-playwright":"^4.1.8","@vitest/coverage-v8":"^4.1.8","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":"^4.1.8","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.12.0-dev.13","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.10","@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/node":"~20.17.0","@types/sinon":"^17.0.2","@vitest/browser-playwright":"^4.1.8","@vitest/coverage-v8":"^4.1.8","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":"^4.1.8","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"}}');
 
 /***/ })