Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix overlay map layers that were displayed at the wrong elevation #3394

Merged
merged 4 commits into from
Mar 29, 2022
Merged

Fix overlay map layers that were displayed at the wrong elevation #3394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b28d28
Attempt to fix incorrect overlay elevation.
mdastous-bentley Mar 21, 2022
add8c35
Removed comments
mdastous-bentley Mar 28, 2022
6c76c48
changelog
mdastous-bentley Mar 29, 2022
e2e8e09
Merge branch 'master' into bugfix/overlayTerrain
mergify[bot] Mar 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions common/changes/@itwin/core-frontend/bugfix-overlayTerrain_2022-03-29-12-02.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
4 changes: 2 additions & 2 deletions core/frontend/src/tile/map/MapTileTree.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ 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) {
cmp = compareBooleans(lhs.wantNormals, rhs.wantNormals);
Expand Down Expand Up @@ -666,7 +666,7 @@ 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,
terrainHeightOriginMode: this.settings.terrainSettings.heightOriginMode,
Expand Down