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

refactor: TileLoader.createLoader()

Browse Source
This commit is contained in:
Hannes Janetzek 2014-03-09 18:06:57 +01:00
parent d00e9771e0
commit ff01b3f80d
7 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vtm-jeo/src/org/oscim/layers/JeoTileLayer.java
View File

@ -2,7 +2,6 @@ package org.oscim.layers;
import org.oscim.layers.tile.MapTile;
import org.oscim.layers.tile.TileLoader;
import org.oscim.layers.tile.TileManager;
import org.oscim.layers.tile.bitmap.BitmapTileLayer;
import org.oscim.map.Map;
import org.oscim.tiling.source.bitmap.BitmapTileSource;
@ -14,8 +13,8 @@ public class JeoTileLayer extends BitmapTileLayer {
}
@Override
protected TileLoader createLoader(TileManager tm) {
return new TileLoader(tm) {
protected TileLoader createLoader() {
return new TileLoader(this.getManager()) {
@Override
public void cleanup() {

8
vtm/src/org/oscim/layers/tile/TileLayer.java
View File

@ -45,7 +45,7 @@ public abstract class TileLayer extends Layer implements UpdateListener {
}
abstract protected TileLoader createLoader(TileManager tm);
abstract protected TileLoader createLoader();
public TileRenderer tileRenderer() {
return (TileRenderer) mRenderer;
@ -55,7 +55,7 @@ public abstract class TileLayer extends Layer implements UpdateListener {
mTileLoader = new TileLoader[numLoaders];
for (int i = 0; i < numLoaders; i++) {
mTileLoader[i] = createLoader(mTileManager);
mTileLoader[i] = createLoader();
mTileLoader[i].start();
}
}
@ -111,4 +111,8 @@ public abstract class TileLayer extends Layer implements UpdateListener {
for (TileLoader loader : mTileLoader)
loader.proceed();
}
public TileManager getManager() {
return mTileManager;
}
}

4
vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java
View File

@ -99,7 +99,7 @@ public class BitmapTileLayer extends TileLayer {
}
@Override
protected TileLoader createLoader(TileManager tm) {
return new BitmapTileLoader(tm, mTileSource);
protected TileLoader createLoader() {
return new BitmapTileLoader(this.getManager(), mTileSource);
}
}

8
vtm/src/org/oscim/layers/tile/example/TestTileLayer.java
View File

@ -42,13 +42,13 @@ public class TestTileLayer extends TileLayer {
}
@Override
protected TestTileLoader createLoader(TileManager tm) {
return new TestTileLoader(tm);
protected TestTileLoader createLoader() {
return new TestTileLoader(this);
}
static class TestTileLoader extends TileLoader {
public TestTileLoader(TileManager tileManager) {
super(tileManager);
public TestTileLoader(TileLayer tileLayer) {
super(tileLayer.getManager());
}
GeometryBuffer mGeom = new GeometryBuffer(128, 16);

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

@ -3,7 +3,6 @@ package org.oscim.layers.tile.vector;
import org.oscim.core.Tag;
import org.oscim.core.TagSet;
import org.oscim.layers.tile.TileLoader;
import org.oscim.layers.tile.TileManager;
import org.oscim.map.Map;
public class OsmTileLayer extends VectorTileLayer {
@ -17,15 +16,15 @@ public class OsmTileLayer extends VectorTileLayer {
}
@Override
protected TileLoader createLoader(TileManager tm) {
return new OsmTileLoader(tm);
protected TileLoader createLoader() {
return new OsmTileLoader(this);
}
static class OsmTileLoader extends VectorTileLoader {
private final TagSet mFilteredTags;
public OsmTileLoader(TileManager tileManager) {
super(tileManager);
public OsmTileLoader(VectorTileLayer tileLayer) {
super(tileLayer);
mFilteredTags = new TagSet();
}

6
vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java
View File

@ -58,8 +58,8 @@ public class VectorTileLayer extends TileLayer {
}
@Override
protected TileLoader createLoader(TileManager tm) {
return new VectorTileLoader(tm);
protected TileLoader createLoader() {
return new VectorTileLoader(this);
}
/**
@ -112,7 +112,5 @@ public class VectorTileLayer extends TileLayer {
resumeLoaders();
}
public TileManager getManager() {
return mTileManager;
}
}

13
vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java
View File

@ -20,7 +20,6 @@ import static org.oscim.layers.tile.MapTile.State.CANCEL;
import java.util.concurrent.CancellationException;
import org.oscim.backend.canvas.Bitmap;
import org.oscim.core.GeometryBuffer.GeometryType;
import org.oscim.core.MapElement;
import org.oscim.core.MercatorProjection;
@ -29,7 +28,6 @@ import org.oscim.core.Tag;
import org.oscim.core.TagSet;
import org.oscim.layers.tile.MapTile;
import org.oscim.layers.tile.TileLoader;
import org.oscim.layers.tile.TileManager;
import org.oscim.renderer.elements.ElementLayers;
import org.oscim.renderer.elements.ExtrusionLayer;
import org.oscim.renderer.elements.LineLayer;
@ -83,9 +81,11 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
renderTheme = theme;
renderLevels = theme.getLevels();
}
private final VectorTileLayer mTileLayer;
public VectorTileLoader(TileManager tileManager) {
super(tileManager);
public VectorTileLoader(VectorTileLayer tileLayer) {
super(tileLayer.getManager());
mTileLayer = tileLayer;
}
@Override
@ -397,9 +397,4 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
l.add(mElement, height, minHeight);
}
@Override
public void setTileImage(Bitmap bitmap) {
}
}