Skip to content

avoid extra loops when terrain does not exist #2304

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

Merged
HarelM merged 2 commits into from
Mar 28, 2023
Merged

avoid extra loops when terrain does not exist #2304

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d55b652
avoid extra loops when terrain does not exist
zhangyiatmicrosoft Mar 24, 2023
ccba4a1
removed the block according to PR feedback
zhangyiatmicrosoft Mar 28, 2023
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
11 changes: 3 additions & 8 deletions src/symbol/placement.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,9 @@ export class Placement {
bucket.deserializeCollisionBoxes(collisionBoxArray);
}

const tileID = this.retainedQueryData[bucket.bucketInstanceId].tileID;
const getElevation = this.terrain ? (x: number, y: number) => this.terrain.getElevation(tileID, x, y) : null;
Comment thread
zhangyiatmicrosoft marked this conversation as resolved.

const placeSymbol = (symbolInstance: SymbolInstance, collisionArrays: CollisionArrays) => {
if (seenCrossTileIDs[symbolInstance.crossTileID]) return;
if (holdingForFade) {
Expand Down Expand Up @@ -493,14 +496,6 @@ export class Placement {
verticalTextFeatureIndex = collisionArrays.verticalTextFeatureIndex;
}

// update elevation of collisionArrays
const tileID = this.retainedQueryData[bucket.bucketInstanceId].tileID;
const getElevation = this.terrain ? (x: number, y: number) => this.terrain.getElevation(tileID, x, y) : null;
for (const boxType of ['textBox', 'verticalTextBox', 'iconBox', 'verticalIconBox']) {
const box = collisionArrays[boxType];
if (box) box.elevation = getElevation ? getElevation(box.anchorPointX, box.anchorPointY) : 0;
}

const textBox = collisionArrays.textBox;
if (textBox) {

Expand Down