@itwin/rpcinterface-full-stack-tests 5.0.0-dev.100 → 5.0.0-dev.104

package/lib/dist/bundled-tests.js

@@ -65128,9 +65128,11 @@ class MapSubLayerSettings {
 var ModelMapLayerDrapeTarget;
 (function (ModelMapLayerDrapeTarget) {
     /** Drape only onto the globe. */
-    ModelMapLayerDrapeTarget[ModelMapLayerDrapeTarget["Globe"] = 0] = "Globe";
+    ModelMapLayerDrapeTarget[ModelMapLayerDrapeTarget["Globe"] = 1] = "Globe";
     /** Drape only onto all attached reality data. */
-    ModelMapLayerDrapeTarget[ModelMapLayerDrapeTarget["RealityData"] = 1] = "RealityData";
+    ModelMapLayerDrapeTarget[ModelMapLayerDrapeTarget["RealityData"] = 2] = "RealityData";
+    /** Drape only onto all models within the iModel. */
+    ModelMapLayerDrapeTarget[ModelMapLayerDrapeTarget["IModel"] = 4] = "IModel";
 })(ModelMapLayerDrapeTarget || (ModelMapLayerDrapeTarget = {}));
 /** Abstract base class for normalized representation of a [[MapLayerProps]] for which values have been validated and default values have been applied where explicit values not defined.
  * This class is extended by [[ImageMapLayerSettings]] and [ModelMapLayerSettings]] to create the settings for image and model based layers.
@@ -90297,7 +90299,7 @@ class SchemaReadHelper {
         // Loads all of the properties on the Schema object
         await schema.fromJSON(this._parser.parseSchema());
         this._schema = schema;
-        const schemaInfo = { schemaKey: schema.schemaKey, references: [] };
+        const schemaInfo = { schemaKey: schema.schemaKey, alias: schema.alias, references: [] };
         for (const reference of this._parser.getReferences()) {
             const refKey = new _SchemaKey__WEBPACK_IMPORTED_MODULE_5__.SchemaKey(reference.name, _SchemaKey__WEBPACK_IMPORTED_MODULE_5__.ECVersion.fromString(reference.version));
             schemaInfo.references.push({ schemaKey: refKey });
@@ -102267,53 +102269,32 @@ class AccuDraw {
     /** @internal */
     static getSnapRotation(snap, currentVp, out) {
         const vp = (undefined !== currentVp) ? currentVp : snap.viewport;
+        const snapDetail = snap.primitive?.closestPoint(snap.snapPoint, false);
+        const frame = snapDetail?.curve?.fractionToFrenetFrame(snapDetail.fraction);
+        if (undefined === frame && undefined === snap.normal)
+            return undefined;
+        const zVec = (vp.view.allow3dManipulations() ? (snap.normal?.clone() ?? frame?.matrix.columnZ()) : _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Vector3d.unitZ());
+        if (undefined === zVec)
+            return undefined;
         const rotation = out ? out : new _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Matrix3d();
         const viewZ = vp.rotation.rowZ();
-        const snapLoc = (undefined !== snap.primitive ? snap.primitive.closestPoint(snap.snapPoint, false) : undefined);
-        if (undefined !== snapLoc) {
-            const frame = snap.primitive.fractionToFrenetFrame(snapLoc.fraction);
-            const frameZ = (undefined !== frame ? frame.matrix.columnZ() : _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Vector3d.unitZ());
-            let xVec = (undefined !== frame ? frame.matrix.columnX() : _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Vector3d.unitX());
-            const zVec = (vp.view.allow3dManipulations() ? (undefined !== snap.normal ? snap.normal.clone() : frameZ.clone()) : _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Vector3d.unitZ());
-            if (!vp.isCameraOn && viewZ.isPerpendicularTo(zVec))
-                zVec.setFrom(viewZ);
+        zVec.normalizeInPlace();
+        if (zVec.dotProduct(viewZ) < 0.0)
+            zVec.negate(zVec);
+        if (frame) {
+            const xVec = frame.matrix.columnX();
             xVec.normalizeInPlace();
-            zVec.normalizeInPlace();
-            let yVec = xVec.unitCrossProduct(zVec);
+            const yVec = zVec.unitCrossProduct(xVec);
             if (undefined !== yVec) {
-                const viewX = vp.rotation.rowX();
-                if (snap.primitive instanceof _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.LineString3d) {
-                    if (Math.abs(xVec.dotProduct(viewX)) < Math.abs(yVec.dotProduct(viewX)))
-                        xVec = yVec;
-                    if (xVec.dotProduct(viewX) < 0.0)
-                        xVec.negate(xVec);
-                }
-                else {
-                    const ray = snap.primitive.fractionToPointAndUnitTangent(0.0);
-                    if (ray.direction.dotProduct(viewX) < 0.0 && ray.direction.dotProduct(xVec) > 0.0)
-                        xVec.negate(xVec);
-                }
-                if (zVec.dotProduct(viewZ) < 0.0)
-                    zVec.negate(zVec);
-                yVec = xVec.unitCrossProduct(zVec);
-                if (undefined !== yVec) {
-                    rotation.setColumns(xVec, yVec, zVec);
-                    _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Matrix3d.createRigidFromMatrix3d(rotation, _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.AxisOrder.XZY, rotation);
-                    rotation.transposeInPlace();
-                    return rotation;
-                }
-            }
-        }
-        if (undefined !== snap.normal) {
-            const zVec = (vp.view.allow3dManipulations() ? snap.normal.clone() : _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Vector3d.unitZ());
-            if (!vp.isCameraOn && viewZ.isPerpendicularTo(zVec))
-                zVec.setFrom(viewZ);
-            zVec.normalizeInPlace();
-            _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Matrix3d.createRigidHeadsUp(zVec, undefined, rotation);
-            rotation.transposeInPlace();
-            return rotation;
+                rotation.setColumns(xVec, yVec, zVec);
+                rotation.makeRigid();
+                rotation.transposeInPlace();
+                return rotation;
+            }
         }
-        return undefined;
+        _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Matrix3d.createRigidHeadsUp(zVec, undefined, rotation);
+        rotation.transposeInPlace();
+        return rotation;
     }
     /** @internal */
     static getStandardRotation(nStandard, vp, useACS, out) {
@@ -115095,6 +115076,8 @@ class GeometricModelState extends ModelState {
         const spatialModel = this.asSpatialModel;
         const rdSourceKey = this.jsonProperties.rdSourceKey;
         const getDisplaySettings = () => view.displayStyle.settings.getRealityModelDisplaySettings(this.id) ?? _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.RealityModelDisplaySettings.defaults;
+        const getBackgroundBase = () => view.displayStyle.settings?.mapImagery.backgroundBase;
+        const getBackgroundLayers = () => view.displayStyle.settings?.mapImagery.backgroundLayers;
         if (rdSourceKey) {
             const useOrbitGtTileTreeReference = rdSourceKey.format === _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.RealityDataFormat.OPC;
             const treeRef = (!useOrbitGtTileTreeReference) ?
@@ -115106,8 +115089,8 @@ class GeometricModelState extends ModelState {
                     // url: tilesetUrl, // If rdSourceKey is defined, url is not used
                     classifiers: undefined !== spatialModel ? spatialModel.classifiers : undefined,
                     getDisplaySettings,
-                    getBackgroundBase: () => view.displayStyle.settings.mapImagery.backgroundBase,
-                    getBackgroundLayers: () => view.displayStyle.settings.mapImagery.backgroundLayers,
+                    getBackgroundBase,
+                    getBackgroundLayers,
                 }) :
                 (0,_tile_internal__WEBPACK_IMPORTED_MODULE_5__.createOrbitGtTileTreeReference)({
                     rdSourceKey,
@@ -115156,11 +115139,11 @@ class GeometricModelState extends ModelState {
                 tilesetToDbTransform: this.jsonProperties.tilesetToDbTransform,
                 classifiers: undefined !== spatialModel ? spatialModel.classifiers : undefined,
                 getDisplaySettings,
-                getBackgroundBase: () => view.displayStyle.settings.mapImagery.backgroundBase,
-                getBackgroundLayers: () => view.displayStyle.settings.mapImagery.backgroundLayers,
+                getBackgroundBase,
+                getBackgroundLayers,
             });
         }
-        return (0,_tile_internal__WEBPACK_IMPORTED_MODULE_5__.createPrimaryTileTreeReference)(view, this);
+        return (0,_tile_internal__WEBPACK_IMPORTED_MODULE_5__.createPrimaryTileTreeReference)(view, this, getBackgroundBase, getBackgroundLayers);
     }
 }
 /** Represents the front-end state of a [GeometricModel2d]($backend).
@@ -135681,6 +135664,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   ItemField: () => (/* reexport safe */ _AccuDraw__WEBPACK_IMPORTED_MODULE_0__.ItemField),
 /* harmony export */   KeyinParseError: () => (/* reexport safe */ _tools_Tool__WEBPACK_IMPORTED_MODULE_109__.KeyinParseError),
 /* harmony export */   KeyinStatus: () => (/* reexport safe */ _AccuDraw__WEBPACK_IMPORTED_MODULE_0__.KeyinStatus),
+/* harmony export */   LayerTileTreeHandler: () => (/* reexport safe */ _internal_cross_package__WEBPACK_IMPORTED_MODULE_121__.LayerTileTreeHandler),
+/* harmony export */   LayerTileTreeReferenceHandler: () => (/* reexport safe */ _internal_cross_package__WEBPACK_IMPORTED_MODULE_121__.LayerTileTreeReferenceHandler),
 /* harmony export */   LengthDescription: () => (/* reexport safe */ _properties_LengthDescription__WEBPACK_IMPORTED_MODULE_70__.LengthDescription),
 /* harmony export */   LocalExtensionProvider: () => (/* reexport safe */ _extension_providers_LocalExtensionProvider__WEBPACK_IMPORTED_MODULE_66__.LocalExtensionProvider),
 /* harmony export */   LocalUnitFormatProvider: () => (/* reexport safe */ _quantity_formatting_LocalUnitFormatProvider__WEBPACK_IMPORTED_MODULE_73__.LocalUnitFormatProvider),
@@ -136951,6 +136936,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   IModelTileTree: () => (/* reexport safe */ _tile_IModelTileTree__WEBPACK_IMPORTED_MODULE_9__.IModelTileTree),
 /* harmony export */   ImageryMapTileTree: () => (/* reexport safe */ _tile_internal__WEBPACK_IMPORTED_MODULE_8__.ImageryMapTileTree),
 /* harmony export */   ImdlReader: () => (/* reexport safe */ _tile_internal__WEBPACK_IMPORTED_MODULE_8__.ImdlReader),
+/* harmony export */   LayerTileTreeHandler: () => (/* reexport safe */ _tile_internal__WEBPACK_IMPORTED_MODULE_8__.LayerTileTreeHandler),
+/* harmony export */   LayerTileTreeReferenceHandler: () => (/* reexport safe */ _tile_internal__WEBPACK_IMPORTED_MODULE_8__.LayerTileTreeReferenceHandler),
 /* harmony export */   MapTileTreeReference: () => (/* reexport safe */ _tile_internal__WEBPACK_IMPORTED_MODULE_8__.MapTileTreeReference),
 /* harmony export */   OnScreenTarget: () => (/* reexport safe */ _render_webgl_Target__WEBPACK_IMPORTED_MODULE_3__.OnScreenTarget),
 /* harmony export */   PerformanceMetrics: () => (/* reexport safe */ _render_webgl_PerformanceMetrics__WEBPACK_IMPORTED_MODULE_4__.PerformanceMetrics),
@@ -145978,30 +145965,21 @@ class LayerTextureParams {
  * @param prevView The previous view state.
  * @param newView The new view state.
  * @returns {boolean} True if there is any difference in the model layer configuration; false otherwise.
- * @internal
  */
 function compareMapLayer(prevView, newView) {
-    const prevLayers = prevView.displayStyle.getMapLayers(false);
-    const newLayers = newView.displayStyle.getMapLayers(false);
-    const prevModelIds = [];
-    const newModelIds = [];
-    for (const layer of prevLayers) {
-        if (layer instanceof _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.ModelMapLayerSettings && layer.drapeTarget === _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.ModelMapLayerDrapeTarget.RealityData) {
-            prevModelIds.push(layer.modelId);
-        }
-    }
-    for (const layer of newLayers) {
-        if (layer instanceof _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.ModelMapLayerSettings && layer.drapeTarget === _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.ModelMapLayerDrapeTarget.RealityData) {
-            newModelIds.push(layer.modelId);
-        }
-    }
-    if (prevModelIds.length !== newModelIds.length) {
+    const getDrapedModelIds = (view) => view.displayStyle
+        .getMapLayers(false)
+        .filter((layer) => layer instanceof _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.ModelMapLayerSettings &&
+        (layer.drapeTarget === _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.ModelMapLayerDrapeTarget.RealityData ||
+            layer.drapeTarget === _itwin_core_common__WEBPACK_IMPORTED_MODULE_3__.ModelMapLayerDrapeTarget.IModel))
+        .map(layer => layer.modelId);
+    const prev = getDrapedModelIds(prevView);
+    const next = getDrapedModelIds(newView);
+    if (prev.length !== next.length)
         return true;
-    }
-    for (let i = 0; i < prevModelIds.length; i++) {
-        if (prevModelIds[i] !== newModelIds[i]) {
+    for (let i = 0; i < prev.length; i++) {
+        if (prev[i] !== next[i])
             return true;
-        }
     }
     return false;
 }
@@ -154842,17 +154820,25 @@ class SurfaceGeometry extends _MeshGeometry__WEBPACK_IMPORTED_MODULE_7__.MeshGeo
     }
     _wantWoWReversal(target) {
         const fillFlags = this.fillFlags;
-        if (_itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.FillFlags.None !== (fillFlags & _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.FillFlags.Background))
+        if (_itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.FillFlags.None !== (fillFlags & _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.FillFlags.Background)) {
             return false; // fill color explicitly from background
-        if (_itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.FillFlags.None !== (fillFlags & _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.FillFlags.Always))
-            return true; // fill displayed even in wireframe
+        }
+        if (this.wantTextures(target, this.hasTexture)) {
+            // Don't invert white pixels of textures.
+            return false;
+        }
         const vf = target.currentViewFlags;
-        if (_itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.RenderMode.Wireframe === vf.renderMode || vf.visibleEdges)
+        if (_itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.RenderMode.Wireframe === vf.renderMode) {
+            // Fill displayed even in wireframe?
+            return _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.FillFlags.None !== (fillFlags & _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.FillFlags.Always);
+        }
+        if (vf.visibleEdges) {
             return false; // never invert surfaces when edges are displayed
-        if (this.isLit && wantLighting(vf))
-            return false;
-        // Don't invert white pixels of textures...
-        return !this.wantTextures(target, this.hasTexture);
+        }
+        if (this.isLit && wantLighting(vf)) {
+            return false; // the lit color won't be pure white anyway.
+        }
+        return true;
     }
     get materialInfo() { return this.mesh.materialInfo; }
     useTexture(params) {
@@ -169612,6 +169598,7 @@ __webpack_require__.r(__webpack_exports__);
  * @module Tiles
  */
 
+/** @internal*/
 class GraphicsCollectorDrawArgs extends _tile_internal__WEBPACK_IMPORTED_MODULE_0__.TileDrawArgs {
     _planes;
     _worldToViewMap;
@@ -169917,6 +169904,11 @@ class IModelTile extends _tile_internal__WEBPACK_IMPORTED_MODULE_4__.Tile {
                 system,
                 isCanceled,
                 sizeMultiplier,
+                tileData: {
+                    ecefTransform: this.tree.iModel.ecefLocation?.getTransform() ?? _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Transform.createIdentity(),
+                    range: this.range,
+                    layerClassifiers: this.tree.layerHandler?.layerClassifiers,
+                },
             });
         }
         catch {
@@ -170562,12 +170554,16 @@ class IModelTileTree extends _tile_internal__WEBPACK_IMPORTED_MODULE_6__.TileTre
      * used by draw().
      */
     _numStaticTilesSelected = 0;
+    layerImageryTrees = [];
+    _layerHandler;
+    get layerHandler() { return this._layerHandler; }
     constructor(params, treeId) {
         super(params);
         this.iModelTileTreeId = treeId;
         this.contentIdQualifier = params.contentIdQualifier;
         this.geometryGuid = params.geometryGuid;
         this.tileScreenSize = params.tileScreenSize;
+        this._layerHandler = new _tile_internal__WEBPACK_IMPORTED_MODULE_6__.LayerTileTreeHandler(this);
         if (_itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.BatchType.Primary === treeId.type)
             this.stringifiedSectionClip = treeId.sectionCut;
         this.maxInitialTilesToSkip = params.maxInitialTilesToSkip ?? 0;
@@ -170618,6 +170614,7 @@ class IModelTileTree extends _tile_internal__WEBPACK_IMPORTED_MODULE_6__.TileTre
     draw(args) {
         const tiles = this.selectTiles(args);
         this._rootTile.draw(args, tiles, this._numStaticTilesSelected);
+        this._layerHandler.collectClassifierGraphics(args, tiles);
     }
     prune() {
         const olderThan = _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.BeTimePoint.now().minus(this.expirationTime);
@@ -170947,6 +170944,7 @@ function createPrimitiveGeometry(primitive, options, viOrigin) {
                     textureMapping,
                     indices: new _common_internal_render_VertexIndices__WEBPACK_IMPORTED_MODULE_6__.VertexIndices(primitive.params.surface.indices),
                 },
+                tileData: options.tileData,
             }, viOrigin);
         }
     }
@@ -171038,7 +171036,7 @@ async function decodeImdlGraphics(options) {
         return undefined;
     const patterns = new Map();
     const graphicsOptions = { ...options, textures, patterns };
-    graphicsOptions.tile = options.tile;
+    graphicsOptions.tileData = options.tileData;
     for (const [name, primitives] of options.document.patterns)
         patterns.set(name, createPatternGeometries(primitives, graphicsOptions));
     const system = options.system;
@@ -171602,6 +171600,259 @@ class LRUTileList {
 }
 
 
+/***/ }),
+
+/***/ "../../core/frontend/lib/esm/internal/tile/LayerTileTreeHandler.js":
+/*!*************************************************************************!*\
+  !*** ../../core/frontend/lib/esm/internal/tile/LayerTileTreeHandler.js ***!
+  \*************************************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   LayerTileTreeHandler: () => (/* binding */ LayerTileTreeHandler)
+/* harmony export */ });
+/* harmony import */ var _tile_internal__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../tile/internal */ "../../core/frontend/lib/esm/tile/internal.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 Tiles
+ */
+
+/** @internal */
+class LayerTileTreeHandler {
+    _layerSettings = new Map();
+    _imageryTreeState = new Map();
+    _modelIdToIndex = new Map();
+    layerClassifiers = new Map();
+    _ref;
+    get imageryTreeState() { return this._imageryTreeState; }
+    get layerSettings() { return this._layerSettings; }
+    get modelIdToIndex() { return this._modelIdToIndex; }
+    get layerImageryTrees() { return this._ref.layerImageryTrees; }
+    constructor(ref) {
+        this._ref = ref;
+    }
+    /** Add a new imagery tile tree / map-layer settings pair and initialize the imagery tile tree state.
+     * @internal
+     */
+    addImageryLayer(tree, settings, index, baseImageryLayer) {
+        this._ref.layerImageryTrees.push({ tree, settings, baseImageryLayer });
+        this._layerSettings.set(tree.modelId, settings);
+        if (!this._imageryTreeState.has(tree.modelId))
+            this._imageryTreeState.set(tree.modelId, new _tile_internal__WEBPACK_IMPORTED_MODULE_0__.ImageryTileTreeState());
+        this._modelIdToIndex.set(tree.modelId, index);
+    }
+    /** @internal */
+    addModelLayer(layerTreeRef, context) {
+        const tileTreeClassName = this._ref.rootTile.tree.constructor.name;
+        const classifier = context.addPlanarClassifier(`MapLayer ${tileTreeClassName}-${this._ref.modelId}-${layerTreeRef.layerIndex}`, layerTreeRef);
+        if (classifier)
+            this.layerClassifiers.set(layerTreeRef.layerIndex, classifier);
+    }
+    /** @internal */
+    clearLayers() {
+        this._ref.rootTile.clearLayers();
+    }
+    /** @internal */
+    collectClassifierGraphics(args, selectedTiles) {
+        this.layerClassifiers.forEach((layerClassifier) => {
+            layerClassifier.collectGraphics(args.context, { modelId: this._ref.modelId, tiles: selectedTiles, location: args.location, isPointCloud: this._ref.isPointCloud });
+        });
+    }
+}
+
+
+/***/ }),
+
+/***/ "../../core/frontend/lib/esm/internal/tile/LayerTileTreeReferenceHandler.js":
+/*!**********************************************************************************!*\
+  !*** ../../core/frontend/lib/esm/internal/tile/LayerTileTreeReferenceHandler.js ***!
+  \**********************************************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   LayerTileTreeReferenceHandler: () => (/* binding */ LayerTileTreeReferenceHandler)
+/* 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 _tile_internal__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../tile/internal */ "../../core/frontend/lib/esm/tile/internal.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 Tiles
+ */
+
+
+/** @internal */
+class LayerTileTreeReferenceHandler {
+    _layerTrees = new Array();
+    isOverlay;
+    _baseImageryLayerIncluded = false;
+    _baseLayerSettings;
+    _baseTransparent = false;
+    _baseColor;
+    _layerSettings;
+    _ref;
+    _mapTile;
+    _detachFromDisplayStyle = [];
+    get layerTrees() { return this._layerTrees; }
+    get baseColor() { return this._baseColor; }
+    get baseTransparent() { return this._baseTransparent; }
+    get baseImageryLayerIncluded() { return this._baseImageryLayerIncluded; }
+    get layerSettings() { return this._layerSettings; }
+    discloseTileTrees(trees) {
+        for (const imageryTree of this.layerTrees)
+            if (imageryTree)
+                trees.disclose(imageryTree);
+    }
+    constructor(ref, pIsOverlay, baseLayerSettings, layerSettings, mapTile = false) {
+        this._ref = ref;
+        this._baseLayerSettings = baseLayerSettings;
+        this._layerSettings = layerSettings ? layerSettings : [];
+        this.isOverlay = pIsOverlay;
+        this._mapTile = mapTile;
+        let tree;
+        if (!this.isOverlay && this._baseLayerSettings !== undefined) {
+            if (this._baseLayerSettings instanceof _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__.MapLayerSettings) {
+                tree = (0,_tile_internal__WEBPACK_IMPORTED_MODULE_1__.createMapLayerTreeReference)(this._baseLayerSettings, 0, this._ref.iModel);
+                this._baseTransparent = this._baseLayerSettings.transparency > 0;
+            }
+            else {
+                this._baseColor = this._baseLayerSettings;
+                this._baseTransparent = this._baseColor?.getTransparency() > 0;
+            }
+        }
+        if (this._baseImageryLayerIncluded = (undefined !== tree))
+            this._layerTrees.push(tree);
+        if (undefined !== this._layerSettings) {
+            for (let i = 0; i < this._layerSettings.length; i++)
+                if (undefined !== (tree = (0,_tile_internal__WEBPACK_IMPORTED_MODULE_1__.createMapLayerTreeReference)(this._layerSettings[i], i + 1, this._ref.iModel)))
+                    this._layerTrees.push(tree);
+        }
+    }
+    initializeLayers(context) {
+        // Map tiles handle refresh logic differently
+        if (!this._mapTile) {
+            const removals = this._detachFromDisplayStyle;
+            const mapImagery = context.viewport.displayStyle.settings.mapImagery;
+            if (0 === removals.length) {
+                removals.push(context.viewport.displayStyle.settings.onMapImageryChanged.addListener((imagery) => {
+                    this.setBaseLayerSettings(imagery.backgroundBase);
+                    this.setLayerSettings(imagery.backgroundLayers);
+                    this.clearLayers();
+                }));
+            }
+            removals.push(context.viewport.onChangeView.addListener((vp, previousViewState) => {
+                if ((0,_tile_internal__WEBPACK_IMPORTED_MODULE_1__.compareMapLayer)(previousViewState, vp.view)) {
+                    this.setBaseLayerSettings(mapImagery.backgroundBase);
+                    this.setLayerSettings(mapImagery.backgroundLayers);
+                    this.clearLayers();
+                }
+            }));
+        }
+        let hasLoadedTileTree = false;
+        const layerHandler = this._ref.treeOwner.load()?.layerHandler;
+        if (undefined === layerHandler) {
+            return hasLoadedTileTree; // Not loaded yet - or no layerHandler on tree.
+        }
+        layerHandler.layerImageryTrees.length = 0;
+        if (0 === this._layerTrees.length) {
+            return !this.isOverlay;
+        }
+        let treeIndex = this._layerTrees.length - 1;
+        // Start displaying at the highest completely opaque layer...
+        for (; treeIndex >= 1; treeIndex--) {
+            const layerTreeRef = this._layerTrees[treeIndex];
+            if (layerTreeRef?.isOpaque)
+                break; // This layer is completely opaque and will obscure all others so ignore lower ones.
+        }
+        for (; treeIndex < this._layerTrees.length; treeIndex++) {
+            const layerTreeRef = this._layerTrees[treeIndex];
+            const hasValidTileTree = layerTreeRef && _tile_internal__WEBPACK_IMPORTED_MODULE_1__.TileTreeLoadStatus.NotFound !== layerTreeRef.treeOwner.loadStatus;
+            const isImageryMapLayer = layerTreeRef instanceof _tile_internal__WEBPACK_IMPORTED_MODULE_1__.ImageryMapLayerTreeReference;
+            const isLayerVisible = (isImageryMapLayer || (!isImageryMapLayer && layerTreeRef?.layerSettings.visible));
+            if (!this._ref.shouldDrapeLayer(layerTreeRef)) {
+                // If the layer is not to be displayed, then we should skip adding it to the tile tree.
+                // The _shouldDrapeLayerFunc() function is sent in from MapTileTreeReference or RealityTileTree.
+                hasLoadedTileTree = true; // ###TODO had to set this to true so addToScene actually works. alternative?
+                continue;
+            }
+            // Load tile tree for each configured layer.
+            // Note: Non-visible imagery layer are always added to allow proper tile tree scale range visibility reporting.
+            if (hasValidTileTree
+                && isLayerVisible
+                && !layerTreeRef.layerSettings.allSubLayersInvisible) {
+                const layerTree = layerTreeRef.treeOwner.load();
+                if (layerTree !== undefined) {
+                    hasLoadedTileTree = true;
+                }
+                else {
+                    // Let's continue, there might be loaded tile tree in the list
+                    continue;
+                }
+                // Add loaded TileTree
+                const baseImageryLayer = this._baseImageryLayerIncluded && (treeIndex === 0);
+                if (layerTree instanceof _tile_internal__WEBPACK_IMPORTED_MODULE_1__.ImageryMapTileTree) {
+                    layerHandler.addImageryLayer(layerTree, layerTreeRef.layerSettings, treeIndex, baseImageryLayer);
+                }
+                else if (layerTreeRef instanceof _tile_internal__WEBPACK_IMPORTED_MODULE_1__.ModelMapLayerTileTreeReference)
+                    layerHandler.addModelLayer(layerTreeRef, context);
+            }
+        }
+        return hasLoadedTileTree;
+    }
+    setBaseLayerSettings(baseLayerSettings) {
+        let tree;
+        this._baseLayerSettings = baseLayerSettings;
+        if (baseLayerSettings instanceof _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__.MapLayerSettings) {
+            tree = (0,_tile_internal__WEBPACK_IMPORTED_MODULE_1__.createMapLayerTreeReference)(baseLayerSettings, 0, this._ref.iModel);
+            this._baseColor = undefined;
+            this._baseTransparent = baseLayerSettings.transparency > 0;
+        }
+        else {
+            this._baseColor = baseLayerSettings;
+            this._baseTransparent = this._baseColor.getTransparency() > 0;
+        }
+        if (tree) {
+            if (this._baseImageryLayerIncluded)
+                this._layerTrees[0] = tree;
+            else
+                this._layerTrees.splice(0, 0, tree);
+        }
+        else {
+            if (this._baseImageryLayerIncluded)
+                this._layerTrees.shift();
+        }
+        this._baseImageryLayerIncluded = tree !== undefined;
+        this.clearLayers();
+    }
+    clearLayers() {
+        const layerHandler = this._ref.treeOwner.tileTree?.layerHandler;
+        if (undefined !== layerHandler) {
+            layerHandler.clearLayers();
+        }
+    }
+    setLayerSettings(layerSettings) {
+        this._layerSettings = layerSettings;
+        const baseLayerIndex = this._baseImageryLayerIncluded ? 1 : 0;
+        this._layerTrees.length = Math.min(layerSettings.length + baseLayerIndex, this._layerTrees.length); // Truncate if number of layers reduced.
+        for (let i = 0; i < layerSettings.length; i++) {
+            const treeIndex = i + baseLayerIndex;
+            if (treeIndex >= this._layerTrees.length || !this._layerTrees[treeIndex]?.layerSettings.displayMatches(layerSettings[i]))
+                this._layerTrees[treeIndex] = (0,_tile_internal__WEBPACK_IMPORTED_MODULE_1__.createMapLayerTreeReference)(layerSettings[i], treeIndex, this._ref.iModel);
+        }
+        this.clearLayers();
+    }
+}
+
+
 /***/ }),
 
 /***/ "../../core/frontend/lib/esm/internal/tile/MeshoptCompression.js":
@@ -172678,8 +172929,18 @@ class PrimaryTreeReference extends _tile_internal__WEBPACK_IMPORTED_MODULE_6__.T
     _sectionClip;
     _sectionCutAppearanceProvider;
     _animationTransformNodeId;
-    constructor(view, model, planProjection, transformNodeId, sectionClip) {
+    _layerRefHandler;
+    iModel;
+    shouldDrapeLayer(layerTreeRef) {
+        const mapLayerSettings = layerTreeRef?.layerSettings;
+        if (mapLayerSettings && mapLayerSettings instanceof _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.ModelMapLayerSettings)
+            return _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.ModelMapLayerDrapeTarget.IModel === mapLayerSettings.drapeTarget;
+        return false;
+    }
+    constructor(view, model, planProjection, transformNodeId, sectionClip, backgroundBase, backgroundLayers) {
         super();
+        this.iModel = model.iModel;
+        this._layerRefHandler = new _tile_internal__WEBPACK_IMPORTED_MODULE_6__.LayerTileTreeReferenceHandler(this, false, backgroundBase, backgroundLayers, false);
         this.view = view;
         this.model = model;
         this._animationTransformNodeId = transformNodeId;
@@ -172723,6 +172984,10 @@ class PrimaryTreeReference extends _tile_internal__WEBPACK_IMPORTED_MODULE_6__.T
     get isPlanProjection() {
         return false;
     }
+    discloseTileTrees(trees) {
+        super.discloseTileTrees(trees);
+        this._layerRefHandler.discloseTileTrees(trees);
+    }
     getClipVolume(_tree) {
         // ###TODO: reduce frequency with which getModelClip() is called
         return this.view.is3d() && !this._sectionClip ? this.view.getModelClip(this.model.id) : undefined;
@@ -172782,6 +173047,12 @@ class PrimaryTreeReference extends _tile_internal__WEBPACK_IMPORTED_MODULE_6__.T
             return baseTf;
         return displayTf.premultiply ? displayTf.transform.multiplyTransformTransform(baseTf) : baseTf.multiplyTransformTransform(displayTf.transform);
     }
+    addToScene(context) {
+        const tree = this.treeOwner.load();
+        if (undefined === tree || !this._layerRefHandler.initializeLayers(context))
+            return; // Not loaded yet.
+        super.addToScene(context);
+    }
 }
 class AnimatedTreeReference extends PrimaryTreeReference {
     _branchId;
@@ -172816,8 +173087,8 @@ class AnimatedTreeReference extends PrimaryTreeReference {
 class PlanProjectionTreeReference extends PrimaryTreeReference {
     get _view3d() { return this.view; }
     _baseTransform = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_2__.Transform.createIdentity();
-    constructor(view, model, sectionCut) {
-        super(view, model, true, undefined, sectionCut);
+    constructor(view, model, sectionCut, backgroundBase, backgroundLayers) {
+        super(view, model, true, undefined, sectionCut, backgroundBase, backgroundLayers);
         this._viewFlagOverrides.forceSurfaceDiscard = true;
     }
     get castsShadows() {
@@ -172882,13 +173153,15 @@ function isPlanProjection(view, model) {
     const model3d = view.is3d() ? model.asGeometricModel3d : undefined;
     return undefined !== model3d && model3d.isPlanProjection;
 }
-function createTreeRef(view, model, sectionCut) {
+function createTreeRef(view, model, sectionCut, backgroundBase, backgroundLayers) {
     if (false !== _IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.renderSystem.options.planProjections && isPlanProjection(view, model))
-        return new PlanProjectionTreeReference(view, model, sectionCut);
-    return new PrimaryTreeReference(view, model, false, undefined, sectionCut);
+        return new PlanProjectionTreeReference(view, model, sectionCut, backgroundBase, backgroundLayers);
+    return new PrimaryTreeReference(view, model, false, undefined, sectionCut, backgroundBase, backgroundLayers);
 }
-function createPrimaryTileTreeReference(view, model) {
-    return createTreeRef(view, model, undefined);
+function createPrimaryTileTreeReference(view, model, getBackgroundBase, getBackgroundLayers) {
+    const backgroundBase = getBackgroundBase?.();
+    const backgroundLayers = getBackgroundLayers?.();
+    return createTreeRef(view, model, undefined, backgroundBase, backgroundLayers);
 }
 class MaskTreeReference extends _tile_internal__WEBPACK_IMPORTED_MODULE_6__.TileTreeReference {
     _id;
@@ -173221,7 +173494,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _RealityDataSource__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../RealityDataSource */ "../../core/frontend/lib/esm/RealityDataSource.js");
 /* harmony import */ var _tile_internal__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../tile/internal */ "../../core/frontend/lib/esm/tile/internal.js");
 /* harmony import */ var _RealityDataSourceTilesetUrlImpl__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../RealityDataSourceTilesetUrlImpl */ "../../core/frontend/lib/esm/RealityDataSourceTilesetUrlImpl.js");
-/* harmony import */ var _render_webgl_MapLayerParams__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../render/webgl/MapLayerParams */ "../../core/frontend/lib/esm/internal/render/webgl/MapLayerParams.js");
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
@@ -173239,7 +173511,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-
 function getUrl(content) {
     return content ? (content.url ? content.url : content.uri) : undefined;
 }
@@ -173690,7 +173961,6 @@ class RealityModelTileTree extends _tile_internal__WEBPACK_IMPORTED_MODULE_8__.R
         _classifier;
         _mapDrapeTree;
         _getDisplaySettings;
-        _detachFromDisplayStyle = [];
         _layerRefHandler;
         iModel;
         get planarClipMask() { return this._planarClipMask; }
@@ -173712,7 +173982,7 @@ class RealityModelTileTree extends _tile_internal__WEBPACK_IMPORTED_MODULE_8__.R
         constructor(props) {
             super();
             this.iModel = props.iModel;
-            this._layerRefHandler = new _tile_internal__WEBPACK_IMPORTED_MODULE_8__.LayerTileTreeReferenceHandler(this, false, props.getBackgroundBase?.(), props.getBackgroundLayers?.());
+            this._layerRefHandler = new _tile_internal__WEBPACK_IMPORTED_MODULE_8__.LayerTileTreeReferenceHandler(this, false, props.getBackgroundBase?.(), props.getBackgroundLayers?.(), false);
             this._name = undefined !== props.name ? props.name : "";
             let transform;
             if (undefined !== props.tilesetToDbTransform) {
@@ -173742,24 +174012,6 @@ class RealityModelTileTree extends _tile_internal__WEBPACK_IMPORTED_MODULE_8__.R
             }
             return this._isGlobal === undefined ? false : this._isGlobal;
         }
-        preInitializeLayers(context) {
-            const removals = this._detachFromDisplayStyle;
-            const mapImagery = context.viewport.displayStyle.settings.mapImagery;
-            if (0 === removals.length) {
-                removals.push(context.viewport.displayStyle.settings.onMapImageryChanged.addListener((imagery) => {
-                    this._layerRefHandler.setBaseLayerSettings(imagery.backgroundBase);
-                    this._layerRefHandler.setLayerSettings(imagery.backgroundLayers);
-                    this._layerRefHandler.clearLayers();
-                }));
-            }
-            removals.push(context.viewport.onChangeView.addListener((vp, previousViewState) => {
-                if ((0,_render_webgl_MapLayerParams__WEBPACK_IMPORTED_MODULE_10__.compareMapLayer)(previousViewState, vp.view)) {
-                    this._layerRefHandler.setBaseLayerSettings(mapImagery.backgroundBase);
-                    this._layerRefHandler.setLayerSettings(mapImagery.backgroundLayers);
-                    this._layerRefHandler.clearLayers();
-                }
-            }));
-        }
         addToScene(context) {
             const tree = this.treeOwner.load();
             if (undefined === tree || !this._layerRefHandler.initializeLayers(context))
@@ -173788,6 +174040,7 @@ class RealityModelTileTree extends _tile_internal__WEBPACK_IMPORTED_MODULE_8__.R
                 this._mapDrapeTree.discloseTileTrees(trees);
             if (undefined !== this._planarClipMask)
                 this._planarClipMask.discloseTileTrees(trees);
+            this._layerRefHandler.discloseTileTrees(trees);
         }
         collectStatistics(stats) {
             super.collectStatistics(stats);
@@ -184644,6 +184897,7 @@ async function readImdlContent(args) {
         iModel: args.iModel,
         document,
         isCanceled: args.isCanceled,
+        tileData: args.tileData,
     });
     if (isCanceled())
         return { isLeaf: true, readStatus: _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TileReadStatus.Canceled };
@@ -184677,233 +184931,6 @@ var ImdlReader;
 })(ImdlReader || (ImdlReader = {}));
 
 
-/***/ }),
-
-/***/ "../../core/frontend/lib/esm/tile/LayerTileTreeHandler.js":
-/*!****************************************************************!*\
-  !*** ../../core/frontend/lib/esm/tile/LayerTileTreeHandler.js ***!
-  \****************************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   LayerTileTreeHandler: () => (/* binding */ LayerTileTreeHandler)
-/* harmony export */ });
-/* harmony import */ var _internal__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./internal */ "../../core/frontend/lib/esm/tile/internal.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 Tiles
- */
-
-/** @internal */
-class LayerTileTreeHandler {
-    _layerSettings = new Map();
-    _imageryTreeState = new Map();
-    _modelIdToIndex = new Map();
-    layerClassifiers = new Map();
-    _ref;
-    get imageryTreeState() { return this._imageryTreeState; }
-    get layerSettings() { return this._layerSettings; }
-    get modelIdToIndex() { return this._modelIdToIndex; }
-    get layerImageryTrees() { return this._ref.layerImageryTrees; }
-    constructor(ref) {
-        this._ref = ref;
-    }
-    /** Add a new imagery tile tree / map-layer settings pair and initialize the imagery tile tree state.
-     * @internal
-     */
-    addImageryLayer(tree, settings, index, baseImageryLayer) {
-        this._ref.layerImageryTrees.push({ tree, settings, baseImageryLayer });
-        this._layerSettings.set(tree.modelId, settings);
-        if (!this._imageryTreeState.has(tree.modelId))
-            this._imageryTreeState.set(tree.modelId, new _internal__WEBPACK_IMPORTED_MODULE_0__.ImageryTileTreeState());
-        this._modelIdToIndex.set(tree.modelId, index);
-    }
-    /** @internal */
-    addModelLayer(layerTreeRef, context) {
-        const classifier = context.addPlanarClassifier(`MapLayer ${this._ref.modelId}-${layerTreeRef.layerIndex}`, layerTreeRef);
-        if (classifier)
-            this.layerClassifiers.set(layerTreeRef.layerIndex, classifier);
-    }
-    /** @internal */
-    clearLayers() {
-        this._ref.rootTile.clearLayers();
-    }
-    /** @internal */
-    collectClassifierGraphics(args, selectedTiles) {
-        this.layerClassifiers.forEach((layerClassifier) => {
-            layerClassifier.collectGraphics(args.context, { modelId: this._ref.modelId, tiles: selectedTiles, location: args.location, isPointCloud: this._ref.isPointCloud });
-        });
-    }
-}
-
-
-/***/ }),
-
-/***/ "../../core/frontend/lib/esm/tile/LayerTileTreeReferenceHandler.js":
-/*!*************************************************************************!*\
-  !*** ../../core/frontend/lib/esm/tile/LayerTileTreeReferenceHandler.js ***!
-  \*************************************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   LayerTileTreeReferenceHandler: () => (/* binding */ LayerTileTreeReferenceHandler)
-/* 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 _internal__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./internal */ "../../core/frontend/lib/esm/tile/internal.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 Tiles
- */
-
-
-/** @internal */
-class LayerTileTreeReferenceHandler {
-    _layerTrees = new Array();
-    isOverlay;
-    _baseImageryLayerIncluded = false;
-    _baseLayerSettings;
-    _baseTransparent = false;
-    _baseColor;
-    _layerSettings;
-    _ref;
-    get layerTrees() { return this._layerTrees; }
-    get baseColor() { return this._baseColor; }
-    get baseTransparent() { return this._baseTransparent; }
-    get baseImageryLayerIncluded() { return this._baseImageryLayerIncluded; }
-    get layerSettings() { return this._layerSettings; }
-    constructor(ref, pIsOverlay, baseLayerSettings, layerSettings) {
-        this._ref = ref;
-        this._baseLayerSettings = baseLayerSettings;
-        this._layerSettings = layerSettings ? layerSettings : [];
-        this.isOverlay = pIsOverlay;
-        let tree;
-        if (!this.isOverlay && this._baseLayerSettings !== undefined) {
-            if (this._baseLayerSettings instanceof _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__.MapLayerSettings) {
-                tree = (0,_internal__WEBPACK_IMPORTED_MODULE_1__.createMapLayerTreeReference)(this._baseLayerSettings, 0, this._ref.iModel);
-                this._baseTransparent = this._baseLayerSettings.transparency > 0;
-            }
-            else {
-                this._baseColor = this._baseLayerSettings;
-                this._baseTransparent = this._baseColor?.getTransparency() > 0;
-            }
-        }
-        if (this._baseImageryLayerIncluded = (undefined !== tree))
-            this._layerTrees.push(tree);
-        if (undefined !== this._layerSettings) {
-            for (let i = 0; i < this._layerSettings.length; i++)
-                if (undefined !== (tree = (0,_internal__WEBPACK_IMPORTED_MODULE_1__.createMapLayerTreeReference)(this._layerSettings[i], i + 1, this._ref.iModel)))
-                    this._layerTrees.push(tree);
-        }
-    }
-    initializeLayers(context) {
-        if (undefined !== this._ref.preInitializeLayers)
-            this._ref.preInitializeLayers(context);
-        let hasLoadedTileTree = false;
-        const layerHandler = this._ref.treeOwner.load()?.layerHandler;
-        if (undefined === layerHandler) {
-            return hasLoadedTileTree; // Not loaded yet - or no layerHandler on tree.
-        }
-        layerHandler.layerImageryTrees.length = 0;
-        if (0 === this._layerTrees.length) {
-            return !this.isOverlay;
-        }
-        let treeIndex = this._layerTrees.length - 1;
-        // Start displaying at the highest completely opaque layer...
-        for (; treeIndex >= 1; treeIndex--) {
-            const layerTreeRef = this._layerTrees[treeIndex];
-            if (layerTreeRef?.isOpaque)
-                break; // This layer is completely opaque and will obscure all others so ignore lower ones.
-        }
-        for (; treeIndex < this._layerTrees.length; treeIndex++) {
-            const layerTreeRef = this._layerTrees[treeIndex];
-            const hasValidTileTree = layerTreeRef && _internal__WEBPACK_IMPORTED_MODULE_1__.TileTreeLoadStatus.NotFound !== layerTreeRef.treeOwner.loadStatus;
-            const isImageryMapLayer = layerTreeRef instanceof _internal__WEBPACK_IMPORTED_MODULE_1__.ImageryMapLayerTreeReference;
-            const isLayerVisible = (isImageryMapLayer || (!isImageryMapLayer && layerTreeRef?.layerSettings.visible));
-            if (!this._ref.shouldDrapeLayer(layerTreeRef)) {
-                // If the layer is not to be displayed, then we should skip adding it to the tile tree.
-                // The _shouldDrapeLayerFunc() function is sent in from MapTileTreeReference or RealityTileTree.
-                hasLoadedTileTree = true; // ###TODO had to set this to true so addToScene actually works. alternative?
-                continue;
-            }
-            // Load tile tree for each configured layer.
-            // Note: Non-visible imagery layer are always added to allow proper tile tree scale range visibility reporting.
-            if (hasValidTileTree
-                && isLayerVisible
-                && !layerTreeRef.layerSettings.allSubLayersInvisible) {
-                const layerTree = layerTreeRef.treeOwner.load();
-                if (layerTree !== undefined) {
-                    hasLoadedTileTree = true;
-                }
-                else {
-                    // Let's continue, there might be loaded tile tree in the list
-                    continue;
-                }
-                // Add loaded TileTree
-                const baseImageryLayer = this._baseImageryLayerIncluded && (treeIndex === 0);
-                if (layerTree instanceof _internal__WEBPACK_IMPORTED_MODULE_1__.ImageryMapTileTree) {
-                    layerHandler.addImageryLayer(layerTree, layerTreeRef.layerSettings, treeIndex, baseImageryLayer);
-                }
-                else if (layerTreeRef instanceof _internal__WEBPACK_IMPORTED_MODULE_1__.ModelMapLayerTileTreeReference)
-                    layerHandler.addModelLayer(layerTreeRef, context);
-            }
-        }
-        return hasLoadedTileTree;
-    }
-    setBaseLayerSettings(baseLayerSettings) {
-        let tree;
-        this._baseLayerSettings = baseLayerSettings;
-        if (baseLayerSettings instanceof _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__.MapLayerSettings) {
-            tree = (0,_internal__WEBPACK_IMPORTED_MODULE_1__.createMapLayerTreeReference)(baseLayerSettings, 0, this._ref.iModel);
-            this._baseColor = undefined;
-            this._baseTransparent = baseLayerSettings.transparency > 0;
-        }
-        else {
-            this._baseColor = baseLayerSettings;
-            this._baseTransparent = this._baseColor.getTransparency() > 0;
-        }
-        if (tree) {
-            if (this._baseImageryLayerIncluded)
-                this._layerTrees[0] = tree;
-            else
-                this._layerTrees.splice(0, 0, tree);
-        }
-        else {
-            if (this._baseImageryLayerIncluded)
-                this._layerTrees.shift();
-        }
-        this._baseImageryLayerIncluded = tree !== undefined;
-        this.clearLayers();
-    }
-    clearLayers() {
-        const layerHandler = this._ref.treeOwner.tileTree?.layerHandler;
-        if (undefined !== layerHandler) {
-            layerHandler.clearLayers();
-        }
-    }
-    setLayerSettings(layerSettings) {
-        this._layerSettings = layerSettings;
-        const baseLayerIndex = this._baseImageryLayerIncluded ? 1 : 0;
-        this._layerTrees.length = Math.min(layerSettings.length + baseLayerIndex, this._layerTrees.length); // Truncate if number of layers reduced.
-        for (let i = 0; i < layerSettings.length; i++) {
-            const treeIndex = i + baseLayerIndex;
-            if (treeIndex >= this._layerTrees.length || !this._layerTrees[treeIndex]?.layerSettings.displayMatches(layerSettings[i]))
-                this._layerTrees[treeIndex] = (0,_internal__WEBPACK_IMPORTED_MODULE_1__.createMapLayerTreeReference)(layerSettings[i], treeIndex, this._ref.iModel);
-        }
-        this.clearLayers();
-    }
-}
-
-
 /***/ }),
 
 /***/ "../../core/frontend/lib/esm/tile/RealityTile.js":
@@ -189469,8 +189496,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   ImageryTileTreeState: () => (/* reexport safe */ _map_ImageryTileTree__WEBPACK_IMPORTED_MODULE_86__.ImageryTileTreeState),
 /* harmony export */   ImdlReader: () => (/* reexport safe */ _ImdlReader__WEBPACK_IMPORTED_MODULE_35__.ImdlReader),
 /* harmony export */   LRUTileList: () => (/* reexport safe */ _internal_tile_LRUTileList__WEBPACK_IMPORTED_MODULE_5__.LRUTileList),
-/* harmony export */   LayerTileTreeHandler: () => (/* reexport safe */ _LayerTileTreeHandler__WEBPACK_IMPORTED_MODULE_20__.LayerTileTreeHandler),
-/* harmony export */   LayerTileTreeReferenceHandler: () => (/* reexport safe */ _LayerTileTreeReferenceHandler__WEBPACK_IMPORTED_MODULE_19__.LayerTileTreeReferenceHandler),
+/* harmony export */   LayerTextureParams: () => (/* reexport safe */ _internal_render_webgl_MapLayerParams__WEBPACK_IMPORTED_MODULE_95__.LayerTextureParams),
+/* harmony export */   LayerTileTreeHandler: () => (/* reexport safe */ _internal_tile_LayerTileTreeHandler__WEBPACK_IMPORTED_MODULE_20__.LayerTileTreeHandler),
+/* harmony export */   LayerTileTreeReferenceHandler: () => (/* reexport safe */ _internal_tile_LayerTileTreeReferenceHandler__WEBPACK_IMPORTED_MODULE_19__.LayerTileTreeReferenceHandler),
 /* harmony export */   MapBoxLayerImageryProvider: () => (/* reexport safe */ _internal_tile_map_ImageryProviders_MapBoxLayerImageryProvider__WEBPACK_IMPORTED_MODULE_60__.MapBoxLayerImageryProvider),
 /* harmony export */   MapCartoRectangle: () => (/* reexport safe */ _map_MapCartoRectangle__WEBPACK_IMPORTED_MODULE_1__.MapCartoRectangle),
 /* harmony export */   MapFeatureInfoRecord: () => (/* reexport safe */ _map_MapFeatureInfo__WEBPACK_IMPORTED_MODULE_41__.MapFeatureInfoRecord),
@@ -189497,6 +189525,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   OrbitGtTreeReference: () => (/* reexport safe */ _internal_tile_OrbitGtTileTree__WEBPACK_IMPORTED_MODULE_85__.OrbitGtTreeReference),
 /* harmony export */   PlanarProjection: () => (/* reexport safe */ _map_MapTile__WEBPACK_IMPORTED_MODULE_71__.PlanarProjection),
 /* harmony export */   PlanarTilePatch: () => (/* reexport safe */ _map_MapTile__WEBPACK_IMPORTED_MODULE_71__.PlanarTilePatch),
+/* harmony export */   ProjectedTexture: () => (/* reexport safe */ _internal_render_webgl_MapLayerParams__WEBPACK_IMPORTED_MODULE_95__.ProjectedTexture),
 /* harmony export */   QuadId: () => (/* reexport safe */ _map_QuadId__WEBPACK_IMPORTED_MODULE_2__.QuadId),
 /* harmony export */   ReadonlyTileUserSet: () => (/* reexport safe */ _internal_tile_TileUserSet__WEBPACK_IMPORTED_MODULE_31__.ReadonlyTileUserSet),
 /* harmony export */   RealityModelTileTree: () => (/* reexport safe */ _internal_tile_RealityModelTileTree__WEBPACK_IMPORTED_MODULE_78__.RealityModelTileTree),
@@ -189557,6 +189586,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   acquireImdlParser: () => (/* reexport safe */ _internal_tile_ImdlParser__WEBPACK_IMPORTED_MODULE_38__.acquireImdlParser),
 /* harmony export */   addRangeGraphic: () => (/* reexport safe */ _Tile__WEBPACK_IMPORTED_MODULE_4__.addRangeGraphic),
 /* harmony export */   appendQueryParams: () => (/* reexport safe */ _internal_tile_map_UrlUtils__WEBPACK_IMPORTED_MODULE_48__.appendQueryParams),
+/* harmony export */   compareMapLayer: () => (/* reexport safe */ _internal_render_webgl_MapLayerParams__WEBPACK_IMPORTED_MODULE_95__.compareMapLayer),
 /* harmony export */   createClassifierTileTreeReference: () => (/* reexport safe */ _internal_tile_ClassifierTileTree__WEBPACK_IMPORTED_MODULE_84__.createClassifierTileTreeReference),
 /* harmony export */   createDefaultViewFlagOverrides: () => (/* reexport safe */ _internal_tile_ViewFlagOverrides__WEBPACK_IMPORTED_MODULE_0__.createDefaultViewFlagOverrides),
 /* harmony export */   createGraphicFromDescription: () => (/* reexport safe */ _internal_tile_ImdlGraphicsCreator__WEBPACK_IMPORTED_MODULE_37__.createGraphicFromDescription),
@@ -189611,8 +189641,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _TileTreeSupplier__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./TileTreeSupplier */ "../../core/frontend/lib/esm/tile/TileTreeSupplier.js");
 /* harmony import */ var _TileTreeOwner__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./TileTreeOwner */ "../../core/frontend/lib/esm/tile/TileTreeOwner.js");
 /* harmony import */ var _TileTreeReference__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./TileTreeReference */ "../../core/frontend/lib/esm/tile/TileTreeReference.js");
-/* harmony import */ var _LayerTileTreeReferenceHandler__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ./LayerTileTreeReferenceHandler */ "../../core/frontend/lib/esm/tile/LayerTileTreeReferenceHandler.js");
-/* harmony import */ var _LayerTileTreeHandler__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ./LayerTileTreeHandler */ "../../core/frontend/lib/esm/tile/LayerTileTreeHandler.js");
+/* harmony import */ var _internal_tile_LayerTileTreeReferenceHandler__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../internal/tile/LayerTileTreeReferenceHandler */ "../../core/frontend/lib/esm/internal/tile/LayerTileTreeReferenceHandler.js");
+/* harmony import */ var _internal_tile_LayerTileTreeHandler__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../internal/tile/LayerTileTreeHandler */ "../../core/frontend/lib/esm/internal/tile/LayerTileTreeHandler.js");
 /* harmony import */ var _TileGeometryCollector__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ./TileGeometryCollector */ "../../core/frontend/lib/esm/tile/TileGeometryCollector.js");
 /* harmony import */ var _TiledGraphicsProvider__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ./TiledGraphicsProvider */ "../../core/frontend/lib/esm/tile/TiledGraphicsProvider.js");
 /* harmony import */ var _TileAdmin__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ./TileAdmin */ "../../core/frontend/lib/esm/tile/TileAdmin.js");
@@ -189687,6 +189717,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _internal_tile_OPCFormatInterpreter__WEBPACK_IMPORTED_MODULE_92__ = __webpack_require__(/*! ../internal/tile/OPCFormatInterpreter */ "../../core/frontend/lib/esm/internal/tile/OPCFormatInterpreter.js");
 /* harmony import */ var _internal_tile_FetchCloudStorage__WEBPACK_IMPORTED_MODULE_93__ = __webpack_require__(/*! ../internal/tile/FetchCloudStorage */ "../../core/frontend/lib/esm/internal/tile/FetchCloudStorage.js");
 /* harmony import */ var _internal_tile_MeshoptCompression__WEBPACK_IMPORTED_MODULE_94__ = __webpack_require__(/*! ../internal/tile/MeshoptCompression */ "../../core/frontend/lib/esm/internal/tile/MeshoptCompression.js");
+/* harmony import */ var _internal_render_webgl_MapLayerParams__WEBPACK_IMPORTED_MODULE_95__ = __webpack_require__(/*! ../internal/render/webgl/MapLayerParams */ "../../core/frontend/lib/esm/internal/render/webgl/MapLayerParams.js");
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
@@ -189798,6 +189829,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
 
 
 /***/ }),
@@ -193787,7 +193819,7 @@ class MapTileTreeReference extends _internal__WEBPACK_IMPORTED_MODULE_7__.TileTr
             this._planarClipMask = _PlanarClipMaskState__WEBPACK_IMPORTED_MODULE_5__.PlanarClipMaskState.create(this._settings.planarClipMask);
         if (this._overrideTerrainDisplay && this._overrideTerrainDisplay()?.produceGeometry)
             this.collectTileGeometry = (collector) => this._collectTileGeometry(collector);
-        this._layerRefHandler = new _internal__WEBPACK_IMPORTED_MODULE_7__.LayerTileTreeReferenceHandler(this, isOverlay, baseLayerSettings, layerSettings);
+        this._layerRefHandler = new _internal__WEBPACK_IMPORTED_MODULE_7__.LayerTileTreeReferenceHandler(this, isOverlay, baseLayerSettings, layerSettings, true);
     }
     forEachLayerTileTreeRef(func) {
         for (const layerTree of this._layerRefHandler.layerTrees) {
@@ -193926,9 +193958,7 @@ class MapTileTreeReference extends _internal__WEBPACK_IMPORTED_MODULE_7__.TileTr
     }
     discloseTileTrees(trees) {
         super.discloseTileTrees(trees);
-        for (const imageryTree of this._layerRefHandler.layerTrees)
-            if (imageryTree)
-                trees.disclose(imageryTree);
+        this._layerRefHandler.discloseTileTrees(trees);
         if (this._planarClipMask)
             this._planarClipMask.discloseTileTrees(trees);
     }
@@ -196247,13 +196277,6 @@ class AccuDrawViewportUI extends _AccuDraw__WEBPACK_IMPORTED_MODULE_1__.AccuDraw
         const itemField = this._controls.itemFields[item];
         itemField.setSelectionRange(0, itemField.value.length);
     }
-    makeParserHappy(value, isAngle) {
-        // TODO: Work around for default length parser not accepting output formatted with dash separator, ex. 20'-6"...
-        const parserSpec = (isAngle ? undefined : this.getLengthParser());
-        if (undefined === parserSpec)
-            return value;
-        return (_itwin_core_quantity__WEBPACK_IMPORTED_MODULE_0__.FormatType.Fractional === parserSpec.format.type && -1 !== value.indexOf("'-") ? value.replaceAll("'-", "':") : value);
-    }
     evaluateExpression(operator, operandA, operandB) {
         switch (operator) {
             case "+":
@@ -196282,7 +196305,7 @@ class AccuDrawViewportUI extends _AccuDraw__WEBPACK_IMPORTED_MODULE_1__.AccuDraw
         if (undefined === parserSpec || undefined === formatterSpec)
             return undefined; // Nothing to do...
         const operandAStr = currentValue.substring(0, operator);
-        const parseResultA = parserSpec.parseToQuantityValue(this.makeParserHappy(operandAStr, isAngle));
+        const parseResultA = parserSpec.parseToQuantityValue(operandAStr);
         if (!_itwin_core_quantity__WEBPACK_IMPORTED_MODULE_0__.Parser.isParsedQuantity(parseResultA))
             return undefined; // First operand isn't valid, try to parse current value (which is also likely to fail)...
         const operandBStr = currentValue.substring(operator + this._expression.operator.length);
@@ -196295,7 +196318,7 @@ class AccuDrawViewportUI extends _AccuDraw__WEBPACK_IMPORTED_MODULE_1__.AccuDraw
                 return operandAStr; // Second operand is invalid number, set value to first operand which is valid...
         }
         else {
-            const parseResultB = parserSpec.parseToQuantityValue(this.makeParserHappy(operandBStr, isAngle));
+            const parseResultB = parserSpec.parseToQuantityValue(operandBStr);
             if (!_itwin_core_quantity__WEBPACK_IMPORTED_MODULE_0__.Parser.isParsedQuantity(parseResultB))
                 return operandAStr; // Second operand is invalid quantity, set value to first operand which is valid...
             operandB = parseResultB.value;
@@ -196310,26 +196333,31 @@ class AccuDrawViewportUI extends _AccuDraw__WEBPACK_IMPORTED_MODULE_1__.AccuDraw
             return;
         const itemField = this._controls.itemFields[item];
         const currentValue = itemField.value;
-        // If current value has been deleted, unlock field and refresh for current cursor location...
+        // If value was cleared, unlock field and sync internal state to cursor location while preserving partial keyin status...
         if (0 === currentValue.length) {
-            this.updateFieldLock(item, false);
+            await this.processFieldInput(item, currentValue, false);
             _IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.toolAdmin.simulateMotionEvent();
             return;
         }
         const isAngle = (_AccuDraw__WEBPACK_IMPORTED_MODULE_1__.ItemField.ANGLE_Item === item);
         const expressionValue = this.parseExpression(currentValue, isAngle);
-        return this.processFieldInput(item, this.makeParserHappy(expressionValue ?? currentValue, isAngle), false);
+        return this.processFieldInput(item, expressionValue ?? currentValue, false);
     }
     async acceptPartialInput(item, forward) {
         if (undefined === this._controls)
             return;
         const itemField = this._controls.itemFields[item];
         const currentValue = itemField.value;
+        // Accepting with cleared value needs to set state back to dynamic and sync field to internal state...
+        if (0 === currentValue.length && undefined === forward) {
+            this.setDynamicKeyinStatus(item);
+            return this.updateItemFieldValue(itemField, item);
+        }
         const isAngle = (_AccuDraw__WEBPACK_IMPORTED_MODULE_1__.ItemField.ANGLE_Item === item);
         const expressionValue = this.parseExpression(currentValue, isAngle);
         if (undefined === forward)
-            return _AccuDrawTool__WEBPACK_IMPORTED_MODULE_4__.AccuDrawShortcuts.itemFieldAcceptInput(item, this.makeParserHappy(expressionValue ?? currentValue, isAngle));
-        return _AccuDrawTool__WEBPACK_IMPORTED_MODULE_4__.AccuDrawShortcuts.itemFieldNavigate(item, this.makeParserHappy(expressionValue ?? currentValue, isAngle), forward);
+            return _AccuDrawTool__WEBPACK_IMPORTED_MODULE_4__.AccuDrawShortcuts.itemFieldAcceptInput(item, expressionValue ?? currentValue);
+        return _AccuDrawTool__WEBPACK_IMPORTED_MODULE_4__.AccuDrawShortcuts.itemFieldNavigate(item, expressionValue ?? currentValue, forward);
     }
     acceptSavedValue(item, next) {
         if (next)
@@ -196501,10 +196529,8 @@ class AccuDrawViewportUI extends _AccuDraw__WEBPACK_IMPORTED_MODULE_1__.AccuDraw
         return this.processPartialInput(item);
     }
     async onKeyboardEvent(ev, isDown) {
-        if (ev.ctrlKey || ev.altKey || ev.metaKey) {
-            ev.preventDefault(); // Ignore qualifiers other than shift...
-            return;
-        }
+        if (ev.ctrlKey || ev.altKey || ev.metaKey)
+            return; // Ignore qualifiers other than shift...
         switch (ev.key) {
             case "Escape":
                 return this.doFocusHome(ev, isDown, this._focusItem);
@@ -196564,7 +196590,7 @@ class AccuDrawViewportUI extends _AccuDraw__WEBPACK_IMPORTED_MODULE_1__.AccuDraw
         const isDynamic = this.isDynamicKeyinStatus(item);
         if (isDynamic && item === this._expression?.item)
             this._expression = undefined; // Only valid when entering partial input...
-        itemField.style.caretColor = isDynamic ? itemField.style.backgroundColor : itemField.style.color;
+        itemField.style.caretColor = isDynamic ? "transparent" : itemField.style.color;
     }
     updateItemFieldValue(itemField, item) {
         const value = this.getFormattedValueByIndex(item);
@@ -205899,7 +205925,15 @@ class ViewManip extends ViewTool {
             this._depthPreview = { testPoint: ev.rawPoint, pickRadius: pickRadiusPixels, plane: result.plane, source: result.source, isDefaultDepth: !isValidDepth, sourceId: result.sourceId };
         return (isValidDepth || isPreview ? result.plane.getOriginRef() : undefined);
     }
+    /** In addition to the onReinitialize calls after a tool installs or restarts, it is also
+     * called from the mouseover event to cancel a drag operation if the up event occurred outside the view.
+     * When operating in one shot mode and also requiring dragging, the tool should exit and not restart in ths situation.
+     * A tool must opt in to allowing [[ViewTool.exitTool]] to be called from [[ViewManip.onReinitialize]] by
+     * overriding this method to return true.
+     */
+    get isExitAllowedOnReinitialize() { return false; }
     async onReinitialize() {
+        const shouldExit = (this.oneShot && this.isDraggingRequired && this.isDragging && 0 !== this.nPts);
         if (undefined !== this.viewport) {
             this.viewport.synchWithView(); // make sure we store any changes in view undo buffer.
             this.viewHandles.setFocus(-1);
@@ -205909,6 +205943,9 @@ class ViewManip extends ViewTool {
         this.inDynamicUpdate = false;
         this._startPose = undefined;
         this.viewHandles.onReinitialize();
+        if (shouldExit && this.isExitAllowedOnReinitialize)
+            return this.exitTool();
+        this.provideInitialToolAssistance();
     }
     async onDataButtonDown(ev) {
         // Tool was started in "drag required" mode, don't advance tool state and wait to see if we get the start drag event.
@@ -206046,7 +206083,6 @@ class ViewManip extends ViewTool {
         await super.onPostInstall();
         await this.onReinitialize(); // Call onReinitialize now that tool is installed.
     }
-    /** @beta */
     provideToolAssistance(mainInstrKey, additionalInstr) {
         const mainInstruction = _ToolAssistance__WEBPACK_IMPORTED_MODULE_19__.ToolAssistance.createInstruction(this.iconSpec, ViewTool.translate(mainInstrKey));
         const mouseInstructions = [];
@@ -206071,6 +206107,8 @@ class ViewManip extends ViewTool {
         const instructions = _ToolAssistance__WEBPACK_IMPORTED_MODULE_19__.ToolAssistance.createInstructions(mainInstruction, sections);
         _IModelApp__WEBPACK_IMPORTED_MODULE_7__.IModelApp.notifications.setToolAssistance(instructions);
     }
+    /** Called from [[ViewManip.onReinitialize]] to allow tools to establish the tool assistance for the first point. */
+    provideInitialToolAssistance() { }
     async onCleanup() {
         let restorePrevious = false;
         if (this.inDynamicUpdate) {
@@ -208011,10 +208049,8 @@ class PanViewTool extends ViewManip {
     constructor(vp, oneShot = false, isDraggingRequired = false) {
         super(vp, ViewHandleType.Pan, oneShot, isDraggingRequired);
     }
-    async onReinitialize() {
-        await super.onReinitialize();
-        this.provideToolAssistance("Pan.Prompts.FirstPoint");
-    }
+    get isExitAllowedOnReinitialize() { return true; }
+    provideInitialToolAssistance() { this.provideToolAssistance("Pan.Prompts.FirstPoint"); }
 }
 /** A tool that performs a Rotate view operation
  * @public
@@ -208025,10 +208061,8 @@ class RotateViewTool extends ViewManip {
     constructor(vp, oneShot = false, isDraggingRequired = false) {
         super(vp, ViewHandleType.Rotate | ViewHandleType.Pan | ViewHandleType.TargetCenter, oneShot, isDraggingRequired);
     }
-    async onReinitialize() {
-        await super.onReinitialize();
-        this.provideToolAssistance("Rotate.Prompts.FirstPoint");
-    }
+    get isExitAllowedOnReinitialize() { return true; }
+    provideInitialToolAssistance() { this.provideToolAssistance("Rotate.Prompts.FirstPoint"); }
 }
 /** A tool that performs the look operation
  * @public
@@ -208039,10 +208073,8 @@ class LookViewTool extends ViewManip {
     constructor(vp, oneShot = false, isDraggingRequired = false) {
         super(vp, ViewHandleType.Look | ViewHandleType.Pan, oneShot, isDraggingRequired);
     }
-    async onReinitialize() {
-        await super.onReinitialize();
-        this.provideToolAssistance("Look.Prompts.FirstPoint");
-    }
+    get isExitAllowedOnReinitialize() { return true; }
+    provideInitialToolAssistance() { this.provideToolAssistance("Look.Prompts.FirstPoint"); }
 }
 /** A tool that performs the scroll operation
  * @public
@@ -208053,10 +208085,8 @@ class ScrollViewTool extends ViewManip {
     constructor(vp, oneShot = false, isDraggingRequired = false) {
         super(vp, ViewHandleType.Scroll, oneShot, isDraggingRequired);
     }
-    async onReinitialize() {
-        await super.onReinitialize();
-        this.provideToolAssistance("Scroll.Prompts.FirstPoint");
-    }
+    get isExitAllowedOnReinitialize() { return true; }
+    provideInitialToolAssistance() { this.provideToolAssistance("Scroll.Prompts.FirstPoint"); }
 }
 /** A tool that performs the zoom operation
  * @public
@@ -208067,10 +208097,8 @@ class ZoomViewTool extends ViewManip {
     constructor(vp, oneShot = false, isDraggingRequired = false) {
         super(vp, ViewHandleType.Zoom | ViewHandleType.Pan, oneShot, isDraggingRequired);
     }
-    async onReinitialize() {
-        await super.onReinitialize();
-        this.provideToolAssistance("Zoom.Prompts.FirstPoint");
-    }
+    get isExitAllowedOnReinitialize() { return true; }
+    provideInitialToolAssistance() { this.provideToolAssistance("Zoom.Prompts.FirstPoint"); }
 }
 /** A tool that performs the walk operation using mouse+keyboard or touch controls.
  * Keyboard and mouse controls are similar to those used by many video games:
@@ -208087,11 +208115,8 @@ class LookAndMoveTool extends ViewManip {
         const viewport = (undefined === vp ? _IModelApp__WEBPACK_IMPORTED_MODULE_7__.IModelApp.viewManager.selectedView : vp); // Need vp to enable camera/check lens in onReinitialize...
         super(viewport, ViewHandleType.LookAndMove | ViewHandleType.Pan, oneShot, isDraggingRequired);
     }
-    async onReinitialize() {
-        await super.onReinitialize();
-        this.provideToolAssistance("LookAndMove.Prompts.FirstPoint");
-    }
-    /** @beta */
+    get isExitAllowedOnReinitialize() { return true; }
+    provideInitialToolAssistance() { this.provideToolAssistance("LookAndMove.Prompts.FirstPoint"); }
     provideToolAssistance(mainInstrKey) {
         const mainInstruction = _ToolAssistance__WEBPACK_IMPORTED_MODULE_19__.ToolAssistance.createInstruction(this.iconSpec, ViewTool.translate(mainInstrKey));
         const mouseInstructions = [];
@@ -208130,11 +208155,8 @@ class WalkViewTool extends ViewManip {
         const viewport = (undefined === vp ? _IModelApp__WEBPACK_IMPORTED_MODULE_7__.IModelApp.viewManager.selectedView : vp); // Need vp to enable camera/check lens in onReinitialize...
         super(viewport, ViewHandleType.Walk | ViewHandleType.Pan, oneShot, isDraggingRequired);
     }
-    async onReinitialize() {
-        await super.onReinitialize();
-        this.provideToolAssistance("Walk.Prompts.FirstPoint");
-    }
-    /** @beta */
+    get isExitAllowedOnReinitialize() { return true; }
+    provideInitialToolAssistance() { this.provideToolAssistance("Walk.Prompts.FirstPoint"); }
     provideToolAssistance(mainInstrKey) {
         const walkInstructions = [];
         walkInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_19__.ToolAssistance.createModifierKeyInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_19__.ToolAssistance.shiftKey, _ToolAssistance__WEBPACK_IMPORTED_MODULE_19__.ToolAssistanceImage.LeftClickDrag, ViewTool.translate("Pan.flyover"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_19__.ToolAssistanceInputMethod.Mouse));
@@ -208151,11 +208173,8 @@ class FlyViewTool extends ViewManip {
     constructor(vp, oneShot = false, isDraggingRequired = false) {
         super(vp, ViewHandleType.Fly | ViewHandleType.Pan, oneShot, isDraggingRequired);
     }
-    async onReinitialize() {
-        await super.onReinitialize();
-        this.provideToolAssistance("Fly.Prompts.FirstPoint");
-    }
-    /** @beta */
+    get isExitAllowedOnReinitialize() { return true; }
+    provideInitialToolAssistance() { this.provideToolAssistance("Fly.Prompts.FirstPoint"); }
     provideToolAssistance(mainInstrKey) {
         const flyInstructions = [];
         flyInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_19__.ToolAssistance.createModifierKeyInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_19__.ToolAssistance.shiftKey, _ToolAssistance__WEBPACK_IMPORTED_MODULE_19__.ToolAssistanceImage.LeftClickDrag, ViewTool.translate("Pan.flyover"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_19__.ToolAssistanceInputMethod.Mouse));
@@ -208179,7 +208198,6 @@ class FitViewTool extends ViewTool {
         this.doAnimate = doAnimate;
         this.isolatedOnly = isolatedOnly;
     }
-    /** @beta */
     provideToolAssistance() {
         const mainInstruction = _ToolAssistance__WEBPACK_IMPORTED_MODULE_19__.ToolAssistance.createInstruction(this.iconSpec, ViewTool.translate("Fit.Prompts.FirstPoint"));
         const mouseInstructions = [];
@@ -208491,7 +208509,6 @@ class WindowAreaTool extends ViewTool {
         }
         return super.onResetButtonUp(ev);
     }
-    /** @beta */
     provideToolAssistance() {
         const mainInstruction = _ToolAssistance__WEBPACK_IMPORTED_MODULE_19__.ToolAssistance.createInstruction(this.iconSpec, ViewTool.translate(this._haveFirstPoint ? "WindowArea.Prompts.NextPoint" : "WindowArea.Prompts.FirstPoint"));
         const mouseInstructions = [];
@@ -208994,7 +209011,6 @@ class SetupCameraTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_17__.Primi
             await this.exitTool();
         return _Tool__WEBPACK_IMPORTED_MODULE_18__.EventHandled.Yes;
     }
-    /** @beta */
     provideToolAssistance() {
         const mainInstruction = _ToolAssistance__WEBPACK_IMPORTED_MODULE_19__.ToolAssistance.createInstruction(this.iconSpec, ViewTool.translate(this._haveEyePt ? "SetupCamera.Prompts.NextPoint" : "SetupCamera.Prompts.FirstPoint"));
         const mouseInstructions = [];
@@ -209254,7 +209270,6 @@ class SetupWalkCameraTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_17__.P
             await this.exitTool();
         return _Tool__WEBPACK_IMPORTED_MODULE_18__.EventHandled.Yes;
     }
-    /** @beta */
     provideToolAssistance() {
         const mainInstruction = _ToolAssistance__WEBPACK_IMPORTED_MODULE_19__.ToolAssistance.createInstruction(this.iconSpec, ViewTool.translate(this._haveEyePt ? "SetupWalkCamera.Prompts.NextPoint" : "SetupWalkCamera.Prompts.FirstPoint"));
         const mouseInstructions = [];
@@ -327986,7 +328001,7 @@ class TestContext {
         this.initializeRpcInterfaces({ title: this.settings.Backend.name, version: this.settings.Backend.version });
         const iModelClient = new imodels_client_management_1.IModelsClient({ api: { baseUrl: `https://${process.env.IMJS_URL_PREFIX ?? ""}api.bentley.com/imodels` } });
         await core_frontend_1.NoRenderApp.startup({
-            applicationVersion: "5.0.0-dev.100",
+            applicationVersion: "5.0.0-dev.104",
             applicationId: this.settings.gprid,
             authorizationClient: new frontend_1.TestFrontendAuthorizationClient(this.serviceAuthToken),
             hubAccess: new imodels_access_frontend_1.FrontendIModelsAccess(iModelClient),
@@ -353030,7 +353045,7 @@ var loadLanguages = instance.loadLanguages;
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@itwin/core-frontend","version":"5.0.0-dev.100","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","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","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","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:*"},"//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/eslint-plugin":"5.0.0-dev.1","@types/chai-as-promised":"^7","@vitest/browser":"^3.0.6","@vitest/coverage-v8":"^3.0.6","cpx2":"^8.0.0","eslint":"^9.13.0","glob":"^10.3.12","playwright":"~1.47.1","rimraf":"^6.0.1","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/cloud-agnostic-core":"^2.2.4","@itwin/object-storage-core":"^2.3.0","@itwin/core-i18n":"workspace:*","@itwin/webgl-compatibility":"workspace:*","@loaders.gl/core":"^3.1.6","@loaders.gl/draco":"^3.1.6","fuse.js":"^3.3.0","wms-capabilities":"0.4.0"}}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@itwin/core-frontend","version":"5.0.0-dev.104","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","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","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","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:*"},"//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/eslint-plugin":"5.0.0-dev.1","@types/chai-as-promised":"^7","@vitest/browser":"^3.0.6","@vitest/coverage-v8":"^3.0.6","cpx2":"^8.0.0","eslint":"^9.13.0","glob":"^10.3.12","playwright":"~1.47.1","rimraf":"^6.0.1","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/cloud-agnostic-core":"^2.2.4","@itwin/object-storage-core":"^2.3.0","@itwin/core-i18n":"workspace:*","@itwin/webgl-compatibility":"workspace:*","@loaders.gl/core":"^3.1.6","@loaders.gl/draco":"^3.1.6","fuse.js":"^3.3.0","wms-capabilities":"0.4.0"}}');
 
 /***/ }),