diff --git a/vtm-jeo/src/org/oscim/layers/JeoTileLayer.java b/vtm-jeo/src/org/oscim/layers/JeoTileLayer.java index 31831d16..e436b8b1 100644 --- a/vtm-jeo/src/org/oscim/layers/JeoTileLayer.java +++ b/vtm-jeo/src/org/oscim/layers/JeoTileLayer.java @@ -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() { diff --git a/vtm/src/org/oscim/layers/tile/TileLayer.java b/vtm/src/org/oscim/layers/tile/TileLayer.java index 45967568..4dfa8299 100644 --- a/vtm/src/org/oscim/layers/tile/TileLayer.java +++ b/vtm/src/org/oscim/layers/tile/TileLayer.java @@ -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; + } } diff --git a/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java b/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java index 39468cbe..c6daf19d 100644 --- a/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java +++ b/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java @@ -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); } } diff --git a/vtm/src/org/oscim/layers/tile/example/TestTileLayer.java b/vtm/src/org/oscim/layers/tile/example/TestTileLayer.java index 154bc7da..336f3f03 100644 --- a/vtm/src/org/oscim/layers/tile/example/TestTileLayer.java +++ b/vtm/src/org/oscim/layers/tile/example/TestTileLayer.java @@ -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); diff --git a/vtm/src/org/oscim/layers/tile/vector/OsmTileLayer.java b/vtm/src/org/oscim/layers/tile/vector/OsmTileLayer.java index 2fccb955..e65761bc 100644 --- a/vtm/src/org/oscim/layers/tile/vector/OsmTileLayer.java +++ b/vtm/src/org/oscim/layers/tile/vector/OsmTileLayer.java @@ -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(); } diff --git a/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java b/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java index c3f1bf13..7eaa08f6 100644 --- a/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java +++ b/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java @@ -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; } } diff --git a/vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java b/vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java index 372a329c..957cd00c 100644 --- a/vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java +++ b/vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java @@ -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) { - - } }