xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

LabelLayer: improve constructor

Browse Source
This commit is contained in:
Emux 2022-08-07 18:45:56 +03:00
parent 4f69560cf3
commit 3d883b9e56
No known key found for this signature in database
GPG Key ID: 64ED9980896038C3
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vtm/src/org/oscim/layers/tile/vector/labeling/LabelLayer.java
View File

@ -1,7 +1,7 @@
/* /*
* Copyright 2012, 2013 Hannes Janetzek * Copyright 2012, 2013 Hannes Janetzek
* Copyright 2017 Wolfgang Schramm * Copyright 2017 Wolfgang Schramm
* Copyright 2017-2018 devemux86 * Copyright 2017-2022 devemux86
* Copyright 2017 Andrey Novikov * Copyright 2017 Andrey Novikov
* Copyright 2018 Gustl22 * Copyright 2018 Gustl22
* *
@ -30,13 +30,11 @@ import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.map.Map; import org.oscim.map.Map;
import org.oscim.map.Viewport; import org.oscim.map.Viewport;
import org.oscim.utils.async.SimpleWorker; import org.oscim.utils.async.SimpleWorker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class LabelLayer extends Layer implements Map.UpdateListener, TileManager.Listener, public class LabelLayer extends Layer implements Map.UpdateListener, TileManager.Listener,
ZoomLimiter.IZoomLimiter { ZoomLimiter.IZoomLimiter {
static final Logger log = LoggerFactory.getLogger(LabelLayer.class); //private static final Logger log = LoggerFactory.getLogger(LabelLayer.class);
static final String LABEL_DATA = LabelLayer.class.getName(); static final String LABEL_DATA = LabelLayer.class.getName();
@ -60,8 +58,6 @@ public class LabelLayer extends Layer implements Map.UpdateListener, TileManager
public LabelLayer(Map map, VectorTileLayer l, VectorTileLayer.TileLoaderThemeHook h, public LabelLayer(Map map, VectorTileLayer l, VectorTileLayer.TileLoaderThemeHook h,
int zoomLimit) { int zoomLimit) {
super(map); super(map);
l.getManager().events.bind(this);
l.addHook(h);
mZoomLimiter = new ZoomLimiter(l.getManager(), map.viewport().getMinZoomLevel(), mZoomLimiter = new ZoomLimiter(l.getManager(), map.viewport().getMinZoomLevel(),
map.viewport().getMaxZoomLevel(), zoomLimit); map.viewport().getMaxZoomLevel(), zoomLimit);
@ -69,6 +65,9 @@ public class LabelLayer extends Layer implements Map.UpdateListener, TileManager
mLabelPlacer = new LabelPlacement(map, l.tileRenderer(), mZoomLimiter); mLabelPlacer = new LabelPlacement(map, l.tileRenderer(), mZoomLimiter);
mWorker = new Worker(map); mWorker = new Worker(map);
mRenderer = new TextRenderer(mWorker); mRenderer = new TextRenderer(mWorker);
l.getManager().events.bind(this);
l.addHook(h);
} }
class Worker extends SimpleWorker<LabelTask> { class Worker extends SimpleWorker<LabelTask> {