@itwin/core-frontend 3.1.0-dev.8 → 3.2.0-dev.3

package/lib/cjs/tile/map/MapTileTree.d.ts

@@ -2,15 +2,16 @@
  * @module Tiles
  */
 import { Id64String } from "@itwin/core-bentley";
-import { Ellipsoid, EllipsoidPatch, Point3d, Range1d, Range3d, Ray3d, Transform, Vector3d } from "@itwin/core-geometry";
 import { BackgroundMapSettings, BaseLayerSettings, ColorDef, GlobeMode, MapLayerSettings, TerrainProviderName } from "@itwin/core-common";
+import { Ellipsoid, EllipsoidPatch, Point3d, Range1d, Range3d, Ray3d, Transform, Vector3d } from "@itwin/core-geometry";
 import { TerrainDisplayOverrides } from "../../DisplayStyleState";
 import { HitDetail } from "../../HitDetail";
 import { IModelConnection } from "../../IModelConnection";
 import { FeatureSymbology } from "../../render/FeatureSymbology";
+import { RenderPlanarClassifier } from "../../render/RenderPlanarClassifier";
 import { SceneContext } from "../../ViewContext";
 import { ScreenViewport } from "../../Viewport";
-import { DisclosedTileTreeSet, ImageryMapLayerTreeReference, ImageryMapTileTree, MapCartoRectangle, MapTile, MapTileLoader, MapTilingScheme, QuadId, RealityTileTree, RealityTileTreeParams, Tile, TileDrawArgs, TileParams, TileTree, TileTreeOwner, TileTreeReference } from "../internal";
+import { DisclosedTileTreeSet, GeometryTileTreeReference, ImageryMapLayerTreeReference, ImageryMapTileTree, MapCartoRectangle, MapLayerFeatureInfo, MapLayerTileTreeReference, MapTile, MapTileLoader, MapTilingScheme, ModelMapLayerTileTreeReference, QuadId, RealityTile, RealityTileTree, RealityTileTreeParams, Tile, TileDrawArgs, TileParams, TileTree, TileTreeOwner, TileTreeReference } from "../internal";
 /** @internal */
 export declare class MapTileTree extends RealityTileTree {
     ecefToDb: Transform;
@@ -30,16 +31,21 @@ export declare class MapTileTree extends RealityTileTree {
     baseColor?: ColorDef;
     baseTransparent: boolean;
     mapTransparent: boolean;
+    produceGeometry?: boolean;
     constructor(params: RealityTileTreeParams, ecefToDb: Transform, bimElevationBias: number, geodeticOffset: number, sourceTilingScheme: MapTilingScheme, id: MapTreeId, applyTerrain: boolean);
     get parentsAndChildrenExclusive(): boolean;
     tileFromQuadId(quadId: QuadId): MapTile | undefined;
     imageryTrees: ImageryMapTileTree[];
     private _layerSettings;
-    addImageryLayer(tree: ImageryMapTileTree, settings: MapLayerSettings): void;
-    clearImageryLayers(): void;
+    private _modelIdToIndex;
+    layerClassifiers: Map<number, RenderPlanarClassifier>;
+    addImageryLayer(tree: ImageryMapTileTree, settings: MapLayerSettings, index: number): void;
+    addModelLayer(layerTreeRef: ModelMapLayerTileTreeReference, context: SceneContext): void;
+    protected collectClassifierGraphics(args: TileDrawArgs, selectedTiles: RealityTile[]): void;
+    clearImageryTreesAndClassifiers(): void;
     get isTransparent(): boolean;
     get maxDepth(): number;
-    createPlanarChild(params: TileParams, quadId: QuadId, corners: Point3d[], normal: Vector3d, rectangle: MapCartoRectangle, chordHeight: number, heightRange?: Range1d): MapTile;
+    createPlanarChild(params: TileParams, quadId: QuadId, corners: Point3d[], normal: Vector3d, rectangle: MapCartoRectangle, chordHeight: number, heightRange?: Range1d): MapTile | undefined;
     createGlobeChild(params: TileParams, quadId: QuadId, _rangeCorners: Point3d[], rectangle: MapCartoRectangle, ellipsoidPatch: EllipsoidPatch, heightRange?: Range1d): MapTile;
     getChildHeightRange(quadId: QuadId, rectangle: MapCartoRectangle, parent: MapTile): Range1d | undefined;
     clearLayers(): void;
@@ -80,6 +86,7 @@ interface MapTreeId {
     baseTransparent: boolean;
     mapTransparent: boolean;
     maskModelIds?: string;
+    produceGeometry?: boolean;
 }
 /** @internal */
 declare type CheckTerrainDisplayOverride = () => TerrainDisplayOverrides | undefined;
@@ -97,7 +104,7 @@ export declare class MapTileTreeReference extends TileTreeReference {
     private readonly _iModel;
     private _baseImageryLayerIncluded;
     private _baseColor?;
-    private readonly _imageryTrees;
+    private readonly _layerTrees;
     private _baseTransparent;
     private _symbologyOverrides;
     private _planarClipMask?;
@@ -105,6 +112,7 @@ export declare class MapTileTreeReference extends TileTreeReference {
     get isGlobal(): boolean;
     get baseColor(): ColorDef | undefined;
     get planarclipMaskPriority(): number;
+    protected _createGeometryTreeReference(): GeometryTileTreeReference | undefined;
     /** Terrain  tiles do not contribute to the range used by "fit view". */
     unionFitRange(_range: Range3d): void;
     get settings(): BackgroundMapSettings;
@@ -117,8 +125,8 @@ export declare class MapTileTreeReference extends TileTreeReference {
     protected get _isLoadingComplete(): boolean;
     get useDepthBuffer(): boolean;
     get treeOwner(): TileTreeOwner;
-    getLayerImageryTreeRef(index: number): ImageryMapLayerTreeReference | undefined;
-    initializeImagery(): boolean;
+    getLayerImageryTreeRef(index: number): MapLayerTileTreeReference | undefined;
+    initializeLayers(context: SceneContext): boolean;
     /** Adds this reference's graphics to the scene. By default this invokes [[TileTree.drawScene]] on the referenced TileTree, if it is loaded. */
     addToScene(context: SceneContext): void;
     createDrawArgs(context: SceneContext): TileDrawArgs | undefined;
@@ -127,7 +135,9 @@ export declare class MapTileTreeReference extends TileTreeReference {
     discloseTileTrees(trees: DisclosedTileTreeSet): void;
     imageryTreeFromTreeModelIds(mapTreeModelId: Id64String, layerTreeModelId: Id64String): ImageryMapLayerTreeReference | undefined;
     layerFromTreeModelIds(mapTreeModelId: Id64String, layerTreeModelId: Id64String): MapLayerSettings | undefined;
+    private forEachImageryTileHit;
     getToolTip(hit: HitDetail): Promise<HTMLElement | string | undefined>;
+    getMapFeatureInfo(hit: HitDetail): Promise<MapLayerFeatureInfo[] | undefined>;
     /** Add logo cards to logo div. */
     addLogoCards(cards: HTMLTableElement, vp: ScreenViewport): void;
 }

package/lib/cjs/tile/map/MapTileTree.d.ts.map

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

package/lib/cjs/tile/map/MapTileTree.js

@@ -9,10 +9,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGcsConverterAvailable = exports.MapTileTreeReference = exports.MapTileTree = void 0;
 const core_bentley_1 = require("@itwin/core-bentley");
-const core_geometry_1 = require("@itwin/core-geometry");
 const core_common_1 = require("@itwin/core-common");
+const core_geometry_1 = require("@itwin/core-geometry");
 const ApproximateTerrainHeights_1 = require("../../ApproximateTerrainHeights");
-const IModelApp_1 = require("../../IModelApp");
 const PlanarClipMaskState_1 = require("../../PlanarClipMaskState");
 const FeatureSymbology_1 = require("../../render/FeatureSymbology");
 const internal_1 = require("../internal");
@@ -30,6 +29,8 @@ class MapTileTree extends internal_1.RealityTileTree {
         this.sourceTilingScheme = sourceTilingScheme;
         this.imageryTrees = [];
         this._layerSettings = new Map();
+        this._modelIdToIndex = new Map();
+        this.layerClassifiers = new Map();
         this._mercatorTilingScheme = new internal_1.WebMercatorTilingScheme();
         this._mercatorFractionToDb = this._mercatorTilingScheme.computeMercatorFractionToDb(ecefToDb, bimElevationBias, params.iModel, applyTerrain);
         const quadId = new internal_1.QuadId(sourceTilingScheme.rootLevel, 0, 0);
@@ -47,6 +48,7 @@ class MapTileTree extends internal_1.RealityTileTree {
         if (applyTerrain) {
             this.minEarthEllipsoid = core_geometry_1.Ellipsoid.createCenterMatrixRadii(this.globeOrigin, this.ecefToDb.matrix, core_geometry_1.Constant.earthRadiusWGS84.equator + globalHeightRange.low, core_geometry_1.Constant.earthRadiusWGS84.equator + globalHeightRange.low, core_geometry_1.Constant.earthRadiusWGS84.polar + globalHeightRange.low);
             this.maxEarthEllipsoid = core_geometry_1.Ellipsoid.createCenterMatrixRadii(this.globeOrigin, this.ecefToDb.matrix, core_geometry_1.Constant.earthRadiusWGS84.equator + globalHeightRange.high, core_geometry_1.Constant.earthRadiusWGS84.equator + globalHeightRange.high, core_geometry_1.Constant.earthRadiusWGS84.polar + globalHeightRange.high);
+            this.produceGeometry = id.produceGeometry;
         }
         else {
             this.minEarthEllipsoid = this.earthEllipsoid;
@@ -69,19 +71,28 @@ class MapTileTree extends internal_1.RealityTileTree {
     tileFromQuadId(quadId) {
         return this._rootTile.tileFromQuadId(quadId);
     }
-    addImageryLayer(tree, settings) {
-        const maxLayers = IModelApp_1.IModelApp.renderSystem.maxRealityImageryLayers;
-        if (this.imageryTrees.length < maxLayers) {
-            this.imageryTrees.push(tree);
-            this._layerSettings.set(tree.modelId, settings);
-        }
-        else {
-            // TBD -- Notify user that layers is being ignored?
-        }
+    addImageryLayer(tree, settings, index) {
+        this.imageryTrees.push(tree);
+        this._layerSettings.set(tree.modelId, settings);
+        this._modelIdToIndex.set(tree.modelId, index);
+    }
+    addModelLayer(layerTreeRef, context) {
+        const classifier = context.addPlanarClassifier(`MapLayer ${this.modelId}-${layerTreeRef.layerIndex}`, layerTreeRef);
+        if (classifier)
+            this.layerClassifiers.set(layerTreeRef.layerIndex, classifier);
     }
-    clearImageryLayers() {
+    collectClassifierGraphics(args, selectedTiles) {
+        super.collectClassifierGraphics(args, selectedTiles);
+        this.layerClassifiers.forEach((layerClassifier) => {
+            if (!(args instanceof internal_1.GraphicsCollectorDrawArgs))
+                layerClassifier.collectGraphics(args.context, { modelId: this.modelId, tiles: selectedTiles, location: args.location, isPointCloud: this.isPointCloud });
+        });
+    }
+    clearImageryTreesAndClassifiers() {
         this.imageryTrees.length = 0;
         this._layerSettings.clear();
+        this._modelIdToIndex.clear();
+        this.layerClassifiers.clear();
     }
     get isTransparent() {
         return this.mapTransparent || this.baseTransparent;
@@ -93,9 +104,12 @@ class MapTileTree extends internal_1.RealityTileTree {
         return maxDepth;
     }
     createPlanarChild(params, quadId, corners, normal, rectangle, chordHeight, heightRange) {
+        const childAvailable = this.mapLoader.isTileAvailable(quadId);
+        if (!childAvailable && this.produceGeometry)
+            return undefined;
         const patch = new internal_1.PlanarTilePatch(corners, normal, chordHeight);
         const cornerNormals = this.getCornerRays(rectangle);
-        const ctor = this.mapLoader.isTileAvailable(quadId) ? internal_1.MapTile : internal_1.UpsampledMapTile;
+        const ctor = childAvailable ? internal_1.MapTile : internal_1.UpsampledMapTile;
         return new ctor(params, this, quadId, patch, rectangle, heightRange, cornerNormals);
     }
     createGlobeChild(params, quadId, _rangeCorners, rectangle, ellipsoidPatch, heightRange) {
@@ -270,10 +284,8 @@ class MapTileTree extends internal_1.RealityTileTree {
         return this.sourceTilingScheme.tileXYToRectangle(quadId.column, quadId.row, quadId.level);
     }
     getLayerIndex(imageryTreeId) {
-        for (let index = 0; index < this.imageryTrees.length; index++)
-            if (imageryTreeId === this.imageryTrees[index].modelId)
-                return index;
-        return -1;
+        const index = this._modelIdToIndex.get(imageryTreeId);
+        return index === undefined ? -1 : index;
     }
     getLayerTransparency(imageryTreeId) {
         const layerSettings = this._layerSettings.get(imageryTreeId);
@@ -335,8 +347,11 @@ class MapTreeSupplier {
                                                         cmp = (0, core_bentley_1.compareNumbers)(lhs.terrainHeightOrigin, rhs.terrainHeightOrigin);
                                                         if (0 === cmp) {
                                                             cmp = (0, core_bentley_1.compareNumbers)(lhs.terrainHeightOriginMode, rhs.terrainHeightOriginMode);
-                                                            if (0 === cmp)
+                                                            if (0 === cmp) {
                                                                 cmp = (0, core_bentley_1.compareNumbers)(lhs.terrainExaggeration, rhs.terrainExaggeration);
+                                                                if (0 === cmp)
+                                                                    cmp = (0, core_bentley_1.compareBooleansOrUndefined)(lhs.produceGeometry, rhs.produceGeometry);
+                                                            }
                                                         }
                                                     }
                                                 }
@@ -404,7 +419,7 @@ const mapTreeSupplier = new MapTreeSupplier();
  */
 class MapTileTreeReference extends internal_1.TileTreeReference {
     constructor(settings, _baseLayerSettings, _layerSettings, iModel, tileUserId, isOverlay, _isDrape, _overrideTerrainDisplay) {
-        var _a;
+        var _a, _b;
         super();
         this._baseLayerSettings = _baseLayerSettings;
         this._layerSettings = _layerSettings;
@@ -412,7 +427,7 @@ class MapTileTreeReference extends internal_1.TileTreeReference {
         this._isDrape = _isDrape;
         this._overrideTerrainDisplay = _overrideTerrainDisplay;
         this._baseImageryLayerIncluded = false;
-        this._imageryTrees = new Array();
+        this._layerTrees = new Array();
         this._baseTransparent = false;
         this._tileUserId = tileUserId;
         this._settings = settings;
@@ -420,7 +435,7 @@ class MapTileTreeReference extends internal_1.TileTreeReference {
         let tree;
         if (!isOverlay && this._baseLayerSettings !== undefined) {
             if (this._baseLayerSettings instanceof core_common_1.MapLayerSettings) {
-                tree = IModelApp_1.IModelApp.mapLayerFormatRegistry.createImageryMapLayerTree(this._baseLayerSettings, 0, iModel);
+                tree = (0, internal_1.createMapLayerTreeReference)(this._baseLayerSettings, 0, iModel);
                 this._baseTransparent = this._baseLayerSettings.transparency > 0;
             }
             else {
@@ -429,16 +444,25 @@ class MapTileTreeReference extends internal_1.TileTreeReference {
             }
         }
         if (this._baseImageryLayerIncluded = (undefined !== tree))
-            this._imageryTrees.push(tree);
+            this._layerTrees.push(tree);
         for (let i = 0; i < this._layerSettings.length; i++)
-            if (undefined !== (tree = IModelApp_1.IModelApp.mapLayerFormatRegistry.createImageryMapLayerTree(this._layerSettings[i], i + 1, iModel)))
-                this._imageryTrees.push(tree);
+            if (undefined !== (tree = (0, internal_1.createMapLayerTreeReference)(this._layerSettings[i], i + 1, iModel)))
+                this._layerTrees.push(tree);
         if (this._settings.planarClipMask && this._settings.planarClipMask.isValid)
             this._planarClipMask = PlanarClipMaskState_1.PlanarClipMaskState.create(this._settings.planarClipMask);
+        if (this._overrideTerrainDisplay && ((_b = this._overrideTerrainDisplay()) === null || _b === void 0 ? void 0 : _b.produceGeometry))
+            this.collectTileGeometry = (collector) => this._collectTileGeometry(collector);
     }
     get isGlobal() { return true; }
     get baseColor() { return this._baseColor; }
     get planarclipMaskPriority() { return core_common_1.PlanarClipMaskPriority.BackgroundMap; }
+    _createGeometryTreeReference() {
+        if (!this._settings.applyTerrain || this._isDrape)
+            return undefined; // Don't bother generating non-terrain (flat) geometry.
+        const ref = new MapTileTreeReference(this._settings, undefined, [], this._iModel, this._tileUserId, false, false, () => { return { produceGeometry: true }; });
+        (0, core_bentley_1.assert)(undefined !== ref.collectTileGeometry);
+        return ref;
+    }
     /** Terrain  tiles do not contribute to the range used by "fit view". */
     unionFitRange(_range) { }
     get settings() { return this._settings; }
@@ -451,7 +475,7 @@ class MapTileTreeReference extends internal_1.TileTreeReference {
         let tree;
         this._baseLayerSettings = baseLayerSettings;
         if (baseLayerSettings instanceof core_common_1.MapLayerSettings) {
-            tree = IModelApp_1.IModelApp.mapLayerFormatRegistry.createImageryMapLayerTree(baseLayerSettings, 0, this._iModel);
+            tree = (0, internal_1.createMapLayerTreeReference)(baseLayerSettings, 0, this._iModel);
             this._baseColor = undefined;
             this._baseTransparent = baseLayerSettings.transparency > 0;
         }
@@ -461,13 +485,13 @@ class MapTileTreeReference extends internal_1.TileTreeReference {
         }
         if (tree) {
             if (this._baseImageryLayerIncluded)
-                this._imageryTrees[0] = tree;
+                this._layerTrees[0] = tree;
             else
-                this._imageryTrees.splice(0, 0, tree);
+                this._layerTrees.splice(0, 0, tree);
         }
         else {
             if (this._baseImageryLayerIncluded)
-                this._imageryTrees.shift();
+                this._layerTrees.shift();
         }
         this._baseImageryLayerIncluded = tree !== undefined;
         this.clearLayers();
@@ -478,11 +502,11 @@ class MapTileTreeReference extends internal_1.TileTreeReference {
     setLayerSettings(layerSettings) {
         this._layerSettings = layerSettings;
         const baseLayerIndex = this._baseImageryLayerIncluded ? 1 : 0;
-        this._imageryTrees.length = Math.min(layerSettings.length + baseLayerIndex, this._imageryTrees.length); // Truncate if number of layers reduced.
+        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._imageryTrees.length || !this._imageryTrees[treeIndex].layerSettings.displayMatches(layerSettings[i]))
-                this._imageryTrees[treeIndex] = IModelApp_1.IModelApp.mapLayerFormatRegistry.createImageryMapLayerTree(layerSettings[i], treeIndex, this._iModel);
+            if (treeIndex >= this._layerTrees.length || !this._layerTrees[treeIndex].layerSettings.displayMatches(layerSettings[i]))
+                this._layerTrees[treeIndex] = (0, internal_1.createMapLayerTreeReference)(layerSettings[i], treeIndex, this._iModel);
         }
         this.clearLayers();
     }
@@ -496,7 +520,7 @@ class MapTileTreeReference extends internal_1.TileTreeReference {
     }
     get _isLoadingComplete() {
         // Wait until drape tree is fully loaded too.
-        for (const drapeTree of this._imageryTrees)
+        for (const drapeTree of this._layerTrees)
             if (!drapeTree.isLoadingComplete)
                 return false;
         return super._isLoadingComplete;
@@ -529,12 +553,14 @@ class MapTileTreeReference extends internal_1.TileTreeReference {
             baseTransparent: this._baseTransparent,
             mapTransparent: this.settings.transparency > 0,
             maskModelIds: (_b = this._planarClipMask) === null || _b === void 0 ? void 0 : _b.settings.compressedModelIds,
+            produceGeometry: false,
         };
         if (undefined !== this._overrideTerrainDisplay) {
             const ovr = this._overrideTerrainDisplay();
             if (undefined !== ovr) {
                 id.wantSkirts = (_c = ovr.wantSkirts) !== null && _c !== void 0 ? _c : id.wantSkirts;
                 id.wantNormals = (_d = ovr.wantNormals) !== null && _d !== void 0 ? _d : id.wantNormals;
+                id.produceGeometry = ovr.produceGeometry === true;
             }
         }
         return this._iModel.tiles.getTileTreeOwner(id, mapTreeSupplier);
@@ -542,30 +568,33 @@ class MapTileTreeReference extends internal_1.TileTreeReference {
     getLayerImageryTreeRef(index) {
         const baseLayerIndex = this._baseImageryLayerIncluded ? 1 : 0;
         const treeIndex = index + baseLayerIndex;
-        return index < 0 || treeIndex >= this._imageryTrees.length ? undefined : this._imageryTrees[treeIndex];
+        return index < 0 || treeIndex >= this._layerTrees.length ? undefined : this._layerTrees[treeIndex];
     }
-    initializeImagery() {
+    initializeLayers(context) {
         const tree = this.treeOwner.load();
         if (undefined === tree)
             return false; // Not loaded yet.
         tree.imageryTrees.length = 0;
-        if (0 === this._imageryTrees.length)
+        if (0 === this._layerTrees.length)
             return !this.isOverlay;
-        let treeIndex = this._imageryTrees.length - 1;
+        let treeIndex = this._layerTrees.length - 1;
         // Start displaying at the highest completely opaque layer...
         for (; treeIndex >= 1; treeIndex--) {
-            const imageryTreeRef = this._imageryTrees[treeIndex];
-            const layerSettings = imageryTreeRef.layerSettings;
-            if (layerSettings.visible && !imageryTreeRef.layerSettings.allSubLayersInvisible && !layerSettings.transparentBackground && 0 === layerSettings.transparency)
+            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._imageryTrees.length; treeIndex++) {
-            const imageryTreeRef = this._imageryTrees[treeIndex];
-            if (internal_1.TileTreeLoadStatus.NotFound !== imageryTreeRef.treeOwner.loadStatus && imageryTreeRef.layerSettings.visible && !imageryTreeRef.layerSettings.allSubLayersInvisible) {
-                const imageryTree = imageryTreeRef.treeOwner.load();
-                if (undefined === imageryTree)
+        for (; treeIndex < this._layerTrees.length; treeIndex++) {
+            const layerTreeRef = this._layerTrees[treeIndex];
+            if (internal_1.TileTreeLoadStatus.NotFound !== layerTreeRef.treeOwner.loadStatus && layerTreeRef.layerSettings.visible && !layerTreeRef.layerSettings.allSubLayersInvisible) {
+                const layerTree = layerTreeRef.treeOwner.load();
+                if (undefined === layerTree)
                     return false; // Not loaded yet.
-                tree.addImageryLayer(imageryTree, imageryTreeRef.layerSettings);
+                if (layerTree instanceof internal_1.ImageryMapTileTree) {
+                    tree.addImageryLayer(layerTree, layerTreeRef.layerSettings, treeIndex);
+                }
+                else if (layerTreeRef instanceof internal_1.ModelMapLayerTileTreeReference)
+                    tree.addModelLayer(layerTreeRef, context);
             }
         }
         return true;
@@ -575,7 +604,7 @@ class MapTileTreeReference extends internal_1.TileTreeReference {
         if (!context.viewFlags.backgroundMap)
             return;
         const tree = this.treeOwner.load();
-        if (undefined === tree || !this.initializeImagery())
+        if (undefined === tree || !this.initializeLayers(context))
             return; // Not loaded yet.
         if (this._planarClipMask && this._planarClipMask.settings.isValid)
             context.addPlanarClassifier(tree.modelId, undefined, this._planarClipMask);
@@ -591,13 +620,14 @@ class MapTileTreeReference extends internal_1.TileTreeReference {
         const args = this.createDrawArgs(context);
         if (undefined !== args)
             tree.draw(args);
-        tree.clearImageryLayers();
+        tree.clearImageryTreesAndClassifiers();
     }
     createDrawArgs(context) {
         const args = super.createDrawArgs(context);
         if (undefined === args)
             return undefined;
-        return new internal_1.RealityTileDrawArgs(args, args.worldToViewMap, args.frustumPlanes);
+        const tree = this.treeOwner.load();
+        return new internal_1.RealityTileDrawArgs(args, args.worldToViewMap, args.frustumPlanes, undefined, tree === null || tree === void 0 ? void 0 : tree.layerClassifiers);
     }
     getViewFlagOverrides(_tree) {
         return createViewFlagOverrides(false, this._settings.applyTerrain ? undefined : false);
@@ -607,7 +637,7 @@ class MapTileTreeReference extends internal_1.TileTreeReference {
     }
     discloseTileTrees(trees) {
         super.discloseTileTrees(trees);
-        this._imageryTrees.forEach((imageryTree) => trees.disclose(imageryTree));
+        this._layerTrees.forEach((imageryTree) => trees.disclose(imageryTree));
         if (this._planarClipMask)
             this._planarClipMask.discloseTileTrees(trees);
     }
@@ -615,7 +645,7 @@ class MapTileTreeReference extends internal_1.TileTreeReference {
         const tree = this.treeOwner.tileTree;
         if (undefined === tree || tree.modelId !== mapTreeModelId)
             return undefined;
-        for (const imageryTree of this._imageryTrees)
+        for (const imageryTree of this._layerTrees)
             if (imageryTree.treeOwner.tileTree && imageryTree.treeOwner.tileTree.modelId === layerTreeModelId)
                 return imageryTree;
         return undefined;
@@ -624,16 +654,24 @@ class MapTileTreeReference extends internal_1.TileTreeReference {
         const imageryTree = this.imageryTreeFromTreeModelIds(mapTreeModelId, layerTreeModelId);
         return imageryTree === undefined ? imageryTree : imageryTree.layerSettings;
     }
-    async getToolTip(hit) {
+    // Utility method that execute the provided function for every *imagery* tiles under a given HotDetail object.
+    async forEachImageryTileHit(hit, func) {
         const tree = this.treeOwner.tileTree;
-        // eslint-disable-next-line @typescript-eslint/unbound-method
         if (undefined === tree || hit.iModel !== tree.iModel || tree.modelId !== hit.modelId || !hit.viewport || !hit.viewport.view.is3d)
             return undefined;
         const backgroundMapGeometry = hit.viewport.displayStyle.getBackgroundMapGeometry();
         if (undefined === backgroundMapGeometry)
             return undefined;
         const worldPoint = hit.hitPoint.clone();
-        const cartoGraphic = await backgroundMapGeometry.dbToCartographicFromGcs(worldPoint);
+        let cartoGraphic;
+        try {
+            cartoGraphic = await backgroundMapGeometry.dbToCartographicFromGcs(worldPoint);
+        }
+        catch {
+        }
+        if (!cartoGraphic) {
+            return undefined;
+        }
         const strings = [];
         const imageryTreeRef = this.imageryTreeFromTreeModelIds(hit.modelId, hit.sourceId);
         if (imageryTreeRef !== undefined) {
@@ -645,23 +683,72 @@ class MapTileTreeReference extends internal_1.TileTreeReference {
                     const imageryTree = imageryTreeRef.treeOwner.tileTree;
                     if (imageryTree) {
                         for (const imageryTile of terrainTile.imageryTiles) {
-                            if (imageryTree === imageryTile.imageryTree && imageryTile.rectangle.containsCartographic(cartoGraphic))
-                                await imageryTree.imageryLoader.getToolTip(strings, imageryTile.quadId, cartoGraphic, imageryTree);
+                            if (imageryTree === imageryTile.imageryTree && imageryTile.rectangle.containsCartographic(cartoGraphic)) {
+                                try {
+                                    await func(imageryTreeRef, imageryTile.quadId, cartoGraphic, imageryTree);
+                                }
+                                catch {
+                                    // continue iterating even though we got a failure.
+                                }
+                            }
                         }
                     }
                 }
             }
         }
-        strings.push(`Latitude: ${cartoGraphic.latitudeDegrees.toFixed(4)}`);
-        strings.push(`Longitude: ${cartoGraphic.longitudeDegrees.toFixed(4)}`);
-        if (this.settings.applyTerrain) {
-            const geodeticHeight = (cartoGraphic.height - tree.bimElevationBias) / tree.terrainExaggeration;
-            strings.push(`Height (Meters) Geodetic: ${geodeticHeight.toFixed(1)} Sea Level: ${(geodeticHeight - tree.geodeticOffset).toFixed(1)}`);
+    }
+    async getToolTip(hit) {
+        const tree = this.treeOwner.tileTree;
+        if (tree.modelId !== hit.modelId)
+            return undefined;
+        let carto;
+        const strings = [];
+        const getTooltipFunc = async (imageryTreeRef, quadId, cartoGraphic, imageryTree) => {
+            strings.push(`Imagery Layer: ${imageryTreeRef.layerSettings.name}`);
+            carto = cartoGraphic;
+            await imageryTree.imageryLoader.getToolTip(strings, quadId, cartoGraphic, imageryTree);
+        };
+        try {
+            await this.forEachImageryTileHit(hit, getTooltipFunc);
+        }
+        catch {
+            // No results added
+        }
+        if (carto) {
+            strings.push(`Latitude: ${carto.latitudeDegrees.toFixed(4)}`);
+            strings.push(`Longitude: ${carto.longitudeDegrees.toFixed(4)}`);
+            if (this.settings.applyTerrain && tree.terrainExaggeration !== 0.0) {
+                const geodeticHeight = (carto.height - tree.bimElevationBias) / tree.terrainExaggeration;
+                strings.push(`Height (Meters) Geodetic: ${geodeticHeight.toFixed(1)} Sea Level: ${(geodeticHeight - tree.geodeticOffset).toFixed(1)}`);
+            }
         }
         const div = document.createElement("div");
         div.innerHTML = strings.join("<br>");
         return div;
     }
+    async getMapFeatureInfo(hit) {
+        const tree = this.treeOwner.tileTree;
+        if (undefined === tree || hit.iModel !== tree.iModel || tree.modelId !== hit.modelId || !hit.viewport || !hit.viewport.view.is3d)
+            return undefined;
+        const info = [];
+        const imageryTreeRef = this.imageryTreeFromTreeModelIds(hit.modelId, hit.sourceId);
+        if (imageryTreeRef !== undefined) {
+            const getFeatureInfoFunc = async (_imageryTreeRef, quadId, cartoGraphic, imageryTree) => {
+                try {
+                    await imageryTree.imageryLoader.getMapFeatureInfo(info, quadId, cartoGraphic, imageryTree);
+                }
+                catch {
+                }
+            };
+            try {
+                await this.forEachImageryTileHit(hit, getFeatureInfoFunc);
+            }
+            catch {
+                // No results added
+            }
+        }
+        return info;
+    }
     /** Add logo cards to logo div. */
     addLogoCards(cards, vp) {
         const tree = this.treeOwner.tileTree;
@@ -669,7 +756,7 @@ class MapTileTreeReference extends internal_1.TileTreeReference {
         if (tree) {
             if (undefined !== (logo = tree.mapLoader.terrainProvider.getLogo()))
                 cards.appendChild(logo);
-            for (const imageryTreeRef of this._imageryTrees) {
+            for (const imageryTreeRef of this._layerTrees) {
                 if (imageryTreeRef.layerSettings.visible) {
                     const imageryTree = imageryTreeRef.treeOwner.tileTree;
                     if (imageryTree && (undefined !== (logo = imageryTree.getLogo(vp))))