From 85377b42c4b47f8d7eab4341835af8e0eca475eb Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Sat, 20 Sep 2014 06:16:27 +0200 Subject: [PATCH] fix: use fadeTime from original tile --- .../oscim/layers/tile/VectorTileRenderer.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/vtm/src/org/oscim/layers/tile/VectorTileRenderer.java b/vtm/src/org/oscim/layers/tile/VectorTileRenderer.java index e3a291de..45704a0c 100644 --- a/vtm/src/org/oscim/layers/tile/VectorTileRenderer.java +++ b/vtm/src/org/oscim/layers/tile/VectorTileRenderer.java @@ -225,13 +225,20 @@ public class VectorTileRenderer extends TileRenderer { return; } - if (tile.fadeTime == 0) { - /* need to use original tile to get the fade */ - MapTile t = (tile.holder == null) ? tile : tile.holder; - tile.fadeTime = getMinFade(t, proxyLevel); + long fadeTime = tile.fadeTime; + if (fadeTime == 0) { + if (tile.holder == null) { + fadeTime = getMinFade(tile, proxyLevel); + } else { + /* need to use time from original tile */ + fadeTime = tile.holder.fadeTime; + if (fadeTime == 0) + fadeTime = getMinFade(tile.holder, proxyLevel); + } + tile.fadeTime = fadeTime; } - long dTime = MapRenderer.frametime - tile.fadeTime; + long dTime = MapRenderer.frametime - fadeTime; if (mOverdrawColor == 0 || dTime > FADE_TIME) { PolygonBucket.Renderer.drawOver(mClipMVP, 0, 1);