From b0ebe7e0cf8d7cb9251aef2180df701e96363ae4 Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Sat, 8 Feb 2014 03:42:28 +0100 Subject: [PATCH] use TILE_LOADED event to trigger labeling --- .../layers/tile/vector/labeling/LabelLayer.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/vtm/src/org/oscim/layers/tile/vector/labeling/LabelLayer.java b/vtm/src/org/oscim/layers/tile/vector/labeling/LabelLayer.java index b90aee4b..b1e602b1 100644 --- a/vtm/src/org/oscim/layers/tile/vector/labeling/LabelLayer.java +++ b/vtm/src/org/oscim/layers/tile/vector/labeling/LabelLayer.java @@ -89,12 +89,7 @@ public class LabelLayer extends Layer implements Map.InputListener, Map.UpdateLi @Override public void onDetach() { - // TODO stop and clear labeling thread - log.debug("DETACH"); - - // clear labels mWorker.cancel(true); - super.onDetach(); } @@ -103,7 +98,8 @@ public class LabelLayer extends Layer implements Map.InputListener, Map.UpdateLi if (clear) mWorker.cancel(true); - mWorker.submit(MAX_RELABEL_DELAY); + if (changed || clear) + mWorker.submit(MAX_RELABEL_DELAY); } @Override @@ -126,9 +122,11 @@ public class LabelLayer extends Layer implements Map.InputListener, Map.UpdateLi @Override public void onEvent(Object source, Event e, MapTile tile) { if (e == TileManager.TILE_LOADED) { - log.debug("tile loaded: {}", tile); + if (tile.isVisible) + mWorker.submit(MAX_RELABEL_DELAY / 4); + //log.debug("tile loaded: {}", tile); } else if (e == TileManager.TILE_REMOVED) { - log.debug("tile removed: {}", tile); + //log.debug("tile removed: {}", tile); } }