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

skip symbol fading for tiles immediately after reload #5741

Merged
merged 1 commit into from
Nov 29, 2017
Merged

skip symbol fading for tiles immediately after reload #5741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion src/source/tile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ class Tile {
texture: any;
refreshedUponExpiration: boolean;
reloadCallback: any;
justReloaded: boolean;

/**
* @param {TileCoord} coord
Expand Down Expand Up @@ -169,6 +170,10 @@ class Tile {
* @private
*/
unloadVectorData() {
if (this.state === 'reloading') {
this.justReloaded = true;
}

for (const id in this.buckets) {
this.buckets[id].destroy();
}
Expand Down Expand Up @@ -225,7 +230,7 @@ class Tile {
for (const id in this.buckets) {
const bucket = this.buckets[id];
if (bucket instanceof SymbolBucket) {
updateOpacities(bucket, collisionFadeTimes);
updateOpacities(bucket, collisionFadeTimes, this.justReloaded);
bucket.sortFeatures(angle);
}
}
Expand All @@ -235,6 +240,8 @@ class Tile {
if (this.featureIndex) {
this.featureIndex.setCollisionIndex(collisionIndex);
}

this.justReloaded = false;
}

getBucket(layer: StyleLayer) {
Expand Down
12 changes: 7 additions & 5 deletions src/symbol/symbol_placement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = {
performSymbolPlacement: performSymbolPlacement
};

function updateOpacity(symbolInstance: SymbolInstance, opacityState: OpacityState, targetOpacity: number, opacityUpdateTime: number, collisionFadeTimes: any) {
function updateOpacity(symbolInstance: SymbolInstance, opacityState: OpacityState, targetOpacity: number, opacityUpdateTime: number, collisionFadeTimes: any, instant: boolean) {
if (symbolInstance.isDuplicate) {
opacityState.opacity = 0;
opacityState.targetOpacity = 0;
Expand All @@ -24,7 +24,9 @@ function updateOpacity(symbolInstance: SymbolInstance, opacityState: OpacityStat
collisionFadeTimes.latestStart = opacityUpdateTime;
}
const increment = collisionFadeTimes.duration ? ((opacityUpdateTime - opacityState.time) / collisionFadeTimes.duration) : 1;
opacityState.opacity = Math.max(0, Math.min(1, opacityState.opacity + (opacityState.targetOpacity === 1 ? increment : -increment)));
opacityState.opacity = instant ?
targetOpacity :
Math.max(0, Math.min(1, opacityState.opacity + (opacityState.targetOpacity === 1 ? increment : -increment)));
opacityState.targetOpacity = targetOpacity;
opacityState.time = opacityUpdateTime;
}
Expand Down Expand Up @@ -56,7 +58,7 @@ function packOpacity(opacityState: OpacityState): number {
opacityBits * shift1 + targetBit;
}

function updateOpacities(bucket: SymbolBucket, collisionFadeTimes: any) {
function updateOpacities(bucket: SymbolBucket, collisionFadeTimes: any, instant: boolean) {
const glyphOpacityArray = bucket.text && bucket.text.opacityVertexArray;
const iconOpacityArray = bucket.icon && bucket.icon.opacityVertexArray;
if (glyphOpacityArray) glyphOpacityArray.clear();
Expand All @@ -75,7 +77,7 @@ function updateOpacities(bucket: SymbolBucket, collisionFadeTimes: any) {
const targetOpacity = symbolInstance.placedText ? 1.0 : 0.0;
const opacityState = symbolInstance.textOpacityState;
const initialHidden = opacityState.opacity === 0 && opacityState.targetOpacity === 0;
updateOpacity(symbolInstance, opacityState, targetOpacity, bucket.fadeStartTime, collisionFadeTimes);
updateOpacity(symbolInstance, opacityState, targetOpacity, bucket.fadeStartTime, collisionFadeTimes, instant);
const nowHidden = opacityState.opacity === 0 && opacityState.targetOpacity === 0;
if (initialHidden !== nowHidden) {
for (const placedTextSymbolIndex of symbolInstance.placedTextSymbolIndices) {
Expand All @@ -98,7 +100,7 @@ function updateOpacities(bucket: SymbolBucket, collisionFadeTimes: any) {
if (hasIcon) {
const targetOpacity = symbolInstance.placedIcon ? 1.0 : 0.0;
const opacityState = symbolInstance.iconOpacityState;
updateOpacity(symbolInstance, opacityState, targetOpacity, bucket.fadeStartTime, collisionFadeTimes);
updateOpacity(symbolInstance, opacityState, targetOpacity, bucket.fadeStartTime, collisionFadeTimes, instant);
const opacityEntryCount = symbolInstance.numIconVertices / 4;
const packedOpacity = packOpacity(opacityState);
for (let i = 0; i < opacityEntryCount; i++) {
Expand Down