From 13c42d509c9a5fa3fe7c60c30dfe540bc9e5e048 Mon Sep 17 00:00:00 2001 From: Emux Date: Wed, 12 Jul 2017 09:57:59 +0300 Subject: [PATCH] LabelLayer: improvements for prevent running worker when disabled #374 --- .../org/oscim/layers/tile/vector/labeling/LabelLayer.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 a15821e0..25dc11c2 100644 --- a/vtm/src/org/oscim/layers/tile/vector/labeling/LabelLayer.java +++ b/vtm/src/org/oscim/layers/tile/vector/labeling/LabelLayer.java @@ -1,6 +1,7 @@ /* * Copyright 2012, 2013 Hannes Janetzek * Copyright 2017 Wolfgang Schramm + * Copyright 2017 devemux86 * * This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * @@ -85,6 +86,9 @@ public class LabelLayer extends Layer implements Map.UpdateListener, TileManager } public void update() { + if (!isEnabled()) + return; + mWorker.submit(MAX_RELABEL_DELAY); } @@ -127,7 +131,7 @@ public class LabelLayer extends Layer implements Map.UpdateListener, TileManager @Override public void onTileManagerEvent(Event e, MapTile tile) { if (e == TileManager.TILE_LOADED) { - if (tile.isVisible) + if (tile.isVisible && isEnabled()) mWorker.submit(MAX_RELABEL_DELAY / 4); //log.debug("tile loaded: {}", tile); } else if (e == TileManager.TILE_REMOVED) {