LabelLayer: improvements for prevent running worker when disabled #374

This commit is contained in:
Emux 2017-07-12 09:57:59 +03:00
parent a6aa2b2388
commit 13c42d509c

View File

@ -1,6 +1,7 @@
/* /*
* Copyright 2012, 2013 Hannes Janetzek * Copyright 2012, 2013 Hannes Janetzek
* Copyright 2017 Wolfgang Schramm * Copyright 2017 Wolfgang Schramm
* Copyright 2017 devemux86
* *
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * 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() { public void update() {
if (!isEnabled())
return;
mWorker.submit(MAX_RELABEL_DELAY); mWorker.submit(MAX_RELABEL_DELAY);
} }
@ -127,7 +131,7 @@ public class LabelLayer extends Layer implements Map.UpdateListener, TileManager
@Override @Override
public void onTileManagerEvent(Event e, MapTile tile) { public void onTileManagerEvent(Event e, MapTile tile) {
if (e == TileManager.TILE_LOADED) { if (e == TileManager.TILE_LOADED) {
if (tile.isVisible) if (tile.isVisible && isEnabled())
mWorker.submit(MAX_RELABEL_DELAY / 4); mWorker.submit(MAX_RELABEL_DELAY / 4);
//log.debug("tile loaded: {}", tile); //log.debug("tile loaded: {}", tile);
} else if (e == TileManager.TILE_REMOVED) { } else if (e == TileManager.TILE_REMOVED) {