From a85b435fb6f88138271f16e0911deed363818a7f Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Mon, 3 Nov 2014 01:36:03 +0100
Subject: [PATCH] remove zoomMin/zoomMax from TileManager constructor
---
vtm-playground/src/org/oscim/test/TileRenderTest.java | 4 ++--
vtm/src/org/oscim/layers/tile/TileManager.java | 6 +++---
.../org/oscim/layers/tile/bitmap/BitmapTileLayer.java | 8 ++++----
vtm/src/org/oscim/layers/tile/buildings/S3DBLayer.java | 3 ++-
.../org/oscim/layers/tile/example/TestTileLayer.java | 2 +-
vtm/src/org/oscim/layers/tile/vector/OsmTileLayer.java | 3 ++-
.../org/oscim/layers/tile/vector/VectorTileLayer.java | 10 +++++-----
7 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/vtm-playground/src/org/oscim/test/TileRenderTest.java b/vtm-playground/src/org/oscim/test/TileRenderTest.java
index 7d61304a..dbfb1ee0 100644
--- a/vtm-playground/src/org/oscim/test/TileRenderTest.java
+++ b/vtm-playground/src/org/oscim/test/TileRenderTest.java
@@ -70,7 +70,7 @@ public class TileRenderTest extends GdxMapApp {
tileManager = new TestTileManager(mMap, tiles);
} else {
/* 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 ... */
@@ -180,7 +180,7 @@ public class TileRenderTest extends GdxMapApp {
TileSet fixedTiles;
public TestTileManager(Map map, TileSet fixedTiles) {
- super(map, 0, 30, 100);
+ super(map, 100);
this.fixedTiles = fixedTiles;
}
diff --git a/vtm/src/org/oscim/layers/tile/TileManager.java b/vtm/src/org/oscim/layers/tile/TileManager.java
index 490ed530..7bb13414 100644
--- a/vtm/src/org/oscim/layers/tile/TileManager.java
+++ b/vtm/src/org/oscim/layers/tile/TileManager.java
@@ -134,10 +134,10 @@ public class TileManager {
void onTileManagerEvent(Event event, MapTile tile);
};
- public TileManager(Map map, int minZoom, int maxZoom, int cacheLimit) {
+ public TileManager(Map map, int cacheLimit) {
mMap = map;
- mMaxZoom = maxZoom;
- mMinZoom = minZoom;
+ mMaxZoom = 20;
+ mMinZoom = 0;
mCacheLimit = cacheLimit;
mCacheReduce = 0;
diff --git a/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java b/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java
index db9ac80b..1989f51a 100644
--- a/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java
+++ b/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java
@@ -55,12 +55,12 @@ public class BitmapTileLayer extends TileLayer {
public BitmapTileLayer(Map map, TileSource tileSource, int cacheLimit) {
super(map,
- new TileManager(map,
- tileSource.getZoomLevelMin(),
- tileSource.getZoomLevelMax(),
- cacheLimit),
+ new TileManager(map, cacheLimit),
new VectorTileRenderer());
+ mTileManager.setZoomLevel(tileSource.getZoomLevelMin(),
+ tileSource.getZoomLevelMax());
+
mTileSource = tileSource;
initLoader(getNumLoaders());
}
diff --git a/vtm/src/org/oscim/layers/tile/buildings/S3DBLayer.java b/vtm/src/org/oscim/layers/tile/buildings/S3DBLayer.java
index 3cac6c7c..1bdfa888 100644
--- a/vtm/src/org/oscim/layers/tile/buildings/S3DBLayer.java
+++ b/vtm/src/org/oscim/layers/tile/buildings/S3DBLayer.java
@@ -32,9 +32,10 @@ public class S3DBLayer extends TileLayer {
}
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));
+ mTileManager.setZoomLevel(SRC_ZOOM, SRC_ZOOM);
mTileSource = tileSource;
initLoader(2);
}
diff --git a/vtm/src/org/oscim/layers/tile/example/TestTileLayer.java b/vtm/src/org/oscim/layers/tile/example/TestTileLayer.java
index 02d30c52..ec61c30c 100644
--- a/vtm/src/org/oscim/layers/tile/example/TestTileLayer.java
+++ b/vtm/src/org/oscim/layers/tile/example/TestTileLayer.java
@@ -37,7 +37,7 @@ public class TestTileLayer extends TileLayer {
public TestTileLayer(Map map) {
super(map,
- new TileManager(map, 0, 20, 10),
+ new TileManager(map, 10),
new VectorTileRenderer());
}
diff --git a/vtm/src/org/oscim/layers/tile/vector/OsmTileLayer.java b/vtm/src/org/oscim/layers/tile/vector/OsmTileLayer.java
index e65761bc..3a008e2c 100644
--- a/vtm/src/org/oscim/layers/tile/vector/OsmTileLayer.java
+++ b/vtm/src/org/oscim/layers/tile/vector/OsmTileLayer.java
@@ -12,7 +12,8 @@ public class OsmTileLayer extends VectorTileLayer {
protected final static int CACHE_LIMIT = 150;
public OsmTileLayer(Map map) {
- super(map, MIN_ZOOMLEVEL, MAX_ZOOMLEVEL, CACHE_LIMIT);
+ super(map, CACHE_LIMIT);
+ mTileManager.setZoomLevel(MIN_ZOOMLEVEL, MAX_ZOOMLEVEL);
}
@Override
diff --git a/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java b/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java
index 0f4b6419..47a912bc 100644
--- a/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java
+++ b/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java
@@ -45,16 +45,14 @@ public class VectorTileLayer extends TileLayer {
public VectorTileLayer(Map map, TileSource tileSource) {
this(map, new TileManager(map,
- tileSource.getZoomLevelMin(),
- tileSource.getZoomLevelMax(),
100),
new VectorTileRenderer());
setTileSource(tileSource);
}
- public VectorTileLayer(Map map, int minZoom, int maxZoom, int cacheLimit) {
- this(map, new TileManager(map, minZoom, maxZoom, cacheLimit),
+ public VectorTileLayer(Map map, int cacheLimit) {
+ this(map, new TileManager(map, cacheLimit),
new VectorTileRenderer());
}
@@ -78,7 +76,9 @@ public class VectorTileLayer extends TileLayer {
public boolean setTileSource(TileSource tileSource) {
pauseLoaders(true);
mTileManager.clearJobs();
- mTileManager.setZoomLevel(tileSource.getZoomLevelMin(), tileSource.getZoomLevelMax());
+ mTileManager.setZoomLevel(tileSource.getZoomLevelMin(),
+ tileSource.getZoomLevelMax());
+
if (mTileSource != null) {
mTileSource.close();
mTileSource = null;