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

pass VectorTileLayer to LabelLayer and BuildingLayer

Browse Source
This commit is contained in:
Hannes Janetzek
2014-02-07 17:40:30 +01:00
parent db780d9939
commit dd954e3416
5 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vtm/src/org/oscim/layers/tile/vector/BuildingLayer.java
View File

@@ -21,7 +21,6 @@ import org.oscim.layers.Layer;
import org.oscim.map.Map;
import org.oscim.renderer.ExtrusionRenderer;
import org.oscim.renderer.MapRenderer.Matrices;
import org.oscim.tiling.TileRenderer;
import org.oscim.utils.FastMath;
public class BuildingLayer extends Layer {
@@ -29,9 +28,9 @@ public class BuildingLayer extends Layer {
final ExtrusionRenderer mExtLayer;
public BuildingLayer(Map map, TileRenderer tileRenderer) {
public BuildingLayer(Map map, VectorTileLayer tileLayer) {
super(map);
mExtLayer = new ExtrusionRenderer(tileRenderer) {
mExtLayer = new ExtrusionRenderer(tileLayer.getTileRenderer()) {
private long mStartTime;
@Override

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

@@ -21,8 +21,9 @@ import org.oscim.event.EventDispatcher.Event;
import org.oscim.event.EventDispatcher.Listener;
import org.oscim.event.MotionEvent;
import org.oscim.layers.Layer;
import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.map.Map;
import org.oscim.tiling.TileRenderer;
import org.oscim.tiling.MapTile;
import org.oscim.tiling.TileManager;
import org.oscim.utils.async.SimpleWorker;
import org.slf4j.Logger;
@@ -30,6 +31,7 @@ import org.slf4j.LoggerFactory;
public class LabelLayer extends Layer implements Map.InputListener, Map.UpdateListener,
Listener<MapTile> {
static final Logger log = LoggerFactory.getLogger(LabelLayer.class);
private final static long MAX_RELABEL_DELAY = 100;
@@ -37,10 +39,11 @@ public class LabelLayer extends Layer implements Map.InputListener, Map.UpdateLi
private final LabelPlacement mLabelPlacer;
private final Worker mWorker;
public LabelLayer(Map map, TileRenderer tileRenderer) {
public LabelLayer(Map map, VectorTileLayer l) {
super(map);
l.getManager().events.bind(this);
mLabelPlacer = new LabelPlacement(map, tileRenderer);
mLabelPlacer = new LabelPlacement(map, l.getTileRenderer());
mWorker = new Worker(map);
mRenderer = new TextRenderer(mWorker);
}