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

remove zoomMin/zoomMax from TileManager constructor

Browse Source
This commit is contained in:
Hannes Janetzek 2014-11-03 01:36:03 +01:00
parent 4c78f8652b
commit a85b435fb6
7 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtm-playground/src/org/oscim/test/TileRenderTest.java
View File

@ -70,7 +70,7 @@ public class TileRenderTest extends GdxMapApp {
tileManager = new TestTileManager(mMap, tiles); tileManager = new TestTileManager(mMap, tiles);
} else { } else {
/* create TileManager and calculate tiles for current position */ /* create TileManager and calculate tiles for current position */
tileManager = new TileManager(mMap, 0, 32, 100); tileManager = new TileManager(mMap, 100);
} }
/* get the loader created by VectorTileLayer ... */ /* get the loader created by VectorTileLayer ... */
@ -180,7 +180,7 @@ public class TileRenderTest extends GdxMapApp {
TileSet fixedTiles; TileSet fixedTiles;
public TestTileManager(Map map, TileSet fixedTiles) { public TestTileManager(Map map, TileSet fixedTiles) {
super(map, 0, 30, 100); super(map, 100);
this.fixedTiles = fixedTiles; this.fixedTiles = fixedTiles;
} }

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

@ -134,10 +134,10 @@ public class TileManager {
void onTileManagerEvent(Event event, MapTile tile); void onTileManagerEvent(Event event, MapTile tile);
}; };
public TileManager(Map map, int minZoom, int maxZoom, int cacheLimit) { public TileManager(Map map, int cacheLimit) {
mMap = map; mMap = map;
mMaxZoom = maxZoom; mMaxZoom = 20;
mMinZoom = minZoom; mMinZoom = 0;
mCacheLimit = cacheLimit; mCacheLimit = cacheLimit;
mCacheReduce = 0; mCacheReduce = 0;

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

@ -55,12 +55,12 @@ public class BitmapTileLayer extends TileLayer {
public BitmapTileLayer(Map map, TileSource tileSource, int cacheLimit) { public BitmapTileLayer(Map map, TileSource tileSource, int cacheLimit) {
super(map, super(map,
new TileManager(map, new TileManager(map, cacheLimit),
tileSource.getZoomLevelMin(),
tileSource.getZoomLevelMax(),
cacheLimit),
new VectorTileRenderer()); new VectorTileRenderer());
mTileManager.setZoomLevel(tileSource.getZoomLevelMin(),
tileSource.getZoomLevelMax());
mTileSource = tileSource; mTileSource = tileSource;
initLoader(getNumLoaders()); initLoader(getNumLoaders());
} }

3
vtm/src/org/oscim/layers/tile/buildings/S3DBLayer.java
View File

@ -32,9 +32,10 @@ public class S3DBLayer extends TileLayer {
} }
public S3DBLayer(Map map, TileSource tileSource, boolean fxaa, boolean ssao) { public S3DBLayer(Map map, TileSource tileSource, boolean fxaa, boolean ssao) {
super(map, new TileManager(map, SRC_ZOOM, SRC_ZOOM, MAX_CACHE)); super(map, new TileManager(map, MAX_CACHE));
setRenderer(new S3DBRenderer(fxaa, ssao)); setRenderer(new S3DBRenderer(fxaa, ssao));
mTileManager.setZoomLevel(SRC_ZOOM, SRC_ZOOM);
mTileSource = tileSource; mTileSource = tileSource;
initLoader(2); initLoader(2);
} }

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

@ -37,7 +37,7 @@ public class TestTileLayer extends TileLayer {
public TestTileLayer(Map map) { public TestTileLayer(Map map) {
super(map, super(map,
new TileManager(map, 0, 20, 10), new TileManager(map, 10),
new VectorTileRenderer()); new VectorTileRenderer());
} }

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

@ -12,7 +12,8 @@ public class OsmTileLayer extends VectorTileLayer {
protected final static int CACHE_LIMIT = 150; protected final static int CACHE_LIMIT = 150;
public OsmTileLayer(Map map) { public OsmTileLayer(Map map) {
super(map, MIN_ZOOMLEVEL, MAX_ZOOMLEVEL, CACHE_LIMIT); super(map, CACHE_LIMIT);
mTileManager.setZoomLevel(MIN_ZOOMLEVEL, MAX_ZOOMLEVEL);
} }
@Override @Override

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

@ -45,16 +45,14 @@ public class VectorTileLayer extends TileLayer {
public VectorTileLayer(Map map, TileSource tileSource) { public VectorTileLayer(Map map, TileSource tileSource) {
this(map, new TileManager(map, this(map, new TileManager(map,
tileSource.getZoomLevelMin(),
tileSource.getZoomLevelMax(),
100), 100),
new VectorTileRenderer()); new VectorTileRenderer());
setTileSource(tileSource); setTileSource(tileSource);
} }
public VectorTileLayer(Map map, int minZoom, int maxZoom, int cacheLimit) { public VectorTileLayer(Map map, int cacheLimit) {
this(map, new TileManager(map, minZoom, maxZoom, cacheLimit), this(map, new TileManager(map, cacheLimit),
new VectorTileRenderer()); new VectorTileRenderer());
} }
@ -78,7 +76,9 @@ public class VectorTileLayer extends TileLayer {
public boolean setTileSource(TileSource tileSource) { public boolean setTileSource(TileSource tileSource) {
pauseLoaders(true); pauseLoaders(true);
mTileManager.clearJobs(); mTileManager.clearJobs();
mTileManager.setZoomLevel(tileSource.getZoomLevelMin(), tileSource.getZoomLevelMax()); mTileManager.setZoomLevel(tileSource.getZoomLevelMin(),
tileSource.getZoomLevelMax());
if (mTileSource != null) { if (mTileSource != null) {
mTileSource.close(); mTileSource.close();
mTileSource = null; mTileSource = null;