@itwin/core-frontend 4.0.0-dev.4 → 4.0.0-dev.40

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

@@ -37,7 +37,7 @@ export var MapTileTreeScaleRangeVisibility;
  *
  * The map or globe may be smooth, or feature 3d geometry supplied by a [[TerrainProvider]].
  * The terrain displayed in a [[Viewport]] is determined by its [TerrainSettings]($common).
- * @beta
+ * @public
  */
 export class MapTileTree extends RealityTileTree {
     /** @internal */
@@ -118,8 +118,8 @@ export class MapTileTree extends RealityTileTree {
     /** Add a new imagery tile tree / map-layer settings pair and initialize the imagery tile tree state.
      * @internal
      */
-    addImageryLayer(tree, settings, index) {
-        this.layerImageryTrees.push({ tree, settings });
+    addImageryLayer(tree, settings, index, baseImageryLayer) {
+        this.layerImageryTrees.push({ tree, settings, baseImageryLayer });
         this._layerSettings.set(tree.modelId, settings);
         if (!this._imageryTreeState.has(tree.modelId))
             this._imageryTreeState.set(tree.modelId, new ImageryTileTreeState());
@@ -152,9 +152,8 @@ export class MapTileTree extends RealityTileTree {
     }
     /** @internal */
     get maxDepth() {
-        var _a;
         let maxDepth = this.loader.maxDepth;
-        (_a = this.layerImageryTrees) === null || _a === void 0 ? void 0 : _a.forEach((layerImageryTree) => maxDepth = Math.max(maxDepth, layerImageryTree.tree.maxDepth));
+        this.layerImageryTrees?.forEach((layerImageryTree) => maxDepth = Math.max(maxDepth, layerImageryTree.tree.maxDepth));
         return maxDepth;
     }
     /** @internal */
@@ -358,15 +357,19 @@ export class MapTileTree extends RealityTileTree {
                 treeVisibility.reset();
             }
         }
-        let allTilesRead = true;
         for (const selectedTile of selected) {
             if (selectedTile instanceof MapTile) {
-                if (!selectedTile.isReady)
-                    allTilesRead = false;
                 let selectedImageryTiles = selectedTile.imageryTiles;
                 if (selectedTile.hiddenImageryTiles) {
                     selectedImageryTiles = selectedImageryTiles ? [...selectedImageryTiles, ...selectedTile.hiddenImageryTiles] : selectedTile.hiddenImageryTiles;
                 }
+                const leafTiles = selectedTile.highResolutionReplacementTiles;
+                if (leafTiles) {
+                    for (const tile of leafTiles) {
+                        const treeState = this.getImageryTreeState(tile.tree.id);
+                        treeState?.setScaleRangeVisibility(false);
+                    }
+                }
                 if (selectedImageryTiles) {
                     for (const selectedImageryTile of selectedImageryTiles) {
                         const treeState = this.getImageryTreeState(selectedImageryTile.tree.id);
@@ -382,8 +385,6 @@ export class MapTileTree extends RealityTileTree {
                 }
             }
         }
-        if (!allTilesRead)
-            changes;
         for (const [treeId, prevState] of layersVisibilityBefore) {
             const newState = this.getImageryTreeState(treeId);
             if (newState) {
@@ -566,7 +567,6 @@ const mapTreeSupplier = new MapTreeSupplier();
  */
 export class MapTileTreeReference extends TileTreeReference {
     constructor(settings, _baseLayerSettings, _layerSettings, iModel, tileUserId, isOverlay, _isDrape, _overrideTerrainDisplay) {
-        var _a, _b;
         super();
         this._baseLayerSettings = _baseLayerSettings;
         this._layerSettings = _layerSettings;
@@ -587,7 +587,7 @@ export class MapTileTreeReference extends TileTreeReference {
             }
             else {
                 this._baseColor = this._baseLayerSettings;
-                this._baseTransparent = ((_a = this._baseColor) === null || _a === void 0 ? void 0 : _a.getTransparency()) > 0;
+                this._baseTransparent = this._baseColor?.getTransparency() > 0;
             }
         }
         if (this._baseImageryLayerIncluded = (undefined !== tree))
@@ -597,7 +597,7 @@ export class MapTileTreeReference extends TileTreeReference {
                 this._layerTrees.push(tree);
         if (this._settings.planarClipMask && this._settings.planarClipMask.isValid)
             this._planarClipMask = PlanarClipMaskState.create(this._settings.planarClipMask);
-        if (this._overrideTerrainDisplay && ((_b = this._overrideTerrainDisplay()) === null || _b === void 0 ? void 0 : _b.produceGeometry))
+        if (this._overrideTerrainDisplay && this._overrideTerrainDisplay()?.produceGeometry)
             this.collectTileGeometry = (collector) => this._collectTileGeometry(collector);
     }
     get isGlobal() { return true; }
@@ -649,13 +649,12 @@ export class MapTileTreeReference extends TileTreeReference {
         return this._layerSettings;
     }
     setLayerSettings(layerSettings) {
-        var _a;
         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 || !((_a = this._layerTrees[treeIndex]) === null || _a === void 0 ? void 0 : _a.layerSettings.displayMatches(layerSettings[i])))
+            if (treeIndex >= this._layerTrees.length || !this._layerTrees[treeIndex]?.layerSettings.displayMatches(layerSettings[i]))
                 this._layerTrees[treeIndex] = createMapLayerTreeReference(layerSettings[i], treeIndex, this._iModel);
         }
         this.clearLayers();
@@ -679,10 +678,9 @@ export class MapTileTreeReference extends TileTreeReference {
         return !this.isOverlay && (this.settings.applyTerrain || this.settings.useDepthBuffer);
     }
     get treeOwner() {
-        var _a, _b, _c, _d;
         let wantSkirts = (this.settings.applyTerrain || this.useDepthBuffer) && !this.settings.transparency && !this._baseTransparent;
         if (wantSkirts) {
-            const maskTrans = (_a = this._planarClipMask) === null || _a === void 0 ? void 0 : _a.settings.transparency;
+            const maskTrans = this._planarClipMask?.settings.transparency;
             wantSkirts = (undefined === maskTrans || maskTrans <= 0);
         }
         const id = {
@@ -702,14 +700,14 @@ export class MapTileTreeReference extends TileTreeReference {
             baseColor: this._baseColor,
             baseTransparent: this._baseTransparent,
             mapTransparent: this.settings.transparency > 0,
-            maskModelIds: (_b = this._planarClipMask) === null || _b === void 0 ? void 0 : _b.settings.compressedModelIds,
+            maskModelIds: this._planarClipMask?.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.wantSkirts = ovr.wantSkirts ?? id.wantSkirts;
+                id.wantNormals = ovr.wantNormals ?? id.wantNormals;
                 id.produceGeometry = ovr.produceGeometry === true;
             }
         }
@@ -724,11 +722,10 @@ export class MapTileTreeReference extends TileTreeReference {
    * @internal
    */
     getMapLayerScaleRangeVisibility(index) {
-        var _a;
         const tree = this.treeOwner.tileTree;
         if (undefined !== tree) {
             const tileTreeRef = this.getLayerImageryTreeRef(index);
-            const treeId = (_a = tileTreeRef === null || tileTreeRef === void 0 ? void 0 : tileTreeRef.treeOwner.tileTree) === null || _a === void 0 ? void 0 : _a.id;
+            const treeId = tileTreeRef?.treeOwner.tileTree?.id;
             if (treeId !== undefined) {
                 const treeState = tree.getImageryTreeState(treeId);
                 if (treeState !== undefined)
@@ -748,7 +745,7 @@ export class MapTileTreeReference extends TileTreeReference {
         // Start displaying at the highest completely opaque layer...
         for (; treeIndex >= 1; treeIndex--) {
             const layerTreeRef = this._layerTrees[treeIndex];
-            if (layerTreeRef === null || layerTreeRef === void 0 ? void 0 : layerTreeRef.isOpaque)
+            if (layerTreeRef?.isOpaque)
                 break; // This layer is completely opaque and will obscure all others so ignore lower ones.
         }
         for (; treeIndex < this._layerTrees.length; treeIndex++) {
@@ -760,8 +757,9 @@ export class MapTileTreeReference extends TileTreeReference {
                 const layerTree = layerTreeRef.treeOwner.load();
                 if (undefined === layerTree)
                     return false; // Not loaded yet.
+                const baseImageryLayer = this._baseImageryLayerIncluded && (treeIndex === 0);
                 if (layerTree instanceof ImageryMapTileTree) {
-                    tree.addImageryLayer(layerTree, layerTreeRef.layerSettings, treeIndex);
+                    tree.addImageryLayer(layerTree, layerTreeRef.layerSettings, treeIndex, baseImageryLayer);
                 }
                 else if (layerTreeRef instanceof ModelMapLayerTileTreeReference)
                     tree.addModelLayer(layerTreeRef, context);
@@ -797,7 +795,7 @@ export class MapTileTreeReference extends TileTreeReference {
         if (undefined === args)
             return undefined;
         const tree = this.treeOwner.load();
-        return new RealityTileDrawArgs(args, args.worldToViewMap, args.frustumPlanes, undefined, tree === null || tree === void 0 ? void 0 : tree.layerClassifiers);
+        return new RealityTileDrawArgs(args, args.worldToViewMap, args.frustumPlanes, undefined, tree?.layerClassifiers);
     }
     getViewFlagOverrides(_tree) {
         return createViewFlagOverrides(false, this._settings.applyTerrain ? undefined : false);
@@ -927,7 +925,7 @@ export class MapTileTreeReference extends TileTreeReference {
         if (tree) {
             tree.mapLoader.terrainProvider.addLogoCards(cards, vp);
             for (const imageryTreeRef of this._layerTrees) {
-                if (imageryTreeRef === null || imageryTreeRef === void 0 ? void 0 : imageryTreeRef.layerSettings.visible) {
+                if (imageryTreeRef?.layerSettings.visible) {
                     const imageryTree = imageryTreeRef.treeOwner.tileTree;
                     if (imageryTree instanceof ImageryMapTileTree)
                         imageryTree.addLogoCards(cards, vp);