@itwin/ecschema-rpcinterface-tests 5.4.0-dev.7 → 5.5.0-dev.2

package/lib/dist/bundled-tests.js

@@ -74241,9 +74241,20 @@ __webpack_require__.r(__webpack_exports__);
  * @public @preview
  */
 class SchemaJsonLocater {
-    _getSchema;
-    constructor(_getSchema) {
-        this._getSchema = _getSchema;
+    _getSchemaProps;
+    constructor(getSchemaProps) {
+        // Since the getSchemaProps may throw an error, but the locater contract defines that
+        // getSchema should return undefined if the schema could not be located, we wrap the provided
+        // lookup function in a safe block.
+        this._getSchemaProps = (schemaName) => {
+            try {
+                return getSchemaProps(schemaName);
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            }
+            catch (error) {
+                return undefined;
+            }
+        };
     }
     /** Get a schema by [SchemaKey]
      * @param schemaKey The [SchemaKey] that identifies the schema.
@@ -74261,7 +74272,7 @@ class SchemaJsonLocater {
      * @param matchType The match type to use when locating the schema
      */
     async getSchemaInfo(schemaKey, matchType, context) {
-        const schemaProps = this._getSchema(schemaKey.name);
+        const schemaProps = this._getSchemaProps(schemaKey.name);
         if (!schemaProps)
             return undefined;
         const schemaInfo = await _Metadata_Schema__WEBPACK_IMPORTED_MODULE_1__.Schema.startLoadingFromJson(schemaProps, context);
@@ -74276,7 +74287,7 @@ class SchemaJsonLocater {
      * @throws [Error]($ecschema-metadata) if the schema exists, but cannot be loaded.
      */
     getSchemaSync(schemaKey, _matchType, context) {
-        const schemaProps = this._getSchema(schemaKey.name);
+        const schemaProps = this._getSchemaProps(schemaKey.name);
         if (!schemaProps)
             return undefined;
         return _Metadata_Schema__WEBPACK_IMPORTED_MODULE_1__.Schema.fromJsonSync(schemaProps, context || new _Context__WEBPACK_IMPORTED_MODULE_0__.SchemaContext());
@@ -88078,6 +88089,7 @@ class IModelApp {
     static _realityDataAccess;
     static _publicPath;
     static _formatsProviderManager;
+    static _incrementalSchemaLoading;
     // No instances of IModelApp may be created. All members are static and must be on the singleton object IModelApp.
     constructor() { }
     /** Event raised just before the frontend IModelApp is to be [[shutdown]]. */
@@ -88135,6 +88147,13 @@ class IModelApp {
      * @beta
      */
     static get realityDataAccess() { return this._realityDataAccess; }
+    /**
+     * Indicates whether incremental schema loading is enabled.
+     * If not further specified, incremental schema loading is currently disabled by default.
+     * @beta
+     */
+    static get isIncrementalSchemaLoadingEnabled() { return this._incrementalSchemaLoading === "enabled"; }
+    ;
     /** Whether the [renderSystem[]] has been successfully initialized.
      * This will always be `false` before calling [[startup]] and after calling [[shutdown]].
      * In rare circumstances (e.g., while executing in a headless test environment) it may remain `false` due to a failure to
@@ -88262,6 +88281,7 @@ class IModelApp {
         this._realityDataSourceProviders = new _RealityDataSource__WEBPACK_IMPORTED_MODULE_25__.RealityDataSourceProviderRegistry();
         this._realityDataAccess = opts.realityDataAccess;
         this._formatsProviderManager = new _quantity_formatting_QuantityFormatter__WEBPACK_IMPORTED_MODULE_19__.FormatsProviderManager(opts.formatsProvider ?? new _quantity_formatting_QuantityFormatter__WEBPACK_IMPORTED_MODULE_19__.QuantityTypeFormatsProvider());
+        this._incrementalSchemaLoading = opts.incrementalSchemaLoading ?? "disabled";
         this._publicPath = opts.publicPath ?? "";
         if (this._publicPath !== "" && !this._publicPath.endsWith("/")) {
             this._publicPath += "/";
@@ -89110,8 +89130,12 @@ class IModelConnection extends _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.I
     get schemaContext() {
         if (this._schemaContext === undefined) {
             const context = new _itwin_ecschema_metadata__WEBPACK_IMPORTED_MODULE_15__.SchemaContext();
-            const locater = new _itwin_ecschema_rpcinterface_common__WEBPACK_IMPORTED_MODULE_16__.ECSchemaRpcLocater(this._getRpcProps());
-            context.addFallbackLocater(locater);
+            // While incremental schema loading is the prefered way to load schemas on the frontend, there might be cases where clients
+            // would want to use their own locaters, so if incremenal schema loading is disabled, the locater is not registered.
+            if (_IModelApp__WEBPACK_IMPORTED_MODULE_5__.IModelApp.isIncrementalSchemaLoadingEnabled) {
+                context.addLocater(new _itwin_ecschema_rpcinterface_common__WEBPACK_IMPORTED_MODULE_16__.RpcIncrementalSchemaLocater(this._getRpcProps()));
+            }
+            context.addFallbackLocater(new _itwin_ecschema_rpcinterface_common__WEBPACK_IMPORTED_MODULE_16__.ECSchemaRpcLocater(this._getRpcProps()));
             this._schemaContext = context;
         }
         return this._schemaContext;
@@ -93842,18 +93866,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @itwin/core-common */ "../../core/common/lib/esm/core-common.js");
 /* harmony import */ var _CategorySelectorState__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./CategorySelectorState */ "../../core/frontend/lib/esm/CategorySelectorState.js");
 /* harmony import */ var _DisplayStyleState__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./DisplayStyleState */ "../../core/frontend/lib/esm/DisplayStyleState.js");
-/* harmony import */ var _render_GraphicBranch__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./render/GraphicBranch */ "../../core/frontend/lib/esm/render/GraphicBranch.js");
-/* harmony import */ var _Frustum2d__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./Frustum2d */ "../../core/frontend/lib/esm/Frustum2d.js");
-/* harmony import */ var _internal_render_MockRender__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./internal/render/MockRender */ "../../core/frontend/lib/esm/internal/render/MockRender.js");
-/* harmony import */ var _render_FeatureSymbology__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./render/FeatureSymbology */ "../../core/frontend/lib/esm/render/FeatureSymbology.js");
-/* harmony import */ var _IModelApp__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./IModelApp */ "../../core/frontend/lib/esm/IModelApp.js");
-/* harmony import */ var _CoordSystem__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./CoordSystem */ "../../core/frontend/lib/esm/CoordSystem.js");
-/* harmony import */ var _Viewport__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./Viewport */ "../../core/frontend/lib/esm/Viewport.js");
-/* harmony import */ var _ViewState__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./ViewState */ "../../core/frontend/lib/esm/ViewState.js");
-/* harmony import */ var _tile_internal__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./tile/internal */ "../../core/frontend/lib/esm/tile/internal.js");
-/* harmony import */ var _common_ImageUtil__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./common/ImageUtil */ "../../core/frontend/lib/esm/common/ImageUtil.js");
-/* harmony import */ var _common_ViewRect__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./common/ViewRect */ "../../core/frontend/lib/esm/common/ViewRect.js");
-/* harmony import */ var _common_render_GraphicType__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./common/render/GraphicType */ "../../core/frontend/lib/esm/common/render/GraphicType.js");
+/* harmony import */ var _Frustum2d__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./Frustum2d */ "../../core/frontend/lib/esm/Frustum2d.js");
+/* harmony import */ var _ViewState__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./ViewState */ "../../core/frontend/lib/esm/ViewState.js");
+/* harmony import */ var _common_render_GraphicType__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./common/render/GraphicType */ "../../core/frontend/lib/esm/common/render/GraphicType.js");
+/* harmony import */ var _internal_SheetViewAttachments__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./internal/SheetViewAttachments */ "../../core/frontend/lib/esm/internal/SheetViewAttachments.js");
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
@@ -93870,14 +93886,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-
-
-
-
-
-
-
-
 // cSpell:ignore ovrs
 /** Describes the geometry and styling of a sheet border decoration.
  * The sheet border decoration mimics a sheet of paper with a drop shadow.
@@ -93946,206 +93954,25 @@ class SheetBorder {
         params.fillColor = fillColor;
         params.gradient = this._gradient;
         builder.activateGraphicParams(params);
-        builder.addShape2d(this._shadow, _Frustum2d__WEBPACK_IMPORTED_MODULE_6__.Frustum2d.minimumZDistance);
+        builder.addShape2d(this._shadow, _Frustum2d__WEBPACK_IMPORTED_MODULE_5__.Frustum2d.minimumZDistance);
         builder.setSymbology(lineColor, fillColor, 2);
         builder.addLineString2d(this._rect, 0);
     }
 }
-/** The information required to instantiate an ViewAttachments object to draw ViewAttachments into a sheet. The list of view attachment Ids is
- * supplied to SheetViewState via the constructor. The corresponding ViewAttachmentProps for each attachment are obtained asynchronously in
- * SheetViewState.load(). The Attachments object is created in SheetViewState.attachToViewport and disposed of in SheetViewState.detachFromViewport.
- */
-class ViewAttachmentsInfo {
-    _attachments;
-    get attachments() { return this._attachments; }
-    constructor(attachments) {
-        this._attachments = attachments;
-    }
-    get isLoaded() {
-        return 0 === this._attachments.length || "string" !== typeof this._attachments[0];
-    }
-    get viewAttachmentProps() {
-        return this.isLoaded ? this._props : [];
-    }
-    get _props() {
-        (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(this.isLoaded);
-        return this._attachments;
-    }
-    get _ids() {
-        (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(!this.isLoaded);
-        return this._attachments;
-    }
-    static fromJSON(ids = []) {
-        return new ViewAttachmentsInfo(ids);
-    }
-    toJSON() {
-        return this.isLoaded ? this._props.map((x) => (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.expectDefined)(x.id)) : [...this._ids];
-    }
-    clone(iModel) {
-        let attachments = this._attachments;
-        if (this.isLoaded) {
-            // Need to clone the attached ViewStates.
-            attachments = attachments.map((attachment) => {
-                (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(typeof attachment !== "string");
-                return {
-                    ...attachment,
-                    attachedView: attachment.attachedView.clone(iModel),
-                };
-            });
-        }
-        return new ViewAttachmentsInfo(attachments);
-    }
-    preload(options) {
-        if (this.isLoaded)
-            return;
-        options.sheetViewAttachmentIds = _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.CompressedId64Set.sortAndCompress(this._ids);
-        options.viewStateLoadProps = {
-            displayStyle: {
-                omitScheduleScriptElementIds: !_IModelApp__WEBPACK_IMPORTED_MODULE_9__.IModelApp.tileAdmin.enableFrontendScheduleScripts,
-                compressExcludedElementIds: true,
-            },
-        };
-    }
-    async postload(options, iModel) {
-        if (options.sheetViewViews === undefined)
-            return;
-        if (options.sheetViewAttachmentProps === undefined)
-            return;
-        const viewStateProps = options.sheetViewViews; // This is viewstateProps, need to turn this into ViewState
-        const promises = [];
-        for (const viewProps of viewStateProps) {
-            const loadView = async () => {
-                try {
-                    if (viewProps === undefined)
-                        return undefined;
-                    const view = await iModel.views.convertViewStatePropsToViewState(viewProps);
-                    return view;
-                }
-                catch {
-                    return undefined;
-                }
-            };
-            promises.push(loadView());
-        }
-        const views = await Promise.all(promises);
-        const attachmentProps = options.sheetViewAttachmentProps;
-        (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(views.length === attachmentProps.length);
-        const attachments = [];
-        for (let i = 0; i < views.length; i++) {
-            const view = views[i];
-            if (view && !(view instanceof SheetViewState)) {
-                const props = attachmentProps[i];
-                props.attachedView = view;
-                attachments.push(props);
-            }
-        }
-        this._attachments = attachments;
-    }
-    async load(iModel) {
-        if (this.isLoaded)
-            return;
-        const attachmentProps = await iModel.elements.getProps(this._ids);
-        const promises = [];
-        for (const attachment of attachmentProps) {
-            const loadView = async () => {
-                try {
-                    const view = await iModel.views.load(attachment.view.id);
-                    return view;
-                }
-                catch {
-                    return undefined;
-                }
-            };
-            promises.push(loadView());
-        }
-        const views = await Promise.all(promises);
-        (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(views.length === attachmentProps.length);
-        const attachments = [];
-        for (let i = 0; i < views.length; i++) {
-            const view = views[i];
-            if (view && !(view instanceof SheetViewState)) {
-                const props = attachmentProps[i];
-                props.attachedView = view;
-                attachments.push(props);
-            }
-        }
-        this._attachments = attachments;
-    }
-    createAttachments(sheetView) {
-        return this.isLoaded ? new ViewAttachments(this._props, sheetView) : undefined;
-    }
-}
-/** The set of view attachments to be displayed in a Viewport via a SheetViewState. Allocated when the view becomes attached to a Viewport;
- * disposed of when it becomes detached from the viewport.
- */
-class ViewAttachments {
-    _attachments = [];
-    maxDepth = _Frustum2d__WEBPACK_IMPORTED_MODULE_6__.Frustum2d.minimumZDistance;
-    constructor(infos, sheetView) {
-        for (const info of infos) {
-            const drawAsRaster = info.jsonProperties?.displayOptions?.drawAsRaster || (info.attachedView.is3d() && info.attachedView.isCameraOn);
-            const ctor = drawAsRaster ? RasterAttachment : OrthographicAttachment;
-            const attachment = new ctor(info.attachedView, info, sheetView);
-            this._attachments.push(attachment);
-            this.maxDepth = Math.max(this.maxDepth, attachment.zDepth);
-        }
-    }
-    [Symbol.dispose]() {
-        for (const attachment of this._attachments)
-            attachment[Symbol.dispose]();
-        this._attachments.length = 0;
-    }
-    [Symbol.iterator]() {
-        return this._attachments[Symbol.iterator]();
-    }
-    /** For tests. */
-    get attachments() {
-        return this._attachments;
-    }
-    get isEmpty() {
-        return 0 === this._attachments.length;
-    }
-    areAllTileTreesLoaded(displayedExtents) {
-        return this._attachments.every((x) => {
-            const placement = _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.Placement2d.fromJSON(x.viewAttachmentProps.placement);
-            const attachmentRange = placement.calculateRange();
-            if (!attachmentRange.intersectsRangeXY(displayedExtents))
-                return true;
-            return x.areAllTileTreesLoaded;
-        });
-    }
-    /** Strictly for testing purposes */
-    areAllAttachmentsLoaded() {
-        return this._attachments.every((attachment) => attachment.areAllTileTreesLoaded);
-    }
-    discloseTileTrees(trees) {
-        for (const attachment of this._attachments)
-            trees.disclose(attachment);
-    }
-    collectStatistics(stats) {
-        for (const attachment of this._attachments)
-            attachment.collectStatistics(stats);
-    }
-    addToScene(context) {
-        for (const attachment of this._attachments)
-            attachment.addToScene(context);
-    }
-    findById(attachmentId) {
-        return this._attachments.find((attachment) => attachment.viewAttachmentProps.id === attachmentId);
-    }
-}
 /** A view of a [SheetModel]($backend).
  * @public
  * @extensions
  */
-class SheetViewState extends _ViewState__WEBPACK_IMPORTED_MODULE_12__.ViewState2d {
+class SheetViewState extends _ViewState__WEBPACK_IMPORTED_MODULE_6__.ViewState2d {
     /** The width and height of the sheet in world coordinates. */
     sheetSize;
-    _attachmentsInfo;
-    _attachments;
+    _viewAttachments;
     _viewedExtents;
+    _onViewAttachmentsReloaded = () => undefined;
+    /** Strictly for tests. */
+    onViewAttachmentsReloaded = new _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.BeEvent();
     get attachmentIds() {
-        return this._attachmentsInfo.toJSON();
+        return this._viewAttachments.attachmentIds;
     }
     static get className() { return "SheetViewDefinition"; }
     static createFromProps(viewStateData, iModel) {
@@ -94156,7 +93983,7 @@ class SheetViewState extends _ViewState__WEBPACK_IMPORTED_MODULE_12__.ViewState2
     }
     toProps() {
         const props = super.toProps();
-        props.sheetAttachments = this._attachmentsInfo.toJSON();
+        props.sheetAttachments = [...this.attachmentIds];
         // For sheetProps all that is actually used is the size, so just null out everything else.
         const codeProps = { spec: "", scope: "", value: "" };
         props.sheetProps = {
@@ -94171,20 +93998,15 @@ class SheetViewState extends _ViewState__WEBPACK_IMPORTED_MODULE_12__.ViewState2
     }
     /** Strictly for testing. @internal */
     get viewAttachmentProps() {
-        return this._attachmentsInfo.viewAttachmentProps.map((x) => {
-            return {
-                ...x,
-                attachedView: undefined,
-            };
-        });
+        return this._viewAttachments.attachmentProps;
     }
     /** Strictly for testing. @internal */
     get viewAttachmentInfos() {
-        return this._attachmentsInfo.attachments;
+        return this._viewAttachments.attachmentInfos;
     }
     /** Strictly for testing. @internal */
     get attachments() {
-        return this._attachments?.attachments;
+        return this._viewAttachments.attachments;
     }
     isDrawingView() { return false; }
     isSheetView() { return true; }
@@ -94193,41 +94015,53 @@ class SheetViewState extends _ViewState__WEBPACK_IMPORTED_MODULE_12__.ViewState2
         if (categories instanceof SheetViewState) {
             // we are coming from clone...
             this.sheetSize = categories.sheetSize.clone();
-            this._attachmentsInfo = categories._attachmentsInfo.clone(iModel);
+            this._viewAttachments = categories._viewAttachments.clone(iModel);
             this._viewedExtents = categories._viewedExtents.clone();
         }
         else {
             this.sheetSize = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Point2d.create(sheetProps.width, sheetProps.height);
-            this._attachmentsInfo = ViewAttachmentsInfo.fromJSON(attachments);
+            this._viewAttachments = _internal_SheetViewAttachments__WEBPACK_IMPORTED_MODULE_8__.SheetViewAttachments.create(attachments);
             const extents = new _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Range3d(0, 0, 0, this.sheetSize.x, this.sheetSize.y, 0);
             const margin = 1.1;
             extents.scaleAboutCenterInPlace(margin);
             this._viewedExtents = extents;
         }
+        if (iModel.isBriefcaseConnection()) {
+            iModel.txns.onElementsChanged.addListener(async (changes) => {
+                let reload = false;
+                for (const change of changes.filter({ includeMetadata: (meta) => meta.is("BisCore:ViewAttachment") })) {
+                    if (change.type === "inserted" || this._viewAttachments.attachmentIds.includes(change.id)) {
+                        reload = true;
+                        break;
+                    }
+                }
+                if (reload) {
+                    await this._viewAttachments.reload(this.baseModelId, iModel);
+                    this._onViewAttachmentsReloaded();
+                    this.onViewAttachmentsReloaded.raiseEvent();
+                }
+            });
+        }
     }
     getOrigin() {
         const origin = super.getOrigin();
-        if (this._attachments)
-            origin.z = -this._attachments.maxDepth;
+        origin.z = -this._viewAttachments.maxDepth;
         return origin;
     }
     getExtents() {
         const extents = super.getExtents();
-        if (this._attachments)
-            extents.z = this._attachments.maxDepth + _Frustum2d__WEBPACK_IMPORTED_MODULE_6__.Frustum2d.minimumZDistance;
+        extents.z = this._viewAttachments.maxDepth + _Frustum2d__WEBPACK_IMPORTED_MODULE_5__.Frustum2d.minimumZDistance;
         return extents;
     }
     /** Overrides [[ViewState.discloseTileTrees]] to include tile trees associated with [ViewAttachment]($backend)s displayed on this sheet. */
     discloseTileTrees(trees) {
         super.discloseTileTrees(trees);
-        if (this._attachments)
-            trees.disclose(this._attachments);
+        trees.disclose(this._viewAttachments);
     }
     /** @internal */
     collectNonTileTreeStatistics(stats) {
         super.collectNonTileTreeStatistics(stats);
-        if (this._attachments)
-            this._attachments.collectStatistics(stats);
+        this._viewAttachments.collectStatistics(stats);
     }
     get defaultExtentLimits() {
         return { min: _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Constant.oneMillimeter, max: this.sheetSize.magnitude() * 10 };
@@ -94238,36 +94072,23 @@ class SheetViewState extends _ViewState__WEBPACK_IMPORTED_MODULE_12__.ViewState2
     /** @internal */
     preload(hydrateRequest) {
         super.preload(hydrateRequest);
-        this._attachmentsInfo.preload(hydrateRequest);
+        this._viewAttachments.preload(hydrateRequest);
     }
     /** @internal */
     async postload(hydrateResponse) {
         const promises = [];
         promises.push(super.postload(hydrateResponse));
-        promises.push(this._attachmentsInfo.postload(hydrateResponse, this.iModel));
+        promises.push(this._viewAttachments.postload(hydrateResponse, this.iModel));
         await Promise.all(promises);
     }
     /** @internal */
     createScene(context) {
         super.createScene(context);
-        if (this._attachments)
-            this._attachments.addToScene(context);
+        this._viewAttachments.addToScene(context);
     }
     /** @internal */
     get secondaryViewports() {
-        if (this._attachments === undefined)
-            return super.secondaryViewports;
-        const attachments = this._attachments;
-        function* iterator() {
-            for (const attachment of attachments) {
-                const vp = attachment.viewport;
-                if (vp)
-                    yield vp;
-            }
-        }
-        return {
-            [Symbol.iterator]: () => iterator(),
-        };
+        return this._viewAttachments.getSecondaryViewports();
     }
     /** @internal */
     async queryAttachmentIds() {
@@ -94280,39 +94101,43 @@ class SheetViewState extends _ViewState__WEBPACK_IMPORTED_MODULE_12__.ViewState2
     async changeViewedModel(modelId) {
         await super.changeViewedModel(modelId);
         const attachmentIds = await this.queryAttachmentIds();
-        this._attachmentsInfo = ViewAttachmentsInfo.fromJSON(attachmentIds);
-        (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(undefined === this._attachments);
+        (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.dispose)(this._viewAttachments);
+        this._viewAttachments = _internal_SheetViewAttachments__WEBPACK_IMPORTED_MODULE_8__.SheetViewAttachments.create(attachmentIds);
     }
     /** See [[ViewState.attachToViewport]]. */
     attachToViewport(args) {
         super.attachToViewport(args);
-        (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(undefined === this._attachments);
-        this._attachments = this._attachmentsInfo.createAttachments(this);
+        this._viewAttachments.attachToViewport({
+            backgroundColor: this.displayStyle.backgroundColor,
+            sheetModelId: this.baseModelId,
+        });
+        this._onViewAttachmentsReloaded = () => args.invalidateController();
     }
     /** See [[ViewState.detachFromViewport]]. */
     detachFromViewport() {
         super.detachFromViewport();
-        this._attachments = (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.dispose)(this._attachments);
+        this._viewAttachments.detachFromViewport();
+        this._onViewAttachmentsReloaded = () => undefined;
     }
     get areAllTileTreesLoaded() {
+        if (!super.areAllTileTreesLoaded) {
+            return false;
+        }
         let displayedExtents = this._viewedExtents;
         const frustum = this.calculateFrustum();
         if (frustum) {
             displayedExtents = frustum.toRange();
         }
-        return super.areAllTileTreesLoaded && (!this._attachments || this._attachments.areAllTileTreesLoaded(displayedExtents));
+        return this._viewAttachments.areAllTileTreesLoaded(displayedExtents);
     }
     /** @internal Strictly for testing */
     areAllAttachmentsLoaded() {
-        if (this._attachments) {
-            return this._attachments.areAllAttachmentsLoaded();
-        }
-        return true;
+        return this._viewAttachments.areAllAttachmentsLoaded();
     }
     /** Create a sheet border decoration graphic. */
     createBorder(width, height, context) {
         const border = SheetBorder.create(width, height, context);
-        const builder = context.createGraphicBuilder(_common_render_GraphicType__WEBPACK_IMPORTED_MODULE_16__.GraphicType.ViewBackground);
+        const builder = context.createGraphicBuilder(_common_render_GraphicType__WEBPACK_IMPORTED_MODULE_7__.GraphicType.ViewBackground);
         border.addToBuilder(builder);
         return builder.finish();
     }
@@ -94332,453 +94157,13 @@ class SheetViewState extends _ViewState__WEBPACK_IMPORTED_MODULE_12__.ViewState2
     }
     /** @internal */
     getAttachmentViewport(args) {
-        const attachment = args.viewAttachmentId ? this._attachments?.findById(args.viewAttachmentId) : undefined;
-        if (!attachment) {
-            return undefined;
-        }
-        return args.inSectionDrawingAttachment ? attachment.viewport?.view.getAttachmentViewport({ inSectionDrawingAttachment: true }) : attachment.viewport;
+        return this._viewAttachments.getAttachmentViewport(args);
     }
     /** @beta */
     computeDisplayTransform(args) {
         // ###TODO we're currently ignoring model and element Id in args, assuming irrelevant for sheets.
         // Should probably call super or have super call us.
-        const attachment = undefined !== args.viewAttachmentId ? this._attachments?.findById(args.viewAttachmentId) : undefined;
-        if (!attachment || !(attachment instanceof OrthographicAttachment)) {
-            return undefined;
-        }
-        const sheetTransform = attachment.toSheet;
-        const sectionTransform = args.inSectionDrawingAttachment ? attachment.view.computeDisplayTransform(args) : undefined;
-        if (!sectionTransform) {
-            return sheetTransform.clone(args.output);
-        }
-        return sheetTransform.multiplyTransformTransform(sectionTransform, args.output);
-    }
-}
-/** A mostly no-op RenderTarget for an Attachment.
- * its Scene and symbology overrides.
- */
-class AttachmentTarget extends _internal_render_MockRender__WEBPACK_IMPORTED_MODULE_7__.MockRender.OffScreenTarget {
-    _attachment;
-    constructor(attachment) {
-        // The dimensions don't matter - we're not drawing anything.
-        const rect = new _common_ViewRect__WEBPACK_IMPORTED_MODULE_15__.ViewRect(1, 1);
-        super(_IModelApp__WEBPACK_IMPORTED_MODULE_9__.IModelApp.renderSystem, rect);
-        this._attachment = attachment;
-    }
-    changeScene(scene) {
-        this._attachment.scene = scene;
-    }
-    overrideFeatureSymbology(ovrs) {
-        this._attachment.symbologyOverrides = ovrs;
-    }
-}
-/** Draws the contents a 2d or orthographic 3d view directly into a sheet view.
- * We select tiles for the view in the context of a light-weight offscreen viewport with a no-op RenderTarget, then
- * collect the resultant graphics and add them to the sheet view's scene.
- */
-class OrthographicAttachment {
-    _viewport;
-    _props;
-    _sheetModelId;
-    _viewFlagOverrides;
-    _toSheet;
-    _fromSheet;
-    _sizeInMeters;
-    _range;
-    _viewRect = new _common_ViewRect__WEBPACK_IMPORTED_MODULE_15__.ViewRect(0, 0, 1, 1);
-    _originalFrustum = new _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.Frustum();
-    _clipVolume;
-    _hiddenLineSettings;
-    _scale;
-    _debugFeatureTable;
-    scene;
-    symbologyOverrides;
-    zDepth;
-    get view() {
-        return this._viewport.view;
-    }
-    get viewAttachmentProps() {
-        return this._props;
-    }
-    get viewport() {
-        return this._viewport;
-    }
-    constructor(view, props, sheetView) {
-        this.symbologyOverrides = new _render_FeatureSymbology__WEBPACK_IMPORTED_MODULE_8__.FeatureSymbology.Overrides(view);
-        const target = new AttachmentTarget(this);
-        this._viewport = _Viewport__WEBPACK_IMPORTED_MODULE_11__.OffScreenViewport.createViewport(view, target, true);
-        this._props = props;
-        this._sheetModelId = sheetView.baseModelId;
-        const applyClip = true; // set to false for debugging
-        this._viewFlagOverrides = {
-            ...view.viewFlags,
-            clipVolume: applyClip,
-            lighting: false,
-            shadows: false,
-        };
-        const placement = _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.Placement2d.fromJSON(props.placement);
-        const range = placement.calculateRange();
-        this._range = range;
-        this._sizeInMeters = new _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Point2d(range.xLength(), range.yLength());
-        // Compute transform from attached view's world coordinates to sheet's world coordinates.
-        // NB: We obtain the extents and origin from the *viewport* not the *view* - they may have been adjusted by the viewport.
-        const applySkew = true; // set to false for debugging
-        const skew = applySkew ? view.getAspectRatioSkew() : 1;
-        const extents = this._viewport.viewingSpace.viewDelta.clone();
-        const zDepth = Math.abs(extents.z);
-        const scaleX = this._sizeInMeters.x / Math.abs(extents.x);
-        const scaleY = skew * this._sizeInMeters.y / Math.abs(extents.y);
-        this._scale = { x: 1 / scaleX, y: 1 / scaleY };
-        const zBias = _Frustum2d__WEBPACK_IMPORTED_MODULE_6__.Frustum2d.depthFromDisplayPriority(props.jsonProperties?.displayPriority ?? 0);
-        this.zDepth = 1.01 * (zDepth - zBias); // give a little padding so that geometry right up against far plane doesn't get clipped.
-        // View origin is at the *back* of the view. Align *front* of view based on display priority.
-        const viewRot = view.getRotation();
-        const viewOrg = viewRot.multiplyVector(this._viewport.viewingSpace.viewOrigin);
-        viewOrg.z += zDepth;
-        viewRot.multiplyTransposeVectorInPlace(viewOrg);
-        const matrix = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Matrix3d.createScale(scaleX, scaleY, 1);
-        matrix.multiplyMatrixMatrix(viewRot, matrix);
-        const origin = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Matrix3d.xyzMinusMatrixTimesXYZ(viewOrg, matrix, viewOrg);
-        const attachmentOrigin = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Point3d.createFrom(placement.origin);
-        attachmentOrigin.z = zBias;
-        const viewOrgToAttachment = attachmentOrigin.minus(viewOrg);
-        origin.addInPlace(viewOrgToAttachment);
-        this._toSheet = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Transform.createRefs(origin, matrix);
-        this._fromSheet = (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.expectDefined)(this._toSheet.inverse());
-        // If the attached view is a section drawing, it may itself have an attached spatial view with a clip.
-        // The clip needs to be transformed into sheet space.
-        if (view.isDrawingView())
-            this._viewport.drawingToSheetTransform = this._toSheet;
-        // ###TODO? If we also apply the attachment's clip to the attached view, we may get additional culling during tile selection.
-        // However the attached view's frustum is already clipped by intersection with sheet view's frustum, and additional clipping planes
-        // introduce additional computation, so possibly not worth it.
-        // Transform the view's clip (if any) to sheet space
-        let viewClip = view.viewFlags.clipVolume ? view.getViewClip()?.clone() : undefined;
-        if (viewClip)
-            viewClip.transformInPlace(this._toSheet);
-        else
-            viewClip = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.ClipVector.createEmpty();
-        let sheetClip;
-        if (undefined !== props.jsonProperties?.clip)
-            sheetClip = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.ClipVector.fromJSON(props.jsonProperties?.clip);
-        if (sheetClip && sheetClip.isValid) {
-            // Clip to view attachment's clip. NB: clip is in sheet coordinate space.
-            for (const clip of sheetClip.clips)
-                viewClip.clips.push(clip);
-        }
-        else {
-            // Clip to view attachment's bounding box
-            viewClip.appendShape([
-                _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Point3d.create(this._range.low.x, this._range.low.y),
-                _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Point3d.create(this._range.high.x, this._range.low.y),
-                _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Point3d.create(this._range.high.x, this._range.high.y),
-                _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Point3d.create(this._range.low.x, this._range.high.y),
-            ]);
-        }
-        this._clipVolume = _IModelApp__WEBPACK_IMPORTED_MODULE_9__.IModelApp.renderSystem.createClipVolume(viewClip);
-        // Save off the original frustum (potentially adjusted by viewport).
-        this._viewport.setupFromView();
-        this._viewport.viewingSpace.getFrustum(_CoordSystem__WEBPACK_IMPORTED_MODULE_10__.CoordSystem.World, true, this._originalFrustum);
-        const applyHiddenLineSettings = true; // for debugging edge display, set to false...
-        const style = view.displayStyle;
-        if (style.is3d() && applyHiddenLineSettings)
-            this._hiddenLineSettings = style.settings.hiddenLineSettings;
-    }
-    [Symbol.dispose]() {
-        this._viewport[Symbol.dispose]();
-    }
-    discloseTileTrees(trees) {
-        trees.disclose(this._viewport);
-    }
-    addToScene(context) {
-        if (context.viewport.freezeScene)
-            return;
-        if (!context.viewport.view.viewsCategory(this._props.category))
-            return;
-        const wantBounds = context.viewport.wantViewAttachmentBoundaries;
-        const wantClipShapes = context.viewport.wantViewAttachmentClipShapes;
-        if (wantBounds || wantClipShapes) {
-            const builder = context.createSceneGraphicBuilder();
-            if (wantBounds) {
-                builder.setSymbology(_itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ColorDef.red, _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ColorDef.red, 2);
-                builder.addRangeBox(this._range);
-            }
-            if (wantClipShapes && this._clipVolume) {
-                builder.setSymbology(_itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ColorDef.blue, _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ColorDef.blue, 2);
-                for (const prim of this._clipVolume.clipVector.clips) {
-                    if (!(prim instanceof _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.ClipShape))
-                        continue; // ###TODO handle non-shape primitives, if any such ever encountered
-                    const pts = [];
-                    const tf = prim.transformFromClip;
-                    for (const pt of prim.polygon) {
-                        const tfPt = tf ? tf.multiplyPoint3d(pt) : pt;
-                        pts.push(new _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Point2d(tfPt.x, tfPt.y));
-                    }
-                    builder.addLineString2d(pts, 0);
-                }
-            }
-            // Put into a Batch so that we can see tooltip with attachment Id on mouseover.
-            const batch = context.target.renderSystem.createBatch(builder.finish(), this.getDebugFeatureTable(), this._range);
-            context.outputGraphic(batch);
-        }
-        if (!context.viewport.wantViewAttachments)
-            return;
-        // Pixel size used to compute size of ViewRect so that tiles of appropriate LOD are selected.
-        const pixelSize = context.viewport.getPixelSizeAtPoint();
-        if (0 === pixelSize)
-            return;
-        // Adjust attached view frustum based on intersection with sheet view frustum.
-        const attachFrustum = this._originalFrustum.transformBy(this._toSheet);
-        const attachFrustumRange = attachFrustum.toRange();
-        const sheetFrustum = context.viewport.getWorldFrustum();
-        const sheetFrustumRange = sheetFrustum.toRange();
-        const intersect = attachFrustumRange.intersect(sheetFrustumRange);
-        if (intersect.isNull)
-            return;
-        attachFrustum.initFromRange(intersect);
-        attachFrustum.transformBy(this._fromSheet, attachFrustum);
-        this._viewport.setupViewFromFrustum(attachFrustum);
-        // Adjust view rect based on size of attachment on screen so that tiles of appropriate LOD are selected.
-        const width = this._sizeInMeters.x * intersect.xLength() / attachFrustumRange.xLength();
-        const height = this._sizeInMeters.y * intersect.yLength() / attachFrustumRange.yLength();
-        this._viewRect.width = Math.max(1, Math.round(width / pixelSize));
-        this._viewRect.height = Math.max(1, Math.round(height / pixelSize));
-        this._viewport.setRect(this._viewRect);
-        // Propagate settings from on-screen viewport.
-        this._viewport.debugBoundingBoxes = context.viewport.debugBoundingBoxes;
-        this._viewport.setTileSizeModifier(context.viewport.tileSizeModifier);
-        // Create the scene.
-        this._viewport.renderFrame();
-        const scene = this.scene;
-        if (!scene)
-            return;
-        // Extract scene graphics and insert into on-screen scene context.
-        const options = {
-            viewAttachmentId: this._props.id,
-            clipVolume: this._clipVolume,
-            hline: this._hiddenLineSettings,
-            frustum: {
-                is3d: this.view.is3d(),
-                scale: this._scale,
-            },
-        };
-        const outputGraphics = (source) => {
-            if (0 === source.length)
-                return;
-            const graphics = new _render_GraphicBranch__WEBPACK_IMPORTED_MODULE_5__.GraphicBranch();
-            graphics.setViewFlagOverrides(this._viewFlagOverrides);
-            graphics.symbologyOverrides = this.symbologyOverrides;
-            for (const graphic of source)
-                graphics.entries.push(graphic);
-            const branch = context.createGraphicBranch(graphics, this._toSheet, options);
-            context.outputGraphic(branch);
-        };
-        outputGraphics(scene.foreground);
-        context.withGraphicType(_tile_internal__WEBPACK_IMPORTED_MODULE_13__.TileGraphicType.BackgroundMap, () => outputGraphics(scene.background));
-        context.withGraphicType(_tile_internal__WEBPACK_IMPORTED_MODULE_13__.TileGraphicType.Overlay, () => outputGraphics(scene.overlay));
-        // Report tile statistics to sheet view's viewport.
-        const tileAdmin = _IModelApp__WEBPACK_IMPORTED_MODULE_9__.IModelApp.tileAdmin;
-        const selectedAndReady = tileAdmin.getTilesForUser(this._viewport);
-        const requested = tileAdmin.getRequestsForUser(this._viewport);
-        tileAdmin.addExternalTilesForUser(context.viewport, {
-            requested: requested?.size ?? 0,
-            selected: selectedAndReady?.selected.size ?? 0,
-            ready: selectedAndReady?.ready.size ?? 0,
-        });
-    }
-    getDebugFeatureTable() {
-        if (this._debugFeatureTable)
-            return this._debugFeatureTable;
-        const featureTable = new _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.FeatureTable(1, this._sheetModelId);
-        featureTable.insert(new _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.Feature(this._props.id));
-        this._debugFeatureTable = _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.PackedFeatureTable.pack(featureTable);
-        return this._debugFeatureTable;
-    }
-    get areAllTileTreesLoaded() {
-        return this.view.areAllTileTreesLoaded;
-    }
-    collectStatistics(_stats) {
-        // Handled by discloseTileTrees()
-    }
-    get toSheet() {
-        return this._toSheet;
-    }
-}
-function createRasterAttachmentViewport(_view, _rect, _attachment) {
-    class RasterAttachmentViewport extends _Viewport__WEBPACK_IMPORTED_MODULE_11__.OffScreenViewport {
-        _sceneContext;
-        _isSceneReady = false;
-        _attachment;
-        constructor(view, rect, attachment) {
-            super(_IModelApp__WEBPACK_IMPORTED_MODULE_9__.IModelApp.renderSystem.createOffscreenTarget(rect));
-            this._attachment = attachment;
-            this._isAspectRatioLocked = true;
-            this.changeView(view);
-        }
-        createSceneContext() {
-            (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(!this._isSceneReady);
-            this._sceneContext = super.createSceneContext();
-            return this._sceneContext;
-        }
-        renderFrame() {
-            (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(!this._isSceneReady);
-            this.clearSceneContext();
-            super.renderFrame();
-            if (undefined !== this._sceneContext) {
-                this._isSceneReady = !this._sceneContext.hasMissingTiles && this.view.areAllTileTreesLoaded;
-                if (this._isSceneReady)
-                    this._attachment.produceGraphics(this._sceneContext);
-                this._sceneContext = undefined;
-            }
-        }
-        clearSceneContext() {
-            this._sceneContext = undefined;
-        }
-        addDecorations(_decorations) {
-            // ###TODO: skybox, ground plane, possibly grid. DecorateContext requires a ScreenViewport...
-        }
-    }
-    return new RasterAttachmentViewport(_view, _rect, _attachment);
-}
-/** Draws a 3d view with camera enabled into a sheet view by producing an image of the view's contents offscreen. */
-class RasterAttachment {
-    _props;
-    _placement;
-    _transform;
-    zDepth;
-    _viewport;
-    _graphics;
-    constructor(view, props, sheetView) {
-        // Render to a 2048x2048 view rect. Scale in Y to preserve aspect ratio.
-        const maxSize = 2048;
-        const rect = new _common_ViewRect__WEBPACK_IMPORTED_MODULE_15__.ViewRect(0, 0, maxSize, maxSize);
-        const height = maxSize * view.getAspectRatio() * view.getAspectRatioSkew();
-        const skew = maxSize / height;
-        view.setAspectRatioSkew(skew);
-        if (true !== props.jsonProperties?.displayOptions?.preserveBackground) {
-            // Make background color 100% transparent so that Viewport.readImageBuffer() will discard transparent pixels.
-            const bgColor = sheetView.displayStyle.backgroundColor.withAlpha(0);
-            view.displayStyle.backgroundColor = bgColor;
-        }
-        this._viewport = createRasterAttachmentViewport(view, rect, this);
-        this._props = props;
-        this._placement = _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.Placement2d.fromJSON(props.placement);
-        this._transform = this._placement.transform;
-        this.zDepth = _Frustum2d__WEBPACK_IMPORTED_MODULE_6__.Frustum2d.depthFromDisplayPriority(props.jsonProperties?.displayPriority ?? 0);
-    }
-    [Symbol.dispose]() {
-        this._viewport?.[Symbol.dispose]();
-    }
-    get viewAttachmentProps() {
-        return this._props;
-    }
-    get viewport() {
-        return this._viewport;
-    }
-    get areAllTileTreesLoaded() {
-        return this._viewport?.areAllTileTreesLoaded ?? true;
-    }
-    addToScene(context) {
-        // ###TODO: check viewport.wantViewAttachmentClipShapes
-        if (!context.viewport.view.viewsCategory(this._props.category))
-            return;
-        if (context.viewport.wantViewAttachmentBoundaries) {
-            const builder = context.createSceneGraphicBuilder(this._transform);
-            builder.setSymbology(_itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ColorDef.red, _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ColorDef.red, 2);
-            builder.addRangeBox(_itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Range3d.createRange2d(this._placement.bbox));
-            context.outputGraphic(builder.finish());
-        }
-        if (!context.viewport.wantViewAttachments)
-            return;
-        if (this._graphics) {
-            context.outputGraphic(this._graphics);
-            return;
-        }
-        if (undefined === this._viewport)
-            return;
-        this._viewport.debugBoundingBoxes = context.viewport.debugBoundingBoxes;
-        this._viewport.setTileSizeModifier(context.viewport.tileSizeModifier);
-        this._viewport.renderFrame();
-        if (this._graphics)
-            context.outputGraphic(this._graphics);
-    }
-    discloseTileTrees(trees) {
-        if (this._viewport)
-            trees.disclose(this._viewport);
-    }
-    produceGraphics(context) {
-        (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(context.viewport === this._viewport);
-        this._graphics = this.createGraphics(this._viewport);
-        this._viewport = (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.dispose)(this._viewport);
-        if (undefined !== this._graphics)
-            context.outputGraphic(this._graphics);
-    }
-    createGraphics(vp) {
-        // Create a texture from the contents of the view.
-        const image = vp.readImageBuffer({ upsideDown: true });
-        if (undefined === image)
-            return undefined;
-        const debugImage = false; // set to true to open a window displaying the captured image.
-        if (debugImage) {
-            const url = (0,_common_ImageUtil__WEBPACK_IMPORTED_MODULE_14__.imageBufferToPngDataUrl)(image, false);
-            if (url)
-                (0,_common_ImageUtil__WEBPACK_IMPORTED_MODULE_14__.openImageDataUrlInNewWindow)(url, "Attachment");
-        }
-        const texture = _IModelApp__WEBPACK_IMPORTED_MODULE_9__.IModelApp.renderSystem.createTexture({
-            image: { source: image, transparency: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TextureTransparency.Opaque },
-        });
-        if (!texture)
-            return undefined;
-        // Create a material for the texture
-        const graphicParams = new _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.GraphicParams();
-        graphicParams.material = _IModelApp__WEBPACK_IMPORTED_MODULE_9__.IModelApp.renderSystem.createRenderMaterial({ textureMapping: { texture } });
-        // Apply the texture to a rectangular polyface.
-        const depth = this.zDepth;
-        const east = this._placement.bbox.low.x;
-        const west = this._placement.bbox.high.x;
-        const north = this._placement.bbox.low.y;
-        const south = this._placement.bbox.high.y;
-        const corners = [
-            _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Point3d.create(east, north, depth),
-            _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Point3d.create(west, north, depth),
-            _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Point3d.create(west, south, depth),
-            _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Point3d.create(east, south, depth),
-        ];
-        const params = [
-            _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Point2d.create(0, 0),
-            _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Point2d.create(1, 0),
-            _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Point2d.create(1, 1),
-            _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Point2d.create(0, 1),
-        ];
-        const strokeOptions = new _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.StrokeOptions();
-        strokeOptions.needParams = strokeOptions.shouldTriangulate = true;
-        const polyfaceBuilder = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.PolyfaceBuilder.create(strokeOptions);
-        polyfaceBuilder.addQuadFacet(corners, params);
-        const polyface = polyfaceBuilder.claimPolyface();
-        const graphicBuilder = _IModelApp__WEBPACK_IMPORTED_MODULE_9__.IModelApp.renderSystem.createGraphicBuilder(_itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Transform.createIdentity(), _common_render_GraphicType__WEBPACK_IMPORTED_MODULE_16__.GraphicType.Scene, vp, this._props.id);
-        graphicBuilder.activateGraphicParams(graphicParams);
-        graphicBuilder.addPolyface(polyface, false);
-        const graphic = graphicBuilder.finish();
-        // Wrap the polyface in a GraphicBranch.
-        const branch = new _render_GraphicBranch__WEBPACK_IMPORTED_MODULE_5__.GraphicBranch(true);
-        const vfOvrs = (0,_tile_internal__WEBPACK_IMPORTED_MODULE_13__.createDefaultViewFlagOverrides)({ clipVolume: true, shadows: false, lighting: false, thematic: false });
-        // Disable transparency - background pixels are 100% transparent so they will be discarded anyway. Other pixels are 100% opaque.
-        vfOvrs.transparency = false;
-        branch.setViewFlagOverrides(vfOvrs);
-        branch.symbologyOverrides = new _render_FeatureSymbology__WEBPACK_IMPORTED_MODULE_8__.FeatureSymbology.Overrides();
-        branch.entries.push(graphic);
-        // Apply the attachment's clip, if any.
-        let clipVolume;
-        if (this._props.jsonProperties?.clip) {
-            const clipVector = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.ClipVector.fromJSON(this._props.jsonProperties?.clip);
-            if (clipVector.isValid)
-                clipVolume = _IModelApp__WEBPACK_IMPORTED_MODULE_9__.IModelApp.renderSystem.createClipVolume(clipVector);
-        }
-        return _IModelApp__WEBPACK_IMPORTED_MODULE_9__.IModelApp.renderSystem.createGraphicBranch(branch, this._transform, { clipVolume });
-    }
-    collectStatistics(stats) {
-        if (this._graphics)
-            this._graphics.collectStatistics(stats);
+        return this._viewAttachments.computeDisplayTransform(args);
     }
 }
 
@@ -113654,6 +113039,845 @@ function getAllElementIdsFromScript(script) {
 }
 
 
+/***/ }),
+
+/***/ "../../core/frontend/lib/esm/internal/SheetViewAttachments.js":
+/*!********************************************************************!*\
+  !*** ../../core/frontend/lib/esm/internal/SheetViewAttachments.js ***!
+  \********************************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   SheetViewAttachments: () => (/* binding */ SheetViewAttachments)
+/* harmony export */ });
+/* harmony import */ var _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @itwin/core-common */ "../../core/common/lib/esm/core-common.js");
+/* harmony import */ var _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @itwin/core-bentley */ "../../core/bentley/lib/esm/core-bentley.js");
+/* harmony import */ var _IModelApp__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../IModelApp */ "../../core/frontend/lib/esm/IModelApp.js");
+/* harmony import */ var _ViewAttachmentRenderer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./ViewAttachmentRenderer */ "../../core/frontend/lib/esm/internal/ViewAttachmentRenderer.js");
+/* harmony import */ var _Frustum2d__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../Frustum2d */ "../../core/frontend/lib/esm/Frustum2d.js");
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+/** @packageDocumentation
+ * @module Views
+ */
+
+
+
+
+
+/** Stateless state for a sheet that has no view attachments. */
+class EmptyAttachments {
+    // We only need one instance of this stateless class.
+    static _instance;
+    static get() {
+        return this._instance ?? (this._instance = new EmptyAttachments());
+    }
+    constructor() { }
+    clone() {
+        return this;
+    }
+    preload() { }
+    async postload() {
+        return this;
+    }
+    get attachmentIds() {
+        return [];
+    }
+}
+/** Holds the element Ids of the view attachments to be loaded for display. */
+class AttachmentIds {
+    _ids;
+    constructor(ids) {
+        this._ids = ids;
+    }
+    get attachmentIds() {
+        return this._ids;
+    }
+    clone() {
+        return new AttachmentIds([...this._ids]);
+    }
+    preload(request) {
+        request.sheetViewAttachmentIds = _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_1__.CompressedId64Set.sortAndCompress(this._ids);
+        request.viewStateLoadProps = {
+            displayStyle: {
+                omitScheduleScriptElementIds: !_IModelApp__WEBPACK_IMPORTED_MODULE_2__.IModelApp.tileAdmin.enableFrontendScheduleScripts,
+                compressExcludedElementIds: true,
+            },
+        };
+    }
+    async postload(response, iModel) {
+        if (undefined === response.sheetViewViews || undefined === response.sheetViewAttachmentProps) {
+            return this;
+        }
+        const viewStateProps = response.sheetViewViews;
+        const promises = [];
+        for (const viewProps of viewStateProps) {
+            const loadView = async () => {
+                try {
+                    if (viewProps === undefined)
+                        return undefined;
+                    const view = await iModel.views.convertViewStatePropsToViewState(viewProps);
+                    return view;
+                }
+                catch {
+                    return undefined;
+                }
+            };
+            promises.push(loadView());
+        }
+        const views = await Promise.all(promises);
+        const attachmentProps = response.sheetViewAttachmentProps;
+        (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_1__.assert)(views.length === attachmentProps.length);
+        const infos = [];
+        for (let i = 0; i < views.length; i++) {
+            const view = views[i];
+            if (view && !(view.isSheetView())) {
+                const props = attachmentProps[i];
+                props.attachedView = view;
+                infos.push(props);
+            }
+        }
+        return new AttachmentInfos(infos);
+    }
+}
+/** Fully loaded view attachments. */
+class AttachmentInfos {
+    infos;
+    constructor(infos) {
+        this.infos = infos;
+    }
+    get attachmentIds() {
+        return this.infos.map((x) => (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_1__.expectDefined)(x.id));
+    }
+    clone(iModel) {
+        const infos = this.infos.map((info) => {
+            return {
+                ...info,
+                attachedView: info.attachedView.clone(iModel),
+            };
+        });
+        return new AttachmentInfos(infos);
+    }
+    preload() {
+        // already loaded.
+    }
+    async postload() {
+        // already loaded.
+        return this;
+    }
+}
+/** Reloads the attachments after a change to the database. */
+async function reloadAttachments(sheetModelId, iModel) {
+    const ecsql = `SELECT ECInstanceId as attachmentId FROM bis.ViewAttachment WHERE model.Id=${sheetModelId}`;
+    const ids = [];
+    for await (const row of iModel.createQueryReader(ecsql)) {
+        ids.push(row[0]);
+    }
+    const attachmentProps = await iModel.elements.getProps(ids);
+    const promises = [];
+    for (const attachment of attachmentProps) {
+        const loadView = async () => {
+            try {
+                const view = await iModel.views.load(attachment.view.id);
+                return view;
+            }
+            catch {
+                return undefined;
+            }
+        };
+        promises.push(loadView());
+    }
+    const views = await Promise.all(promises);
+    (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_1__.assert)(views.length === attachmentProps.length);
+    const infos = [];
+    for (let i = 0; i < views.length; i++) {
+        const view = views[i];
+        if (view && !view.isSheetView()) {
+            const props = attachmentProps[i];
+            props.attachedView = view;
+            infos.push(props);
+        }
+    }
+    return new AttachmentInfos(infos);
+}
+function disposeRenderers(renderers) {
+    if (renderers) {
+        for (const renderer of renderers) {
+            renderer[Symbol.dispose]();
+        }
+    }
+}
+/** Manages the set of ViewAttachment elements to be rendered by a SheetViewState.
+ * Takes care of reloading them after ViewAttachment elements are modified, deleted, or inserted.
+ */
+class SheetViewAttachments {
+    _impl;
+    _reload;
+    _maxDepth = _Frustum2d__WEBPACK_IMPORTED_MODULE_4__.Frustum2d.minimumZDistance;
+    _rendererArgs;
+    _renderers;
+    get maxDepth() {
+        return this._maxDepth;
+    }
+    *getSecondaryViewports() {
+        if (this._renderers) {
+            for (const renderer of this._renderers) {
+                if (renderer.viewport) {
+                    yield renderer.viewport;
+                }
+            }
+        }
+    }
+    constructor(impl) {
+        this._impl = impl;
+    }
+    [Symbol.dispose]() {
+        disposeRenderers(this._renderers);
+        this._renderers = this._rendererArgs = undefined;
+        this._reload = undefined;
+    }
+    static create(attachmentIds) {
+        const impl = attachmentIds.length === 0 ? EmptyAttachments.get() : new AttachmentIds([...attachmentIds]);
+        return new this(impl);
+    }
+    get attachmentIds() {
+        return this._impl.attachmentIds;
+    }
+    clone(iModel) {
+        return new SheetViewAttachments(this._impl.clone(iModel));
+    }
+    preload(request) {
+        this._impl.preload(request);
+    }
+    async postload(response, iModel) {
+        this._impl = await this._impl.postload(response, iModel);
+    }
+    async reload(sheetModelId, iModel) {
+        const renderers = this._renderers;
+        const reload = this._reload = reloadAttachments(sheetModelId, iModel);
+        const impl = await this._reload;
+        // We keep the previous renderers until reloading completes, to avoid drawing a blank view while waiting.
+        // Afterward, always destroy the previous renderers.
+        disposeRenderers(renderers);
+        // If reload was not called again while we waited...
+        if (this._reload === reload) {
+            this._impl = impl;
+            this._reload = this._renderers = undefined;
+            if (this._rendererArgs) {
+                // We are attached to a Viewport - reload the renderers.
+                this.loadRenderers();
+            }
+        }
+    }
+    attachToViewport(args) {
+        (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_1__.assert)(undefined === this._renderers);
+        (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_1__.assert)(undefined === this._rendererArgs);
+        this._rendererArgs = args;
+        this.loadRenderers();
+    }
+    detachFromViewport() {
+        (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_1__.assert)(undefined !== this._rendererArgs);
+        this._rendererArgs = undefined;
+        disposeRenderers(this._renderers);
+        this._renderers = undefined;
+    }
+    areAllTileTreesLoaded(displayedExtents) {
+        if (this._reload) {
+            return false;
+        }
+        else if (!this._renderers) {
+            return true;
+        }
+        return this._renderers.every((renderer) => {
+            const attachmentRange = _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__.Placement2d.fromJSON(renderer.viewAttachmentProps.placement).calculateRange();
+            return !attachmentRange.intersectsRangeXY(displayedExtents) || renderer.areAllTileTreesLoaded;
+        });
+    }
+    discloseTileTrees(trees) {
+        for (const renderer of this.renderers()) {
+            trees.disclose(renderer);
+        }
+    }
+    collectStatistics(stats) {
+        for (const renderer of this.renderers()) {
+            renderer.collectStatistics(stats);
+        }
+    }
+    addToScene(context) {
+        for (const renderer of this.renderers()) {
+            renderer.addToScene(context);
+        }
+    }
+    getAttachmentViewport(args) {
+        const renderer = args.viewAttachmentId ? this.findRendererById(args.viewAttachmentId) : undefined;
+        if (!renderer) {
+            return undefined;
+        }
+        return args.inSectionDrawingAttachment ? renderer.viewport?.view.getAttachmentViewport({ inSectionDrawingAttachment: true }) : renderer.viewport;
+    }
+    computeDisplayTransform(args) {
+        const renderer = undefined !== args.viewAttachmentId ? this.findRendererById(args.viewAttachmentId) : undefined;
+        const ortho = renderer?.ortho;
+        const sheetTransform = ortho?.toSheet;
+        if (!sheetTransform) {
+            return undefined;
+        }
+        const sectionTransform = args.inSectionDrawingAttachment ? ortho.view.computeDisplayTransform(args) : undefined;
+        if (!sectionTransform) {
+            return sheetTransform.clone(args.output);
+        }
+        return sheetTransform.multiplyTransformTransform(sectionTransform, args.output);
+    }
+    /** Strictly for tests. */
+    areAllAttachmentsLoaded() {
+        return !this._reload && (!this._renderers || this._renderers.every((x) => x.areAllTileTreesLoaded));
+    }
+    /** Strictly for tests. */
+    get attachments() {
+        return this._renderers;
+    }
+    /** Strictly for tests. */
+    get attachmentProps() {
+        const infos = this._impl.infos;
+        if (!infos) {
+            return [];
+        }
+        return infos.map((x) => {
+            return {
+                ...x,
+                attachedView: undefined,
+            };
+        });
+    }
+    /** Strictly for tests. */
+    get attachmentInfos() {
+        const infos = this._impl.infos;
+        return infos ?? this._impl.attachmentIds;
+    }
+    loadRenderers() {
+        const args = this._rendererArgs;
+        (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_1__.assert)(undefined !== args);
+        (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_1__.assert)(undefined === this._renderers);
+        this._maxDepth = _Frustum2d__WEBPACK_IMPORTED_MODULE_4__.Frustum2d.minimumZDistance;
+        const infos = this._impl.infos;
+        if (!infos) {
+            return;
+        }
+        this._renderers = infos.map((info) => {
+            const renderer = (0,_ViewAttachmentRenderer__WEBPACK_IMPORTED_MODULE_3__.createViewAttachmentRenderer)({
+                ...args,
+                props: info,
+                view: info.attachedView,
+            });
+            this._maxDepth = Math.max(this._maxDepth, renderer.zDepth);
+            return renderer;
+        });
+    }
+    *renderers() {
+        if (this._renderers) {
+            for (const renderer of this._renderers) {
+                yield renderer;
+            }
+        }
+    }
+    findRendererById(id) {
+        return this._renderers?.find((x) => x.viewAttachmentProps.id === id);
+    }
+}
+
+
+/***/ }),
+
+/***/ "../../core/frontend/lib/esm/internal/ViewAttachmentRenderer.js":
+/*!**********************************************************************!*\
+  !*** ../../core/frontend/lib/esm/internal/ViewAttachmentRenderer.js ***!
+  \**********************************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   createViewAttachmentRenderer: () => (/* binding */ createViewAttachmentRenderer)
+/* harmony export */ });
+/* harmony import */ var _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @itwin/core-common */ "../../core/common/lib/esm/core-common.js");
+/* harmony import */ var _CoordSystem__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../CoordSystem */ "../../core/frontend/lib/esm/CoordSystem.js");
+/* harmony import */ var _Frustum2d__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../Frustum2d */ "../../core/frontend/lib/esm/Frustum2d.js");
+/* harmony import */ var _IModelApp__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../IModelApp */ "../../core/frontend/lib/esm/IModelApp.js");
+/* harmony import */ var _Viewport__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../Viewport */ "../../core/frontend/lib/esm/Viewport.js");
+/* harmony import */ var _common_ImageUtil__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../common/ImageUtil */ "../../core/frontend/lib/esm/common/ImageUtil.js");
+/* harmony import */ var _common_ViewRect__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../common/ViewRect */ "../../core/frontend/lib/esm/common/ViewRect.js");
+/* harmony import */ var _common_render_GraphicType__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../common/render/GraphicType */ "../../core/frontend/lib/esm/common/render/GraphicType.js");
+/* harmony import */ var _render_FeatureSymbology__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../render/FeatureSymbology */ "../../core/frontend/lib/esm/render/FeatureSymbology.js");
+/* harmony import */ var _render_GraphicBranch__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../render/GraphicBranch */ "../../core/frontend/lib/esm/render/GraphicBranch.js");
+/* harmony import */ var _tile_internal__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../tile/internal */ "../../core/frontend/lib/esm/tile/internal.js");
+/* harmony import */ var _render_MockRender__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./render/MockRender */ "../../core/frontend/lib/esm/internal/render/MockRender.js");
+/* harmony import */ var _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! @itwin/core-bentley */ "../../core/bentley/lib/esm/core-bentley.js");
+/* harmony import */ var _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! @itwin/core-geometry */ "../../core/geometry/lib/esm/core-geometry.js");
+/* harmony import */ var _tile_ViewFlagOverrides__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./tile/ViewFlagOverrides */ "../../core/frontend/lib/esm/internal/tile/ViewFlagOverrides.js");
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+/** @packageDocumentation
+ * @module Views
+ */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+function createViewAttachmentRenderer(args) {
+    const { props, view } = args;
+    if (props.jsonProperties?.displayOptions?.drawAsRaster || (view.is3d() && view.isCameraOn)) {
+        return new RasterAttachment(view, props, args.backgroundColor);
+    }
+    else {
+        return new OrthographicAttachment(view, props, args.sheetModelId);
+    }
+}
+/** A mostly no-op RenderTarget for an OrthographicAttachment. */
+class AttachmentTarget extends _render_MockRender__WEBPACK_IMPORTED_MODULE_11__.MockRender.OffScreenTarget {
+    _attachment;
+    constructor(attachment) {
+        // The dimensions don't matter - we're not drawing anything.
+        const rect = new _common_ViewRect__WEBPACK_IMPORTED_MODULE_6__.ViewRect(1, 1);
+        super(_IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.renderSystem, rect);
+        this._attachment = attachment;
+    }
+    changeScene(scene) {
+        this._attachment.scene = scene;
+    }
+    overrideFeatureSymbology(ovrs) {
+        this._attachment.symbologyOverrides = ovrs;
+    }
+}
+/** Draws the contents a 2d or orthographic 3d view directly into a sheet view.
+ * We select tiles for the view in the context of a light-weight offscreen viewport with a no-op RenderTarget, then
+ * collect the resultant graphics and add them to the sheet view's scene.
+ */
+class OrthographicAttachment {
+    _viewport;
+    _props;
+    _sheetModelId;
+    _viewFlagOverrides;
+    _toSheet;
+    _fromSheet;
+    _sizeInMeters;
+    _range;
+    _viewRect = new _common_ViewRect__WEBPACK_IMPORTED_MODULE_6__.ViewRect(0, 0, 1, 1);
+    _originalFrustum = new _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__.Frustum();
+    _clipVolume;
+    _hiddenLineSettings;
+    _scale;
+    _debugFeatureTable;
+    scene;
+    symbologyOverrides;
+    zDepth;
+    get view() {
+        return this._viewport.view;
+    }
+    get viewAttachmentProps() {
+        return this._props;
+    }
+    get viewport() {
+        return this._viewport;
+    }
+    constructor(view, props, sheetModelId) {
+        this.symbologyOverrides = new _render_FeatureSymbology__WEBPACK_IMPORTED_MODULE_8__.FeatureSymbology.Overrides(view);
+        const target = new AttachmentTarget(this);
+        this._viewport = _Viewport__WEBPACK_IMPORTED_MODULE_4__.OffScreenViewport.createViewport(view, target, true);
+        this._props = props;
+        this._sheetModelId = sheetModelId;
+        const applyClip = true; // set to false for debugging
+        this._viewFlagOverrides = {
+            ...view.viewFlags,
+            clipVolume: applyClip,
+            lighting: false,
+            shadows: false,
+        };
+        const placement = _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__.Placement2d.fromJSON(props.placement);
+        const range = placement.calculateRange();
+        this._range = range;
+        this._sizeInMeters = new _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.Point2d(range.xLength(), range.yLength());
+        // Compute transform from attached view's world coordinates to sheet's world coordinates.
+        // NB: We obtain the extents and origin from the *viewport* not the *view* - they may have been adjusted by the viewport.
+        const applySkew = true; // set to false for debugging
+        const skew = applySkew ? view.getAspectRatioSkew() : 1;
+        const extents = this._viewport.viewingSpace.viewDelta.clone();
+        const zDepth = Math.abs(extents.z);
+        const scaleX = this._sizeInMeters.x / Math.abs(extents.x);
+        const scaleY = skew * this._sizeInMeters.y / Math.abs(extents.y);
+        this._scale = { x: 1 / scaleX, y: 1 / scaleY };
+        const zBias = _Frustum2d__WEBPACK_IMPORTED_MODULE_2__.Frustum2d.depthFromDisplayPriority(props.jsonProperties?.displayPriority ?? 0);
+        this.zDepth = 1.01 * (zDepth - zBias); // give a little padding so that geometry right up against far plane doesn't get clipped.
+        // View origin is at the *back* of the view. Align *front* of view based on display priority.
+        const viewRot = view.getRotation();
+        const viewOrg = viewRot.multiplyVector(this._viewport.viewingSpace.viewOrigin);
+        viewOrg.z += zDepth;
+        viewRot.multiplyTransposeVectorInPlace(viewOrg);
+        const matrix = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.Matrix3d.createScale(scaleX, scaleY, 1);
+        matrix.multiplyMatrixMatrix(viewRot, matrix);
+        const origin = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.Matrix3d.xyzMinusMatrixTimesXYZ(viewOrg, matrix, viewOrg);
+        const attachmentOrigin = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.Point3d.createFrom(placement.origin);
+        attachmentOrigin.z = zBias;
+        const viewOrgToAttachment = attachmentOrigin.minus(viewOrg);
+        origin.addInPlace(viewOrgToAttachment);
+        this._toSheet = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.Transform.createRefs(origin, matrix);
+        this._fromSheet = (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_12__.expectDefined)(this._toSheet.inverse());
+        // If the attached view is a section drawing, it may itself have an attached spatial view with a clip.
+        // The clip needs to be transformed into sheet space.
+        if (view.isDrawingView())
+            this._viewport.drawingToSheetTransform = this._toSheet;
+        // ###TODO? If we also apply the attachment's clip to the attached view, we may get additional culling during tile selection.
+        // However the attached view's frustum is already clipped by intersection with sheet view's frustum, and additional clipping planes
+        // introduce additional computation, so possibly not worth it.
+        // Transform the view's clip (if any) to sheet space
+        let viewClip = view.viewFlags.clipVolume ? view.getViewClip()?.clone() : undefined;
+        if (viewClip)
+            viewClip.transformInPlace(this._toSheet);
+        else
+            viewClip = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.ClipVector.createEmpty();
+        let sheetClip;
+        if (undefined !== props.jsonProperties?.clip)
+            sheetClip = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.ClipVector.fromJSON(props.jsonProperties?.clip);
+        if (sheetClip && sheetClip.isValid) {
+            // Clip to view attachment's clip. NB: clip is in sheet coordinate space.
+            for (const clip of sheetClip.clips)
+                viewClip.clips.push(clip);
+        }
+        else {
+            // Clip to view attachment's bounding box
+            viewClip.appendShape([
+                _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.Point3d.create(this._range.low.x, this._range.low.y),
+                _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.Point3d.create(this._range.high.x, this._range.low.y),
+                _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.Point3d.create(this._range.high.x, this._range.high.y),
+                _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.Point3d.create(this._range.low.x, this._range.high.y),
+            ]);
+        }
+        this._clipVolume = _IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.renderSystem.createClipVolume(viewClip);
+        // Save off the original frustum (potentially adjusted by viewport).
+        this._viewport.setupFromView();
+        this._viewport.viewingSpace.getFrustum(_CoordSystem__WEBPACK_IMPORTED_MODULE_1__.CoordSystem.World, true, this._originalFrustum);
+        const applyHiddenLineSettings = true; // for debugging edge display, set to false...
+        const style = view.displayStyle;
+        if (style.is3d() && applyHiddenLineSettings)
+            this._hiddenLineSettings = style.settings.hiddenLineSettings;
+    }
+    [Symbol.dispose]() {
+        this._viewport[Symbol.dispose]();
+    }
+    discloseTileTrees(trees) {
+        trees.disclose(this._viewport);
+    }
+    addToScene(context) {
+        if (context.viewport.freezeScene)
+            return;
+        if (!context.viewport.view.viewsCategory(this._props.category))
+            return;
+        const wantBounds = context.viewport.wantViewAttachmentBoundaries;
+        const wantClipShapes = context.viewport.wantViewAttachmentClipShapes;
+        if (wantBounds || wantClipShapes) {
+            const builder = context.createSceneGraphicBuilder();
+            if (wantBounds) {
+                builder.setSymbology(_itwin_core_common__WEBPACK_IMPORTED_MODULE_0__.ColorDef.red, _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__.ColorDef.red, 2);
+                builder.addRangeBox(this._range);
+            }
+            if (wantClipShapes && this._clipVolume) {
+                builder.setSymbology(_itwin_core_common__WEBPACK_IMPORTED_MODULE_0__.ColorDef.blue, _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__.ColorDef.blue, 2);
+                for (const prim of this._clipVolume.clipVector.clips) {
+                    if (!(prim instanceof _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.ClipShape))
+                        continue; // ###TODO handle non-shape primitives, if any such ever encountered
+                    const pts = [];
+                    const tf = prim.transformFromClip;
+                    for (const pt of prim.polygon) {
+                        const tfPt = tf ? tf.multiplyPoint3d(pt) : pt;
+                        pts.push(new _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.Point2d(tfPt.x, tfPt.y));
+                    }
+                    builder.addLineString2d(pts, 0);
+                }
+            }
+            // Put into a Batch so that we can see tooltip with attachment Id on mouseover.
+            const batch = context.target.renderSystem.createBatch(builder.finish(), this.getDebugFeatureTable(), this._range);
+            context.outputGraphic(batch);
+        }
+        if (!context.viewport.wantViewAttachments)
+            return;
+        // Pixel size used to compute size of ViewRect so that tiles of appropriate LOD are selected.
+        const pixelSize = context.viewport.getPixelSizeAtPoint();
+        if (0 === pixelSize)
+            return;
+        // Adjust attached view frustum based on intersection with sheet view frustum.
+        const attachFrustum = this._originalFrustum.transformBy(this._toSheet);
+        const attachFrustumRange = attachFrustum.toRange();
+        const sheetFrustum = context.viewport.getWorldFrustum();
+        const sheetFrustumRange = sheetFrustum.toRange();
+        const intersect = attachFrustumRange.intersect(sheetFrustumRange);
+        if (intersect.isNull)
+            return;
+        attachFrustum.initFromRange(intersect);
+        attachFrustum.transformBy(this._fromSheet, attachFrustum);
+        this._viewport.setupViewFromFrustum(attachFrustum);
+        // Adjust view rect based on size of attachment on screen so that tiles of appropriate LOD are selected.
+        const width = this._sizeInMeters.x * intersect.xLength() / attachFrustumRange.xLength();
+        const height = this._sizeInMeters.y * intersect.yLength() / attachFrustumRange.yLength();
+        this._viewRect.width = Math.max(1, Math.round(width / pixelSize));
+        this._viewRect.height = Math.max(1, Math.round(height / pixelSize));
+        this._viewport.setRect(this._viewRect);
+        // Propagate settings from on-screen viewport.
+        this._viewport.debugBoundingBoxes = context.viewport.debugBoundingBoxes;
+        this._viewport.setTileSizeModifier(context.viewport.tileSizeModifier);
+        // Create the scene.
+        this._viewport.renderFrame();
+        const scene = this.scene;
+        if (!scene)
+            return;
+        // Extract scene graphics and insert into on-screen scene context.
+        const options = {
+            viewAttachmentId: this._props.id,
+            clipVolume: this._clipVolume,
+            hline: this._hiddenLineSettings,
+            frustum: {
+                is3d: this.view.is3d(),
+                scale: this._scale,
+            },
+        };
+        const outputGraphics = (source) => {
+            if (0 === source.length)
+                return;
+            const graphics = new _render_GraphicBranch__WEBPACK_IMPORTED_MODULE_9__.GraphicBranch();
+            graphics.setViewFlagOverrides(this._viewFlagOverrides);
+            graphics.symbologyOverrides = this.symbologyOverrides;
+            for (const graphic of source)
+                graphics.entries.push(graphic);
+            const branch = context.createGraphicBranch(graphics, this._toSheet, options);
+            context.outputGraphic(branch);
+        };
+        outputGraphics(scene.foreground);
+        context.withGraphicType(_tile_internal__WEBPACK_IMPORTED_MODULE_10__.TileGraphicType.BackgroundMap, () => outputGraphics(scene.background));
+        context.withGraphicType(_tile_internal__WEBPACK_IMPORTED_MODULE_10__.TileGraphicType.Overlay, () => outputGraphics(scene.overlay));
+        // Report tile statistics to sheet view's viewport.
+        const tileAdmin = _IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.tileAdmin;
+        const selectedAndReady = tileAdmin.getTilesForUser(this._viewport);
+        const requested = tileAdmin.getRequestsForUser(this._viewport);
+        tileAdmin.addExternalTilesForUser(context.viewport, {
+            requested: requested?.size ?? 0,
+            selected: selectedAndReady?.selected.size ?? 0,
+            ready: selectedAndReady?.ready.size ?? 0,
+        });
+    }
+    getDebugFeatureTable() {
+        if (this._debugFeatureTable)
+            return this._debugFeatureTable;
+        const featureTable = new _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__.FeatureTable(1, this._sheetModelId);
+        featureTable.insert(new _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__.Feature(this._props.id));
+        this._debugFeatureTable = _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__.PackedFeatureTable.pack(featureTable);
+        return this._debugFeatureTable;
+    }
+    get areAllTileTreesLoaded() {
+        return this.view.areAllTileTreesLoaded;
+    }
+    collectStatistics(_stats) {
+        // Handled by discloseTileTrees()
+    }
+    get ortho() {
+        return {
+            toSheet: this._toSheet,
+            view: this.view,
+        };
+    }
+}
+function createRasterAttachmentViewport(_view, _rect, _attachment) {
+    class RasterAttachmentViewport extends _Viewport__WEBPACK_IMPORTED_MODULE_4__.OffScreenViewport {
+        _sceneContext;
+        _isSceneReady = false;
+        _attachment;
+        constructor(view, rect, attachment) {
+            super(_IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.renderSystem.createOffscreenTarget(rect));
+            this._attachment = attachment;
+            this._isAspectRatioLocked = true;
+            this.changeView(view);
+        }
+        createSceneContext() {
+            (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_12__.assert)(!this._isSceneReady);
+            this._sceneContext = super.createSceneContext();
+            return this._sceneContext;
+        }
+        renderFrame() {
+            (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_12__.assert)(!this._isSceneReady);
+            this.clearSceneContext();
+            super.renderFrame();
+            if (undefined !== this._sceneContext) {
+                this._isSceneReady = !this._sceneContext.hasMissingTiles && this.view.areAllTileTreesLoaded;
+                if (this._isSceneReady)
+                    this._attachment.produceGraphics(this._sceneContext);
+                this._sceneContext = undefined;
+            }
+        }
+        clearSceneContext() {
+            this._sceneContext = undefined;
+        }
+        addDecorations() {
+            // ###TODO: skybox, ground plane, possibly grid. DecorateContext requires a ScreenViewport...
+        }
+    }
+    return new RasterAttachmentViewport(_view, _rect, _attachment);
+}
+/** Draws a 3d view (usually with camera enabled) into a sheet view by producing an image of the view's contents offscreen. */
+class RasterAttachment {
+    _props;
+    _placement;
+    _transform;
+    zDepth;
+    _viewport;
+    _graphics;
+    constructor(view, props, bgColor) {
+        // Render to a 2048x2048 view rect. Scale in Y to preserve aspect ratio.
+        const maxSize = 2048;
+        const rect = new _common_ViewRect__WEBPACK_IMPORTED_MODULE_6__.ViewRect(0, 0, maxSize, maxSize);
+        const height = maxSize * view.getAspectRatio() * view.getAspectRatioSkew();
+        const skew = maxSize / height;
+        view.setAspectRatioSkew(skew);
+        if (true !== props.jsonProperties?.displayOptions?.preserveBackground) {
+            // Make background color 100% transparent so that Viewport.readImageBuffer() will discard transparent pixels.
+            view.displayStyle.backgroundColor = bgColor.withAlpha(0);
+        }
+        this._viewport = createRasterAttachmentViewport(view, rect, this);
+        this._props = props;
+        this._placement = _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__.Placement2d.fromJSON(props.placement);
+        this._transform = this._placement.transform;
+        this.zDepth = _Frustum2d__WEBPACK_IMPORTED_MODULE_2__.Frustum2d.depthFromDisplayPriority(props.jsonProperties?.displayPriority ?? 0);
+    }
+    [Symbol.dispose]() {
+        this._viewport?.[Symbol.dispose]();
+    }
+    get viewAttachmentProps() {
+        return this._props;
+    }
+    get viewport() {
+        return this._viewport;
+    }
+    get areAllTileTreesLoaded() {
+        return this._viewport?.areAllTileTreesLoaded ?? true;
+    }
+    addToScene(context) {
+        // ###TODO: check viewport.wantViewAttachmentClipShapes
+        if (!context.viewport.view.viewsCategory(this._props.category))
+            return;
+        if (context.viewport.wantViewAttachmentBoundaries) {
+            const builder = context.createSceneGraphicBuilder(this._transform);
+            builder.setSymbology(_itwin_core_common__WEBPACK_IMPORTED_MODULE_0__.ColorDef.red, _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__.ColorDef.red, 2);
+            builder.addRangeBox(_itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.Range3d.createRange2d(this._placement.bbox));
+            context.outputGraphic(builder.finish());
+        }
+        if (!context.viewport.wantViewAttachments)
+            return;
+        if (this._graphics) {
+            context.outputGraphic(this._graphics);
+            return;
+        }
+        if (undefined === this._viewport)
+            return;
+        this._viewport.debugBoundingBoxes = context.viewport.debugBoundingBoxes;
+        this._viewport.setTileSizeModifier(context.viewport.tileSizeModifier);
+        this._viewport.renderFrame();
+        if (this._graphics)
+            context.outputGraphic(this._graphics);
+    }
+    discloseTileTrees(trees) {
+        if (this._viewport)
+            trees.disclose(this._viewport);
+    }
+    produceGraphics(context) {
+        (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_12__.assert)(context.viewport === this._viewport);
+        this._graphics = this.createGraphics(this._viewport);
+        this._viewport = (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_12__.dispose)(this._viewport);
+        if (undefined !== this._graphics)
+            context.outputGraphic(this._graphics);
+    }
+    createGraphics(vp) {
+        // Create a texture from the contents of the view.
+        const image = vp.readImageBuffer({ upsideDown: true });
+        if (undefined === image)
+            return undefined;
+        const debugImage = false; // set to true to open a window displaying the captured image.
+        if (debugImage) {
+            const url = (0,_common_ImageUtil__WEBPACK_IMPORTED_MODULE_5__.imageBufferToPngDataUrl)(image, false);
+            if (url)
+                (0,_common_ImageUtil__WEBPACK_IMPORTED_MODULE_5__.openImageDataUrlInNewWindow)(url, "Attachment");
+        }
+        const texture = _IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.renderSystem.createTexture({
+            image: { source: image, transparency: _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__.TextureTransparency.Opaque },
+        });
+        if (!texture)
+            return undefined;
+        // Create a material for the texture
+        const graphicParams = new _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__.GraphicParams();
+        graphicParams.material = _IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.renderSystem.createRenderMaterial({ textureMapping: { texture } });
+        // Apply the texture to a rectangular polyface.
+        const depth = this.zDepth;
+        const east = this._placement.bbox.low.x;
+        const west = this._placement.bbox.high.x;
+        const north = this._placement.bbox.low.y;
+        const south = this._placement.bbox.high.y;
+        const corners = [
+            _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.Point3d.create(east, north, depth),
+            _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.Point3d.create(west, north, depth),
+            _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.Point3d.create(west, south, depth),
+            _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.Point3d.create(east, south, depth),
+        ];
+        const params = [
+            _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.Point2d.create(0, 0),
+            _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.Point2d.create(1, 0),
+            _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.Point2d.create(1, 1),
+            _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.Point2d.create(0, 1),
+        ];
+        const strokeOptions = new _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.StrokeOptions();
+        strokeOptions.needParams = strokeOptions.shouldTriangulate = true;
+        const polyfaceBuilder = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.PolyfaceBuilder.create(strokeOptions);
+        polyfaceBuilder.addQuadFacet(corners, params);
+        const polyface = polyfaceBuilder.claimPolyface();
+        const graphicBuilder = _IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.renderSystem.createGraphicBuilder(_itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.Transform.createIdentity(), _common_render_GraphicType__WEBPACK_IMPORTED_MODULE_7__.GraphicType.Scene, vp, this._props.id);
+        graphicBuilder.activateGraphicParams(graphicParams);
+        graphicBuilder.addPolyface(polyface, false);
+        const graphic = graphicBuilder.finish();
+        // Wrap the polyface in a GraphicBranch.
+        const branch = new _render_GraphicBranch__WEBPACK_IMPORTED_MODULE_9__.GraphicBranch(true);
+        const vfOvrs = (0,_tile_ViewFlagOverrides__WEBPACK_IMPORTED_MODULE_14__.createDefaultViewFlagOverrides)({ clipVolume: true, shadows: false, lighting: false, thematic: false });
+        // Disable transparency - background pixels are 100% transparent so they will be discarded anyway. Other pixels are 100% opaque.
+        vfOvrs.transparency = false;
+        branch.setViewFlagOverrides(vfOvrs);
+        branch.symbologyOverrides = new _render_FeatureSymbology__WEBPACK_IMPORTED_MODULE_8__.FeatureSymbology.Overrides();
+        branch.entries.push(graphic);
+        // Apply the attachment's clip, if any.
+        let clipVolume;
+        if (this._props.jsonProperties?.clip) {
+            const clipVector = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_13__.ClipVector.fromJSON(this._props.jsonProperties?.clip);
+            if (clipVector.isValid)
+                clipVolume = _IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.renderSystem.createClipVolume(clipVector);
+        }
+        return _IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.renderSystem.createGraphicBranch(branch, this._transform, { clipVolume });
+    }
+    collectStatistics(stats) {
+        if (this._graphics)
+            this._graphics.collectStatistics(stats);
+    }
+}
+
+
 /***/ }),
 
 /***/ "../../core/frontend/lib/esm/internal/cross-package.js":
@@ -127214,7 +127438,7 @@ class FrameBuffers {
                 undefined !== textures.depthAndOrderMsBuff &&
                 undefined !== textures.depthAndOrderMsBuffHidden);
             const colorAndPickMsBuffs = [textures.colorMsBuff, textures.featureIdMsBuff, textures.depthAndOrderMsBuff];
-            const colorAndPickFilters = [_GL__WEBPACK_IMPORTED_MODULE_10__.GL.MultiSampling.Filter.Linear, _GL__WEBPACK_IMPORTED_MODULE_10__.GL.MultiSampling.Filter.Nearest, _GL__WEBPACK_IMPORTED_MODULE_10__.GL.MultiSampling.Filter.Nearest, _GL__WEBPACK_IMPORTED_MODULE_10__.GL.MultiSampling.Filter.Nearest];
+            const colorAndPickFilters = [_GL__WEBPACK_IMPORTED_MODULE_10__.GL.MultiSampling.Filter.Linear, _GL__WEBPACK_IMPORTED_MODULE_10__.GL.MultiSampling.Filter.Nearest, _GL__WEBPACK_IMPORTED_MODULE_10__.GL.MultiSampling.Filter.Nearest];
             this.opaqueAll = _FrameBuffer__WEBPACK_IMPORTED_MODULE_9__.FrameBuffer.create(colorAndPick, depth, colorAndPickMsBuffs, colorAndPickFilters, depthMs);
             colorAndPick[0] = textures.color;
             this.opaqueAndCompositeAll = _FrameBuffer__WEBPACK_IMPORTED_MODULE_9__.FrameBuffer.create(colorAndPick, depth, colorAndPickMsBuffs, colorAndPickFilters, depthMs);
@@ -129867,12 +130091,19 @@ class VertexShaderBuilder extends ShaderBuilder {
             }
             main.addline("  v_color = baseColor;");
         }
+        /*
+        There is currently a driver glitch which is known to affect much of the Intel Ultra 7 family of chipsets when using Intel driver from some point after driver version 32.0.101.6078 (9/13/2024).
+    
+        The graphics driver will glitch when discarding triangles using the vertex shader (setting all vertices to the same value) if gl_Position was not initialized to a valid position beforehand.
+    
+        The workaround for this bug involves ensuring that gl_Position is initialized to a valid position before attempting a discard using a degenerate triangle.
+        */
+        main.addline("  gl_Position = computePosition(rawPosition);");
         const checkForDiscard = this.get(9 /* VertexShaderComponent.CheckForDiscard */);
         if (undefined !== checkForDiscard) {
             prelude.addFunction("bool checkForDiscard()", checkForDiscard);
             main.add(_glsl_Vertex__WEBPACK_IMPORTED_MODULE_3__.vertexDiscard);
         }
-        main.addline("  gl_Position = computePosition(rawPosition);");
         const finalizePos = this.get(13 /* VertexShaderComponent.FinalizePosition */);
         if (undefined !== finalizePos) {
             prelude.addFunction("vec4 finalizePosition(vec4 pos)", finalizePos);
@@ -155636,10 +155867,10 @@ class AngleDescription extends _FormattedQuantityDescription__WEBPACK_IMPORTED_M
     constructor(name, displayLabel, iconSpec, kindOfQuantityName) {
         const defaultName = "angle";
         super({
-            name: name ? name : defaultName,
-            displayLabel: displayLabel ? displayLabel : _IModelApp__WEBPACK_IMPORTED_MODULE_0__.IModelApp.localization.getLocalizedString("iModelJs:Properties.Angle"),
-            kindOfQuantityName: kindOfQuantityName ? kindOfQuantityName : "AecUnits.ANGLE",
-            iconSpec
+            name: name ?? defaultName,
+            displayLabel: displayLabel ?? _IModelApp__WEBPACK_IMPORTED_MODULE_0__.IModelApp.localization.getLocalizedString("iModelJs:Properties.Angle"),
+            kindOfQuantityName: kindOfQuantityName ?? "DefaultToolsUnits.ANGLE",
+            iconSpec,
         });
     }
     get formatterQuantityType() { return _quantity_formatting_QuantityFormatter__WEBPACK_IMPORTED_MODULE_1__.QuantityType.Angle; }
@@ -155771,9 +156002,9 @@ class LengthDescription extends _FormattedQuantityDescription__WEBPACK_IMPORTED_
     constructor(name, displayLabel, iconSpec, kindOfQuantityName) {
         const defaultName = "length";
         super({
-            name: name ? name : defaultName,
-            displayLabel: displayLabel ? displayLabel : _IModelApp__WEBPACK_IMPORTED_MODULE_0__.IModelApp.localization.getLocalizedString("iModelJs:Properties.Length"),
-            kindOfQuantityName: kindOfQuantityName ? kindOfQuantityName : "AecUnits.LENGTH",
+            name: name ?? defaultName,
+            displayLabel: displayLabel ?? _IModelApp__WEBPACK_IMPORTED_MODULE_0__.IModelApp.localization.getLocalizedString("iModelJs:Properties.Length"),
+            kindOfQuantityName: kindOfQuantityName ?? "DefaultToolsUnits.LENGTH",
             iconSpec,
         });
     }
@@ -155792,9 +156023,9 @@ class SurveyLengthDescription extends _FormattedQuantityDescription__WEBPACK_IMP
     constructor(name, displayLabel, iconSpec, kindOfQuantityName) {
         const defaultName = "surveyLength";
         super({
-            name: name ? name : defaultName,
-            displayLabel: displayLabel ? displayLabel : _IModelApp__WEBPACK_IMPORTED_MODULE_0__.IModelApp.localization.getLocalizedString("iModelJs:Properties.Length"),
-            kindOfQuantityName: kindOfQuantityName ? kindOfQuantityName : "AecUnits.LENGTH",
+            name: name ?? defaultName,
+            displayLabel: displayLabel ?? _IModelApp__WEBPACK_IMPORTED_MODULE_0__.IModelApp.localization.getLocalizedString("iModelJs:Properties.Length"),
+            kindOfQuantityName: kindOfQuantityName ?? "CivilUnits.LENGTH",
             iconSpec,
         });
     }
@@ -155813,9 +156044,9 @@ class EngineeringLengthDescription extends _FormattedQuantityDescription__WEBPAC
     constructor(name, displayLabel, iconSpec, kindOfQuantityName) {
         const defaultName = "engineeringLength";
         super({
-            name: name ? name : defaultName,
-            displayLabel: displayLabel ? displayLabel : _IModelApp__WEBPACK_IMPORTED_MODULE_0__.IModelApp.localization.getLocalizedString("iModelJs:Properties.Length"),
-            kindOfQuantityName: kindOfQuantityName ? kindOfQuantityName : "AecUnits.LENGTH",
+            name: name ?? defaultName,
+            displayLabel: displayLabel ?? _IModelApp__WEBPACK_IMPORTED_MODULE_0__.IModelApp.localization.getLocalizedString("iModelJs:Properties.Length"),
+            kindOfQuantityName: kindOfQuantityName ?? "AecUnits.LENGTH",
             iconSpec,
         });
     }
@@ -156406,13 +156637,14 @@ class QuantityTypeFormatsProvider {
         this._removeListeners.forEach(listener => listener());
     }
     _kindOfQuantityMap = new Map([
-        ["AecUnits.LENGTH", QuantityType.Length],
-        ["AecUnits.ANGLE", QuantityType.Angle],
-        ["AecUnits.AREA", QuantityType.Area],
-        ["AecUnits.VOLUME", QuantityType.Volume],
-        ["AecUnits.LENGTH_COORDINATE", QuantityType.Coordinate],
-        ["RoadRailUnits.STATION", QuantityType.Stationing],
-        ["RoadRailUnits.LENGTH", QuantityType.LengthSurvey],
+        ["DefaultToolsUnits.LENGTH", QuantityType.Length],
+        ["DefaultToolsUnits.ANGLE", QuantityType.Angle],
+        ["DefaultToolsUnits.AREA", QuantityType.Area],
+        ["DefaultToolsUnits.VOLUME", QuantityType.Volume],
+        ["DefaultToolsUnits.LENGTH_COORDINATE", QuantityType.Coordinate],
+        ["CivilUnits.STATION", QuantityType.Stationing],
+        ["CivilUnits.LENGTH", QuantityType.LengthSurvey],
+        ["AecUnits.LENGTH", QuantityType.LengthEngineering]
     ]);
     async getFormat(name) {
         const quantityType = this._kindOfQuantityMap.get(name);
@@ -156640,7 +156872,7 @@ class QuantityFormatter {
      */
     async onInitialized() {
         await this.initializeQuantityTypesRegistry();
-        const initialKoQs = [["AecUnits.LENGTH", "Units.M"], ["AecUnits.ANGLE", "Units.RAD"], ["AecUnits.AREA", "Units.SQ_M"], ["AecUnits.VOLUME", "Units.CUB_M"], ["AecUnits.LENGTH_COORDINATE", "Units.M"], ["RoadRailUnits.STATION", "Units.M"], ["RoadRailUnits.LENGTH", "Units.M"]];
+        const initialKoQs = [["DefaultToolsUnits.LENGTH", "Units.M"], ["DefaultToolsUnits.ANGLE", "Units.RAD"], ["DefaultToolsUnits.AREA", "Units.SQ_M"], ["DefaultToolsUnits.VOLUME", "Units.CUB_M"], ["DefaultToolsUnits.LENGTH_COORDINATE", "Units.M"], ["CivilUnits.STATION", "Units.M"], ["CivilUnits.LENGTH", "Units.M"], ["AecUnits.LENGTH", "Units.M"]];
         for (const entry of initialKoQs) {
             try {
                 await this.addFormattingSpecsToRegistry(entry[0], entry[1]);
@@ -177774,7 +178006,7 @@ class EventController {
         const element = vp.parentDiv;
         if (element === undefined)
             return;
-        // Put events  on the parentDiv to allows us to stopPropagation of events to the view canvas when they are meant for a sibling of view canvas (markup canvas, for example).
+        // Put events on the parentDiv to allow us to stopPropagation of events to the view canvas when they are meant for a sibling of view canvas (markup canvas, for example).
         this.addDomListeners(["mousedown", "mouseup", "mousemove", "mouseover", "mouseout", "wheel", "touchstart", "touchend", "touchcancel", "touchmove"], element);
         element.oncontextmenu = element.onselectstart = () => false;
     }
@@ -178138,13 +178370,13 @@ class MeasureDistanceTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_9__.Pr
     /** @internal */
     async onPostInstall() {
         await super.onPostInstall();
-        this._lengthFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.LENGTH", "Units.M");
-        this._angleFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.ANGLE", "Units.RAD");
+        this._lengthFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("DefaultToolsUnits.LENGTH", "Units.M");
+        this._angleFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("DefaultToolsUnits.ANGLE", "Units.RAD");
         this._removeFormatterListener = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.formatsProvider.onFormatsChanged.addListener(async (args) => {
-            if (args.formatsChanged === "all" || args.formatsChanged.includes("AecUnits.LENGTH"))
-                this._lengthFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.LENGTH", "Units.M");
-            if (args.formatsChanged === "all" || args.formatsChanged.includes("AecUnits.ANGLE"))
-                this._angleFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.ANGLE", "Units.RAD");
+            if (args.formatsChanged === "all" || args.formatsChanged.includes("DefaultToolsUnits.LENGTH"))
+                this._lengthFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("DefaultToolsUnits.LENGTH", "Units.M");
+            if (args.formatsChanged === "all" || args.formatsChanged.includes("DefaultToolsUnits.ANGLE"))
+                this._angleFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("DefaultToolsUnits.ANGLE", "Units.RAD");
         });
         this.setupAndPromptForNextAction();
     }
@@ -178626,7 +178858,7 @@ class MeasureLocationTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_9__.Pr
         const isSpatial = (undefined !== this.targetView && this.targetView.view.isSpatialView());
         const toolTip = document.createElement("div");
         let toolTipHtml = "";
-        const coordFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.LENGTH", "Units.M");
+        const coordFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("DefaultToolsUnits.LENGTH_COORDINATE", "Units.M");
         if (undefined !== coordFormatterSpec) {
             let pointAdjusted = point;
             if (isSpatial) {
@@ -178642,7 +178874,7 @@ class MeasureLocationTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_9__.Pr
             toolTipHtml += "<br>";
         }
         if (isSpatial) {
-            const latLongFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.ANGLE", "Units.RAD");
+            const latLongFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("DefaultToolsUnits.ANGLE", "Units.RAD");
             if (undefined !== latLongFormatterSpec && undefined !== coordFormatterSpec) {
                 try {
                     const cartographic = await this.iModel.spatialToCartographic(point);
@@ -178946,17 +179178,17 @@ class MeasureAreaByPointsTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_9_
         const isSpatial = (undefined !== this.targetView && this.targetView.view.isSpatialView());
         const toolTip = document.createElement("div");
         let toolTipHtml = "";
-        const areaFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.AREA", "Units.SQ_M");
+        const areaFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("DefaultToolsUnits.AREA", "Units.SQ_M");
         if (undefined !== areaFormatterSpec) {
             const formattedArea = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(this._area, areaFormatterSpec);
             toolTipHtml += `${translateBold("Area") + formattedArea}<br>`;
         }
-        const perimeterFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.LENGTH", "Units.M");
+        const perimeterFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("DefaultToolsUnits.LENGTH", "Units.M");
         if (undefined !== perimeterFormatterSpec) {
             const formattedPerimeter = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(this._perimeter, perimeterFormatterSpec);
             toolTipHtml += `${translateBold("Perimeter") + formattedPerimeter}<br>`;
         }
-        const coordFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.LENGTH", "Units.M");
+        const coordFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("DefaultToolsUnits.LENGTH_COORDINATE", "Units.M");
         if (undefined !== coordFormatterSpec) {
             let pointAdjusted = this._centroid.clone();
             if (isSpatial) {
@@ -178995,7 +179227,7 @@ class MeasureAreaByPointsTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_9_
         const toolTip = await this.getMarkerToolTip();
         this._acceptedMeasurement = new MeasureMarker("1", toolTip, this._centroid, _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Point2d.create(25, 25));
         this._marker = undefined;
-        const areaFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.AREA", "Units.SQ_M");
+        const areaFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("DefaultToolsUnits.AREA", "Units.SQ_M");
         if (undefined === areaFormatterSpec)
             return;
         const formattedTotalArea = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(this._area, areaFormatterSpec);
@@ -179178,7 +179410,7 @@ class MeasureElementTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_9__.Pri
         let toolTipHtml = "";
         switch (this.getOperation()) {
             case _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.MassPropertiesOperation.AccumulateLengths: {
-                const distanceFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.LENGTH", "Units.M");
+                const distanceFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("DefaultToolsUnits.LENGTH", "Units.M");
                 if (undefined !== distanceFormatterSpec) {
                     const formattedLength = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(responseProps.length ? responseProps.length : 0, distanceFormatterSpec);
                     toolTipHtml += `${translateBold("Length") + formattedLength}<br>`;
@@ -179186,13 +179418,13 @@ class MeasureElementTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_9__.Pri
                 break;
             }
             case _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.MassPropertiesOperation.AccumulateAreas: {
-                const areaFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.AREA", "Units.SQ_M");
+                const areaFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("DefaultToolsUnits.AREA", "Units.SQ_M");
                 if (undefined !== areaFormatterSpec) {
                     const formattedArea = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(responseProps.area ? responseProps.area : 0, areaFormatterSpec);
                     toolTipHtml += `${translateBold("Area") + formattedArea}<br>`;
                 }
                 if (responseProps.perimeter) {
-                    const perimeterFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.LENGTH", "Units.M");
+                    const perimeterFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("DefaultToolsUnits.LENGTH", "Units.M");
                     if (undefined !== perimeterFormatterSpec) {
                         const formattedPerimeter = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(responseProps.perimeter, perimeterFormatterSpec);
                         toolTipHtml += `${translateBold("Perimeter") + formattedPerimeter}<br>`;
@@ -179201,13 +179433,13 @@ class MeasureElementTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_9__.Pri
                 break;
             }
             case _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.MassPropertiesOperation.AccumulateVolumes: {
-                const volumeFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.VOLUME", "Units.CUB_M");
+                const volumeFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("DefaultToolsUnits.VOLUME", "Units.CUB_M");
                 if (undefined !== volumeFormatterSpec) {
                     const formattedVolume = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(responseProps.volume ? responseProps.volume : 0, volumeFormatterSpec);
                     toolTipHtml += `${translateBold("Volume") + formattedVolume}<br>`;
                 }
                 if (responseProps.area) {
-                    const areaFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.AREA", "Units.SQ_M");
+                    const areaFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("DefaultToolsUnits.AREA", "Units.SQ_M");
                     if (undefined !== areaFormatterSpec) {
                         const formattedArea = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(responseProps.area, areaFormatterSpec);
                         toolTipHtml += `${translateBold("Area") + formattedArea}<br>`;
@@ -179217,7 +179449,7 @@ class MeasureElementTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_9__.Pri
             }
         }
         if (responseProps.centroid) {
-            const coordFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.LENGTH", "Units.M");
+            const coordFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("DefaultToolsUnits.LENGTH", "Units.M");
             if (undefined !== coordFormatterSpec) {
                 let pointAdjusted = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Point3d.fromJSON(responseProps.centroid);
                 if (isSpatial) {
@@ -179268,21 +179500,21 @@ class MeasureElementTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_9__.Pri
             return;
         switch (operation) {
             case _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.MassPropertiesOperation.AccumulateLengths:
-                const distanceFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.LENGTH", "Units.M");
+                const distanceFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("DefaultToolsUnits.LENGTH", "Units.M");
                 if (undefined === distanceFormatterSpec)
                     return;
                 const formattedTotalDistance = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(this._totalValue, distanceFormatterSpec);
                 this._totalMarker = new MeasureLabel(labelPt, formattedTotalDistance);
                 break;
             case _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.MassPropertiesOperation.AccumulateAreas:
-                const areaFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.AREA", "Units.SQ_M");
+                const areaFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("DefaultToolsUnits.AREA", "Units.SQ_M");
                 if (undefined === areaFormatterSpec)
                     return;
                 const formattedTotalArea = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(this._totalValue, areaFormatterSpec);
                 this._totalMarker = new MeasureLabel(labelPt, formattedTotalArea);
                 break;
             case _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.MassPropertiesOperation.AccumulateVolumes:
-                const volumeFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.VOLUME", "Units.CUB_M");
+                const volumeFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("DefaultToolsUnits.VOLUME", "Units.CUB_M");
                 if (undefined === volumeFormatterSpec)
                     return;
                 const formattedTotalVolume = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(this._totalValue, volumeFormatterSpec);
@@ -194523,7 +194755,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 /**
- * CurveLocationDetail carries point and paramter data about a point evaluated on a curve.
+ * CurveLocationDetail carries point and parameter data about a point evaluated on a curve.
  * * These are returned by a variety of queries.
  * * Particular contents can vary among the queries.
  * @public
@@ -215412,11 +215644,13 @@ __webpack_require__.r(__webpack_exports__);
 /* 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 _CurveLocationDetail__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../CurveLocationDetail */ "../../core/geometry/lib/esm/curve/CurveLocationDetail.js");
+/* harmony import */ var _CurvePrimitive__WEBPACK_IMPORTED_MODULE_23__ = __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 _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");
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
@@ -215443,6 +215677,8 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
 
 
 
@@ -216142,7 +216378,7 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
         return undefined;
     }
     /** Detail computation for linestring intersecting linestring. */
-    computeLineStringLineString(lsA, lsB, reversed) {
+    computeLineStringLineString(lsA, extendA0, extendA1, lsB, extendB0, extendB1, reversed) {
         const pointA0 = CurveCurveIntersectXY._workPointAA0;
         const pointA1 = CurveCurveIntersectXY._workPointAA1;
         const pointB0 = CurveCurveIntersectXY._workPointBB0;
@@ -216166,7 +216402,7 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
                 for (let ib = 1; ib < numB; ib++, pointB0.setFrom(pointB1), fB0 = fB1) {
                     lsB.pointAt(ib, pointB1);
                     fB1 = ib * dfB;
-                    this.dispatchSegmentSegment(lsA, ia === 1 && this._extendA0, pointA0, fA0, pointA1, fA1, (ia + 1) === numA && this._extendA1, lsB, ib === 1 && this._extendB0, pointB0, fB0, pointB1, fB1, (ib + 1) === numB && this._extendB1, reversed);
+                    this.dispatchSegmentSegment(lsA, ia === 1 && extendA0, pointA0, fA0, pointA1, fA1, (ia + 1) === numA && extendA1, lsB, ib === 1 && extendB0, pointB0, fB0, pointB1, fB1, (ib + 1) === numB && extendB1, reversed);
                 }
             }
         }
@@ -216265,6 +216501,14 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
         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) {
+            const spiralApproximation = _LineString3d__WEBPACK_IMPORTED_MODULE_19__.LineString3d.create();
+            this._geometryB.emitStrokes(spiralApproximation);
+            const numPreviousResults = this._results.length;
+            this.computeSegmentLineString(segmentA, this._extendA0, this._extendA1, spiralApproximation, false, false, false);
+            const numberOfNewResults = this._results.length - numPreviousResults;
+            this.refineSpiralResultsByNewton(segmentA, this._geometryB, numberOfNewResults);
+        }
         else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_14__.CurveCollection) {
             this.dispatchCurveCollection(segmentA, this.handleLineSegment3d.bind(this));
         }
@@ -216277,7 +216521,7 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
     handleLineString3d(lsA) {
         if (this._geometryB instanceof _LineString3d__WEBPACK_IMPORTED_MODULE_19__.LineString3d) {
             const lsB = this._geometryB;
-            this.computeLineStringLineString(lsA, lsB, false);
+            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);
@@ -216288,6 +216532,14 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
         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) {
+            const spiralApproximation = _LineString3d__WEBPACK_IMPORTED_MODULE_19__.LineString3d.create();
+            this._geometryB.emitStrokes(spiralApproximation);
+            const numPreviousResults = this._results.length;
+            this.computeLineStringLineString(lsA, this._extendA0, this._extendA1, spiralApproximation, false, false, false);
+            const numberOfNewResults = this._results.length - numPreviousResults;
+            this.refineSpiralResultsByNewton(lsA, this._geometryB, numberOfNewResults);
+        }
         else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_14__.CurveCollection) {
             this.dispatchCurveCollection(lsA, this.handleLineString3d.bind(this));
         }
@@ -216310,6 +216562,14 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
         else if (this._geometryB instanceof _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_21__.BSplineCurve3d) {
             this.dispatchArcBsplineCurve3d(arc0, this._extendA0, this._extendA1, this._geometryB, this._extendB0, this._extendB1, false);
         }
+        else if (this._geometryB instanceof _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_22__.TransitionSpiral3d) {
+            const spiralApproximation = _LineString3d__WEBPACK_IMPORTED_MODULE_19__.LineString3d.create();
+            this._geometryB.emitStrokes(spiralApproximation);
+            const numPreviousResults = this._results.length;
+            this.computeArcLineString(arc0, this._extendA0, this._extendA1, spiralApproximation, false, false, false);
+            const numberOfNewResults = this._results.length - numPreviousResults;
+            this.refineSpiralResultsByNewton(arc0, this._geometryB, numberOfNewResults);
+        }
         else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_14__.CurveCollection) {
             this.dispatchCurveCollection(arc0, this.handleArc3d.bind(this));
         }
@@ -216332,6 +216592,14 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
         else if (this._geometryB instanceof _bspline_BSplineCurve__WEBPACK_IMPORTED_MODULE_21__.BSplineCurve3dBase) {
             this.dispatchBSplineCurve3dBSplineCurve3d(curve, this._geometryB, false);
         }
+        else if (this._geometryB instanceof _spiral_TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_22__.TransitionSpiral3d) {
+            const spiralApproximation = _LineString3d__WEBPACK_IMPORTED_MODULE_19__.LineString3d.create();
+            this._geometryB.emitStrokes(spiralApproximation);
+            const numPreviousResults = this._results.length;
+            this.dispatchLineStringBSplineCurve(spiralApproximation, false, false, curve, this._extendA0, this._extendA1, true);
+            const numberOfNewResults = this._results.length - numPreviousResults;
+            this.refineSpiralResultsByNewton(curve, this._geometryB, numberOfNewResults);
+        }
         else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_14__.CurveCollection) {
             this.dispatchCurveCollection(curve, this.handleBSplineCurve3d.bind(this));
         }
@@ -216340,6 +216608,47 @@ class CurveCurveIntersectXY extends _geometry3d_GeometryHandler__WEBPACK_IMPORTE
         }
         return undefined;
     }
+    /**
+     * Assuming the tail of `this._results` holds the given number of approximate solutions to the curve-spiral
+     * xy-intersection problem, replace each with its Newton refinement, unless it doesn't converge, in which case
+     * it is removed.
+     * @param spiral The transition spiral.
+     * @param otherCurve The other curve primitive.
+     * @param numberOfNewResults The number of results in the tail of `this._results` to be refined.
+     * @param reversed Whether the spiral is geometryA (true) or geometryB (false).
+     */
+    refineSpiralResultsByNewton(otherCurve, spiral, numberOfNewResults, reversed = false) {
+        const resultsToBeRefined = this._results.slice(this._results.length - numberOfNewResults);
+        this._results.length -= numberOfNewResults; // keep already refined results
+        for (const detail of resultsToBeRefined) {
+            let spiralFraction = reversed ? detail.detailA.fraction : detail.detailB.fraction;
+            let otherFraction = reversed ? detail.detailB.fraction : detail.detailA.fraction;
+            const xyMatchingFunction = new _numerics_Newton__WEBPACK_IMPORTED_MODULE_13__.CurveCurveIntersectionXYRRToRRD(spiral, otherCurve);
+            const newtonSearcher = new _numerics_Newton__WEBPACK_IMPORTED_MODULE_13__.Newton2dUnboundedWithDerivative(xyMatchingFunction);
+            newtonSearcher.setUV(spiralFraction, otherFraction);
+            if (newtonSearcher.runIterations()) {
+                spiralFraction = newtonSearcher.getU();
+                otherFraction = newtonSearcher.getV();
+                if (this.acceptFraction(false, spiralFraction, false) && this.acceptFraction(false, otherFraction, false))
+                    this.recordPointWithLocalFractions(otherFraction, otherCurve, 0, 1, spiralFraction, spiral, 0, 1, reversed);
+            }
+        }
+    }
+    /** Double dispatch handler for strongly typed spiral curve. */
+    handleTransitionSpiral(spiral) {
+        if (this._geometryB instanceof _CurvePrimitive__WEBPACK_IMPORTED_MODULE_23__.CurvePrimitive) { // this also handles CurveChainWithDistanceIndex
+            const spiralApproximation = _LineString3d__WEBPACK_IMPORTED_MODULE_19__.LineString3d.create();
+            spiral.emitStrokes(spiralApproximation);
+            const numPreviousResults = this._results.length;
+            this.handleLineString3d(spiralApproximation);
+            const numberOfNewResults = this._results.length - numPreviousResults;
+            this.refineSpiralResultsByNewton(this._geometryB, spiral, numberOfNewResults, true);
+        }
+        else if (this._geometryB instanceof _CurveCollection__WEBPACK_IMPORTED_MODULE_14__.CurveCollection) {
+            this.dispatchCurveCollection(spiral, this.handleTransitionSpiral.bind(this));
+        }
+        return undefined;
+    }
     /** Double dispatch handler for strongly typed CurveChainWithDistanceIndex. */
     handleCurveChainWithDistanceIndex(chain) {
         super.handleCurveChainWithDistanceIndex(chain);
@@ -220029,7 +220338,7 @@ class AustralianRailCorpXYEvaluator extends _CubicEvaluator__WEBPACK_IMPORTED_MO
      * * The AustralianRailSpiral has a supporting power series to approximately map distance along the spiral to
      * an x coordinate.
      * * The `xToFraction(x)` method quickly (with a single divide) converts this x to fraction used for
-     * this.fractionToX (fraction), this.fractionToY(fraction) etc to get coordinates and derivatives.
+     * this.fractionToX(fraction), this.fractionToY(fraction) etc to get coordinates and derivatives.
      * * The x-to-distance relation is not as precise as the CurvePrimitive method moveSignedDistanceFromFraction.
      * * It is supported here for users interested in replicating the AustralianRail distance mapping rather than the
      * more accurate CurvePrimitive measurements.
@@ -220080,8 +220389,8 @@ __webpack_require__.r(__webpack_exports__);
  * Methods to evaluate caller-specified number of terms of the x and y Taylor series for a clothoid.
  * Each instance has:
  * * number of x and y terms to use.
- * * constant for theta = c*x*x.
- *    * This value is c = 1/(2*R*L) for curve length L measured from inflection to point with radius R.
+ * * constant for theta = cxx.
+ *    * This value is c = 1/2RL for curve length L measured from inflection to point with radius R.
  * @internal
  */
 class ClothoidSeriesRLEvaluator extends _XYCurveEvaluator__WEBPACK_IMPORTED_MODULE_0__.XYCurveEvaluator {
@@ -220089,7 +220398,7 @@ class ClothoidSeriesRLEvaluator extends _XYCurveEvaluator__WEBPACK_IMPORTED_MODU
     numXTerms;
     /** Number of terms to use in y Taylor series. */
     numYTerms;
-    /** Constant c = 1/(2*R*L) in theta = c*s*s. */
+    /** Constant c = 1/2RL in theta = cxx. */
     constantDiv2LR;
     /** The nominal curve length. */
     nominalLength1;
@@ -220166,10 +220475,12 @@ class ClothoidSeriesRLEvaluator extends _XYCurveEvaluator__WEBPACK_IMPORTED_MODU
      * @param numTerms number of terms to use.
      */
     fractionToXGo(fraction, numTerms) {
-        // write the Taylor series for cos(theta)
-        // replace theta by s*s*c
-        // integrate wrt s
-        //  x = s - s^5 c^2/ 5*2! + s^9 c^4 / 9*4! - s^13 c^6 / 13*6! + ...
+        // write the Taylor series for cos(theta):
+        // 1 - theta^2 / 2! + theta^4 / 4! - theta^6 / 6! + ...
+        // replace theta by s*s*c:
+        // 1 - s^4c^2 / 2! + s^8c^4 / 4! - s^12c^6 / 6! + ...
+        // integrate wrt s:
+        //  x = s - s^5 c^2 / 5*2! + s^9 c^4 / 9*4! - s^13 c^6 / 13*6! + ...
         //  x = s(1 - (s^4 c^2/2) ( 1/5 - (s^4 c^2 / 3*4) (1/9 - ...) ) )
         const s = fraction * this.nominalLength1;
         let result = s;
@@ -220189,9 +220500,11 @@ class ClothoidSeriesRLEvaluator extends _XYCurveEvaluator__WEBPACK_IMPORTED_MODU
         return result;
     }
     fractionToYGo(fraction, numTerms) {
-        // write the Taylor series for sin(theta)
-        // replace theta by s*s*c
-        // integrate wrt s
+        // write the Taylor series for sin(theta):
+        // theta - theta^3 / 3! + theta^5 / 5! - theta^7 / 7! + ...
+        // replace theta by s*s*c:
+        // s^2 c - s^6 c^3 / 3! + s^10 c^5 / 5! - s^14 c^7 / 7! + ...
+        // integrate wrt s:
         // y = s^3 c / 3 - s^7 c^3 / 7*3! + s^11 c^5 / 11*5! - s^15 c^7 / 15*7! + ...
         // y = s^3 c ( 1/3 - s^4 c^2/ 3! ( (1/7) - (s^4 c^2 / 4*5) (1/11 - ...) ) )
         const s = fraction * this.nominalLength1;
@@ -220239,7 +220552,7 @@ class ClothoidSeriesRLEvaluator extends _XYCurveEvaluator__WEBPACK_IMPORTED_MODU
         // dY = q - q^3/3!
         // q = s^2 c
         // dY = s^2 c - s^6 c^3/3! + s^10 c^5/ 5!
-        // recurrence  advancing m by 2  alpha *= -(s^4 c^2) / (m(m+1))
+        // recurrence advancing m by 2  alpha *= -(s^4 c^2) / (m(m+1))
         const s = fraction * this.nominalLength1;
         const q1 = s * s * this.constantDiv2LR;
         let result = q1;
@@ -220461,7 +220774,7 @@ class CzechSpiralEvaluator extends _CubicEvaluator__WEBPACK_IMPORTED_MODULE_0__.
     static gammaConstant(length1, radius1) {
         return 2.0 * radius1 / Math.sqrt(4.0 * radius1 * radius1 - length1 * length1);
     }
-    /** Compute the czech cubic constant. */
+    /** Compute the Czech cubic constant. */
     static computeCubicM(length1, radius1) {
         const gamma = CzechSpiralEvaluator.gammaConstant(length1, radius1);
         // in the private update method, the LR values should have been vetted
@@ -220554,17 +220867,9 @@ class CzechSpiralEvaluator extends _CubicEvaluator__WEBPACK_IMPORTED_MODULE_0__.
 class ItalianSpiralEvaluator extends _CubicEvaluator__WEBPACK_IMPORTED_MODULE_0__.CubicEvaluator {
     nominalLength1;
     nominalRadius1;
-    /**
-     * Compute the czech cubic constant.
-     * * Funky mixture of lengths.
-     */
+    /** Compute the Italian cubic constant. */
     static computeCubicM(lengthXByForward, radius1) {
-        const gamma = CzechSpiralEvaluator.gammaConstant(lengthXByForward, radius1);
-        // in the private update method, the LR values should have been vetted
-        if (gamma === undefined)
-            return undefined;
-        // if radius is negative, it shows up in gamma; but the a signed denominator undoes it so take abs of denominator
-        return gamma / Math.abs((6.0 * radius1 * lengthXByForward));
+        return CzechSpiralEvaluator.computeCubicM(lengthXByForward, radius1);
     }
     /** Constructor is private. Caller responsible for cubicM validity. */
     constructor(length1, radius1, lengthX, cubicM) {
@@ -220573,7 +220878,7 @@ class ItalianSpiralEvaluator extends _CubicEvaluator__WEBPACK_IMPORTED_MODULE_0_
         this.nominalRadius1 = radius1;
     }
     static create(length1, radius1) {
-        // this seems goofy.; lengthX from forward, then invert for another but that's what the native code does too
+        // this seems goofy; lengthX from forward, then invert for another but that's what the native code does too
         const lengthX = CzechSpiralEvaluator.forwardL2R2Map(length1, -1.0, length1, radius1);
         const lengthX1 = CzechSpiralEvaluator.inverseL2R2Map(length1, 1.0, lengthX, radius1);
         if (lengthX1 === undefined)
@@ -220789,18 +221094,20 @@ __webpack_require__.r(__webpack_exports__);
 * DirectSpiral3d acts like a TransitionSpiral3d for serialization purposes, but implements spiral types that have
 * "direct" xy calculations without the integrations required for IntegratedSpiral3d.
 * * Each DirectSpiral3d carries an XYCurveEvaluator to give it specialized behavior.
-* * Direct spirals that flow through serialization to native imodel02 are created with these static methods:
+* * Direct spirals are created with these static methods:
 *   * createArema
 *   * createJapaneseCubic
-*   * createAustralianRail
-*   * createDirectHalfCosine
 *   * createChineseCubic
+*   * createWesternAustralian
+*   * createDirectHalfCosine
+*   * createAustralianRail
 *   * createCzechCubic
 *   * createPolishCubic
+*   * createMXCubicAlongArc
 *   * createItalian
-*   * createWesternAustralian
 * @public
 */
+// see internaldocs/Spiral.md for more info
 class DirectSpiral3d extends _TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_0__.TransitionSpiral3d {
     /** String name for schema properties. */
     curvePrimitiveType = "transitionSpiral";
@@ -220956,11 +221263,11 @@ class DirectSpiral3d extends _TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_0__.Tr
     /**
      * Create an MX Cubic whose nominal length is close to along the curve.
      * This is y = m*x^3 with
-     * * m is 1/(6RL1).
+     * * m is 1/(6RL).
      *    * 1/(6RL) is the leading term of the sine series.
      * * L1 is an along-the-x-axis distance that is slightly LESS THAN the nominal length.
      * * x is axis position that is slightly LESS than nominal distance along.
-     * * L1, x use the approximation `x = s * ( 1 - s^4/ (40 R R L L))
+     * * L1, x use the approximation `x = s * ( 1 - s^4/ (40 RR LL))
      * @param localToWorld
      * @param nominalL1
      * @param nominalR1
@@ -221321,6 +221628,7 @@ __webpack_require__.r(__webpack_exports__);
  * * [[TransitionConditionalProperties]] implements the computations of the interrelationship of radii, bearing, and length.
  * @public
  */
+// see internaldocs/Spiral.md for more info
 class IntegratedSpiral3d extends _TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_0__.TransitionSpiral3d {
     /** String name for schema properties. */
     curvePrimitiveType = "transitionSpiral";
@@ -221364,11 +221672,13 @@ class IntegratedSpiral3d extends _TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_0_
     static defaultSpiralType = "clothoid";
     /** Use the integrated function to return an angle at fractional position. */
     globalFractionToBearingRadians(fraction) {
+        // calculate area under curvature curve from 0 to fraction and add it to start angle to get angle at the given fraction
+        // see internaldocs/Spiral.md for more info
         const areaFraction = this._evaluator.fractionToArea(fraction);
-        const dx = this._arcLength01;
+        const arcLength = this._arcLength01;
         return this.bearing01.startRadians
-            + areaFraction * dx * this._curvature01.signedDelta()
-            + fraction * this._curvature01.x0 * dx;
+            + fraction * arcLength * this._curvature01.x0
+            + areaFraction * arcLength * this._curvature01.signedDelta();
     }
     /** Use the integrated function to return an angle at fractional position. */
     globalFractionToCurvature(fraction) {
@@ -221407,9 +221717,10 @@ class IntegratedSpiral3d extends _TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_0_
      * @param xyz advancing integrated point.
      * @param fractionA fraction at start of interval.
      * @param fractionB fraction at end of interval.
-     * @param unitArcLength length of curve for 0 to 1 fractional.
+     * @param applyMatrix if true, apply the localToWorld matrix to the computed delta before adding to xyz.
      */
     fullSpiralIncrementalIntegral(xyz, fractionA, fractionB, applyMatrix) {
+        // see internaldocs/Spiral.md for more info
         const gaussFraction = IntegratedSpiral3d._gaussFraction;
         const gaussWeight = IntegratedSpiral3d._gaussWeight;
         const numEval = IntegratedSpiral3d._gaussMapper(fractionA, fractionB, gaussFraction, gaussWeight);
@@ -221459,7 +221770,7 @@ class IntegratedSpiral3d extends _TransitionSpiral3d__WEBPACK_IMPORTED_MODULE_0_
     /**
      * Create a transition spiral with radius and bearing conditions.
      * @param radius01 radius (inverse curvature) at start and end (radius of zero means straight line).
-     * @param bearing01 bearing angles at start and end.  bearings are measured from the x axis, positive clockwise
+     * @param bearing01 bearing angles at start and end. Bearings are measured from the x axis, positive clockwise
      * towards y axis.
      * @param activeFractionInterval fractional limits of the active portion of the spiral.
      * @param localToWorld placement frame. Fractional coordinate 0 is at the origin.
@@ -221839,10 +222150,12 @@ __webpack_require__.r(__webpack_exports__);
  * * Each implementation provides:
  *   * fractionToCurvature -- the f(u) function described above
  *   * fractionToCurvatureDerivative -- df(u)/du
- *   * fractionToArea -- integral of the area under f(u) from 0 to u.
- * * The symmetry condition ensures that the integral from 0 to 1 is 1/2.
+ *   * fractionToArea -- antiderivative A of f, chosen such that A(0) = 0. The value of this function at
+ *     fraction u is the area under f from 0 to u. In particular, the symmetry condition on f implies that
+ *     1/2 = "integral of f over [0,1]" = A(1) - A(0) = A(1).
  * @internal
  */
+// see internaldocs/Spiral.md for more info
 class NormalizedTransition {
     /** Constructor initializes with 0..1 values. Call "setBearingCurvatureLengthCurvature" to apply real values. */
     constructor() { }
@@ -221879,10 +222192,13 @@ class NormalizedTransition {
 }
 /**
  * Transition functions for clothoid spiral.
- * * curvature variation is linear from (0,0) to (1,1)
+ * * Curvature variation is linear from (0,0) to (1,1).
  * @internal
  */
 class NormalizedClothoidTransition extends NormalizedTransition {
+    // clothoid curvature is f(x) = x
+    // derivative f'(x) = 1
+    // integral If(x) = x^2 / 2
     constructor() {
         super();
     }
@@ -221908,13 +222224,12 @@ class NormalizedClothoidTransition extends NormalizedTransition {
  * @internal
  */
 class NormalizedBlossTransition extends NormalizedTransition {
-    // bloss curve is (3 - 2x) x ^2 = 3 x^2 - 2 x^3
+    // bloss curvature is x^2 (3 - 2x)
     // derivative 6x (1-x)
-    // 2nd derivative 6 - 12 x
-    // derivatives zero at 0,1
-    // inflection zero at 0.5
-    // integral is x^3 - x^4 / 2 = x^3 (1-x/2)
-    constructor() { super(); }
+    // integral is x^3 (1-x/2)
+    constructor() {
+        super();
+    }
     /** At fractional position on the x axis, return the (normalized) curvature fraction. */
     fractionToCurvatureFraction(u) {
         return u * u * (3 - 2 * u);
@@ -221953,17 +222268,17 @@ class NormalizedBiQuadraticTransition extends NormalizedTransition {
     }
     /**
      * At fractional position on the x axis, return the (normalized) curvature fraction.
-     *  * For [u <= 0.5, u >= 0.5]
-     *    * f(u) = [2 u^2, 1 - 2 (1-u)^2]
-     *    * f'(u) = [4 u, 4 (1-u)]
-     *    * If(u) = [2 u^3 / 3, 0.5 (1 -u )^3/3]
+     *  * For [u <= 0.5, u > 0.5]
+     *    * f(u) = [2u^2, 1 - 2(1-u)^2]
+     *    * f'(u) = [4u, 4(1-u)]
+     *    * If(u) = [2u^3 / 3, u + 2(1-u)^3 /3]
      */
     fractionToCurvatureFraction(u) {
         return u <= 0.5 ? this.basis(u) : 1.0 - this.basis(1.0 - u);
     }
     /** Return the derivative of the (normalized) curvature fraction. */
     fractionToCurvatureFractionDerivative(u) {
-        return u < 0.5 ? this.basisDerivative(u) : this.basisDerivative(1 - u);
+        return u <= 0.5 ? this.basisDerivative(u) : this.basisDerivative(1 - u);
     }
     /**
      * Return the integrated area under the curve.
@@ -221972,6 +222287,7 @@ class NormalizedBiQuadraticTransition extends NormalizedTransition {
     fractionToArea(u) {
         if (u <= 0.5)
             return this.integratedBasis(u);
+        // if u > 0.5, integral[0 to u] would be integral[0 to 0.5] of "2u^2" + integral[0.5 to u] of "1 - 2(1-u)^2"
         const v = 1 - u;
         return 0.5 - v + this.integratedBasis(v);
     }
@@ -221984,7 +222300,13 @@ class NormalizedBiQuadraticTransition extends NormalizedTransition {
  * @internal
  */
 class NormalizedSineTransition extends NormalizedTransition {
-    constructor() { super(); }
+    // sine transition curvature is x - sin(2 pi x) / (2 pi)
+    // derivative 1 - cos(2 pi x)
+    // integral x^2 / 2 + (cos(2 pi x) - 1) / (4 pi^2)
+    // note: this is the only snap function whose antiderivative is chosen with nonzero integration constant.
+    constructor() {
+        super();
+    }
     /** At fractional position on the x axis, return the (normalized) curvature fraction. */
     fractionToCurvatureFraction(u) {
         const a = 2.0 * Math.PI;
@@ -222010,7 +222332,12 @@ class NormalizedSineTransition extends NormalizedTransition {
  * @internal
  */
 class NormalizedCosineTransition extends NormalizedTransition {
-    constructor() { super(); }
+    // cosine transition curvature is 0.5 (1 - cos(pi x))
+    // derivative 0.5 pi sin(pi x)
+    // integral 0.5 (x - sin(pi x) / pi)
+    constructor() {
+        super();
+    }
     /** At fractional position on the x axis, return the (normalized) curvature fraction. */
     fractionToCurvatureFraction(u) {
         const a = Math.PI;
@@ -222196,6 +222523,7 @@ __webpack_require__.r(__webpack_exports__);
  * determines the remaining one.
  * @public
  */
+// see internaldocs/Spiral.md for more info
 class TransitionConditionalProperties {
     /**
      * Radius at start (radius of the osculating circle at the spiral segment's start).
@@ -222391,6 +222719,7 @@ __webpack_require__.r(__webpack_exports__);
  *   * This is not necessary for integrated spirals.
  * @public
  */
+// see internaldocs/Spiral.md for more info
 class TransitionSpiral3d extends _CurvePrimitive__WEBPACK_IMPORTED_MODULE_0__.CurvePrimitive {
     /** String name of spiral type. */
     _spiralType;
@@ -242490,8 +242819,7 @@ class Ray3d {
         return this.origin.isAlmostEqual(other.origin, tolerance) && this.direction.isAlmostEqual(other.direction, tolerance);
     }
     /**
-     * Return the dot product of the ray's direction vector with a vector from the ray origin
-     * to the `spacePoint`.
+     * Return the dot product of the ray's direction vector with a vector from the ray origin to the `spacePoint`.
      * * If the instance is the unit normal of a plane, then this method returns the (signed) altitude
      * of `spacePoint` with respect to the plane.
      * * Visualization can be found at https://www.itwinjs.org/sandbox/SaeedTorabi/ProjectVectorOnPlane
@@ -249475,7 +249803,7 @@ class NewtonEvaluatorRtoRD {
 /**
  * Newton iterator for use when both function and derivative can be evaluated.
  * To solve `f(x) = 0`, the Newton iteration is `x_{n+1} = x_n - dx = x_n - f(x_n)/f'(x_n)`.
- * To solve `f(x) = target` which is equivalent to solving  `g(x) = f(x) - target = 0`, the Newton iteration is
+ * To solve `f(x) = target` which is equivalent to solving `g(x) = f(x) - target = 0`, the Newton iteration is
  * `x_{n+1} = x_n - dx = x_n - g(x_n)/g'(x_n) = x_n - (f(x_n)-target)/f'(x_n)`.
  * @internal
  */
@@ -306484,7 +306812,25 @@ class Formatter {
                     return { componentText: "", isNegative: false };
             }
             if (i < (spec.format.units?.length ?? 0) - 1) {
-                const wholePart = Math.trunc(unitValue);
+                let wholePart = Math.trunc(unitValue);
+                // Check if the remaining fractional part will round up to a full unit in the next (smaller) component
+                if (spec.format.type === _FormatEnums__WEBPACK_IMPORTED_MODULE_2__.FormatType.Fractional && i === spec.unitConversions.length - 2) {
+                    // For the second-to-last unit with fractional formatting, check if rounding causes carry-over
+                    const fractionalPart = unitValue - wholePart;
+                    const nextUnitValue = (0,_Quantity__WEBPACK_IMPORTED_MODULE_3__.applyConversion)(fractionalPart, spec.unitConversions[i + 1].conversion);
+                    // Create a FractionalNumeric to determine what the rounded value would be
+                    const fn = new FractionalNumeric(Math.abs(nextUnitValue), spec.format.precision, true);
+                    // If the fractional numeric rounds to a whole unit (integral part increased due to rounding)
+                    // and the next unit value would round to equal the conversion factor, we need to carry it over
+                    const roundedNextValue = parseFloat(fn.getIntegralString());
+                    const expectedNextValue = Math.floor(Math.abs(nextUnitValue));
+                    // Check if rounding caused the value to reach the conversion factor (1 full unit of the parent)
+                    const conversionFactor = spec.unitConversions[i + 1].conversion.factor;
+                    if (roundedNextValue > expectedNextValue && Math.abs(roundedNextValue - conversionFactor) < this.FPV_MINTHRESHOLD) {
+                        // The rounding caused a carry-over to a full parent unit, add 1 to the current unit's whole part
+                        wholePart += (unitValue >= 0 ? 1 : -1);
+                    }
+                }
                 const componentText = Formatter.formatCompositePart(Math.abs(wholePart), false, currentLabel, spec);
                 remainingMagnitude = unitValue - wholePart;
                 compositeStrings.push(componentText);
@@ -321911,7 +322257,7 @@ var loadLanguages = instance.loadLanguages;
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@itwin/core-frontend","version":"5.4.0-dev.7","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","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":{"@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":"5.2.2-dev.2","@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.3.12","playwright":"~1.56.1","rimraf":"^6.0.1","sinon":"^17.0.2","source-map-loader":"^5.0.0","typescript":"~5.6.2","typemoq":"^2.1.0","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.5.0-dev.2","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","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":{"@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":"5.2.2-dev.2","@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","typemoq":"^2.1.0","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"}}');
 
 /***/ })