From 6b28d28b2bd787e56acc59aa7d2e7981f80bf985 Mon Sep 17 00:00:00 2001 From: mdastous-bentley Date: Mon, 21 Mar 2022 15:51:07 -0400 Subject: [PATCH 1/3] Attempt to fix incorrect overlay elevation. --- core/frontend/src/tile/map/MapTileTree.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/frontend/src/tile/map/MapTileTree.ts b/core/frontend/src/tile/map/MapTileTree.ts index 12fce23b85f1..97c907ac01fe 100644 --- a/core/frontend/src/tile/map/MapTileTree.ts +++ b/core/frontend/src/tile/map/MapTileTree.ts @@ -423,7 +423,8 @@ class MapTreeSupplier implements TileTreeSupplier { cmp = compareStringsOrUndefined(lhs.maskModelIds, rhs.maskModelIds); if (0 === cmp) { cmp = compareBooleans(lhs.isOverlay, rhs.isOverlay); - if (0 === cmp && !lhs.isOverlay) { + // if (0 === cmp && !lhs.isOverlay) { + if (0 === cmp) { cmp = compareBooleans(lhs.wantSkirts, rhs.wantSkirts); if (0 === cmp) { cmp = compareBooleans(lhs.wantNormals, rhs.wantNormals); @@ -666,7 +667,8 @@ export class MapTileTreeReference extends TileTreeReference { const id: MapTreeId = { tileUserId: this._tileUserId, - applyTerrain: this.settings.applyTerrain && !this.isOverlay && !this._isDrape, + // applyTerrain: this.settings.applyTerrain && !this.isOverlay && !this._isDrape, + applyTerrain: this.settings.applyTerrain && !this._isDrape, terrainProviderName: this.settings.terrainSettings.providerName, terrainHeightOrigin: this.settings.terrainSettings.heightOrigin, terrainHeightOriginMode: this.settings.terrainSettings.heightOriginMode, From add8c35ee2f09f5de3c78c2cc531190dc88d9b54 Mon Sep 17 00:00:00 2001 From: mdastous-bentley Date: Mon, 28 Mar 2022 11:14:39 -0400 Subject: [PATCH 2/3] Removed comments --- core/frontend/src/tile/map/MapTileTree.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/frontend/src/tile/map/MapTileTree.ts b/core/frontend/src/tile/map/MapTileTree.ts index 97c907ac01fe..72bdbe4897bf 100644 --- a/core/frontend/src/tile/map/MapTileTree.ts +++ b/core/frontend/src/tile/map/MapTileTree.ts @@ -423,7 +423,6 @@ class MapTreeSupplier implements TileTreeSupplier { cmp = compareStringsOrUndefined(lhs.maskModelIds, rhs.maskModelIds); if (0 === cmp) { cmp = compareBooleans(lhs.isOverlay, rhs.isOverlay); - // if (0 === cmp && !lhs.isOverlay) { if (0 === cmp) { cmp = compareBooleans(lhs.wantSkirts, rhs.wantSkirts); if (0 === cmp) { @@ -667,7 +666,6 @@ export class MapTileTreeReference extends TileTreeReference { const id: MapTreeId = { tileUserId: this._tileUserId, - // applyTerrain: this.settings.applyTerrain && !this.isOverlay && !this._isDrape, applyTerrain: this.settings.applyTerrain && !this._isDrape, terrainProviderName: this.settings.terrainSettings.providerName, terrainHeightOrigin: this.settings.terrainSettings.heightOrigin, From 6c76c4855b39e0fa777ed98f38c78fc32b4734dc Mon Sep 17 00:00:00 2001 From: mdastous-bentley Date: Tue, 29 Mar 2022 08:03:35 -0400 Subject: [PATCH 3/3] changelog --- .../bugfix-overlayTerrain_2022-03-29-12-02.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 common/changes/@itwin/core-frontend/bugfix-overlayTerrain_2022-03-29-12-02.json diff --git a/common/changes/@itwin/core-frontend/bugfix-overlayTerrain_2022-03-29-12-02.json b/common/changes/@itwin/core-frontend/bugfix-overlayTerrain_2022-03-29-12-02.json new file mode 100644 index 000000000000..4384576bb712 --- /dev/null +++ b/common/changes/@itwin/core-frontend/bugfix-overlayTerrain_2022-03-29-12-02.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@itwin/core-frontend", + "comment": "Fix overlay map layers that were displayed at the wrong elevation", + "type": "none" + } + ], + "packageName": "@itwin/core-frontend" +} \ No newline at end of file