Skip to content

Remove unnecessary sorting when getting rendered tiles before symbol placement #10993

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove unnecessary sorting when getting rendered tiles before symbol placement #10993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47a5ef5
Remove unnecessary sorting when getting rendered tiles before symbol …
zmiao Sep 3, 2021
9ab766d
Rename the parameter, remove reverse function
zmiao Sep 6, 2021
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
2 changes: 1 addition & 1 deletion src/render/painter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ class Painter {
const sourceCache = sourceCaches[id];
coordsAscending[id] = sourceCache.getVisibleCoordinates();
coordsDescending[id] = coordsAscending[id].slice().reverse();
coordsDescendingSymbol[id] = sourceCache.getVisibleCoordinates(true).reverse();
coordsDescendingSymbol[id] = sourceCache.getVisibleCoordinates(true);
}

this.opaquePassCutoff = Infinity;
Expand Down
18 changes: 4 additions & 14 deletions src/source/source_cache.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {Event, ErrorEvent, Evented} from '../util/evented.js';
import TileCache from './tile_cache.js';
import {keysDifference, values} from '../util/util.js';
import Context from '../gl/context.js';
import Point from '@mapbox/point-geometry';
import browser from '../util/browser.js';
import {OverscaledTileID} from './tile_id.js';
import assert from 'assert';
Expand Down Expand Up @@ -174,19 +173,10 @@ class SourceCache extends Evented {
return values((this._tiles: any)).map((tile: Tile) => tile.tileID).sort(compareTileId).map(id => id.key);
}

getRenderableIds(symbolLayer?: boolean): Array<number> {
getRenderableIds(allLayers?: boolean): Array<number> {
const renderables: Array<Tile> = [];
for (const id in this._tiles) {
if (this._isIdRenderable(+id, symbolLayer)) renderables.push(this._tiles[id]);
}
if (symbolLayer) {
Copy link
Member

@mourner mourner Sep 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

symbolLayer argument is no longer used so we should remove it from signature / calls.

return renderables.sort((a_: Tile, b_: Tile) => {
const a = a_.tileID;
const b = b_.tileID;
const rotatedA = (new Point(a.canonical.x, a.canonical.y))._rotate(this.transform.angle);
const rotatedB = (new Point(b.canonical.x, b.canonical.y))._rotate(this.transform.angle);
return a.overscaledZ - b.overscaledZ || rotatedB.y - rotatedA.y || rotatedB.x - rotatedA.x;
}).map(tile => tile.tileID.key);
if (this._isIdRenderable(+id, allLayers)) renderables.push(this._tiles[id]);
}
return renderables.map(tile => tile.tileID).sort(compareTileId).map(id => id.key);
}
Expand Down Expand Up @@ -841,8 +831,8 @@ class SourceCache extends Evented {
return tileResults;
}

getVisibleCoordinates(symbolLayer?: boolean): Array<OverscaledTileID> {
const coords = this.getRenderableIds(symbolLayer).map((id) => this._tiles[id].tileID);
getVisibleCoordinates(includeAllLayers?: boolean): Array<OverscaledTileID> {
const coords = this.getRenderableIds(includeAllLayers).map((id) => this._tiles[id].tileID);
for (const coord of coords) {
coord.projMatrix = this.transform.calculateProjMatrix(coord.toUnwrapped());
}
Expand Down