From c16ffef0bd678fa056aa7bc0995fe10cb4d13383 Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Tue, 3 Dec 2013 19:53:42 +0100 Subject: [PATCH] add cacheLimit parameter to TileLayer constructor --- .../org/oscim/layers/tile/bitmap/BitmapTileLayer.java | 8 +++++++- .../org/oscim/layers/tile/bitmap/BitmapTileLayer.java | 11 ++++++++--- .../org/oscim/layers/tile/vector/VectorTileLayer.java | 4 ++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/bitmap/BitmapTileLayer.java b/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/bitmap/BitmapTileLayer.java index 3593e4ed..28fd800d 100644 --- a/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/bitmap/BitmapTileLayer.java +++ b/vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/bitmap/BitmapTileLayer.java @@ -39,11 +39,17 @@ import com.google.gwt.user.client.ui.RootPanel; public class BitmapTileLayer extends TileLayer { + private final static int CACHE_LIMIT = 50; + final TileSource mTileSource; private final FadeStep[] mFade; public BitmapTileLayer(Map map, TileSource tileSource) { - super(map, tileSource.getZoomLevelMin(), tileSource.getZoomLevelMax(), 100); + this(map, tileSource, CACHE_LIMIT); + } + + public BitmapTileLayer(Map map, TileSource tileSource, int cacheLimit) { + super(map, tileSource.getZoomLevelMin(), tileSource.getZoomLevelMax(), cacheLimit); mTileSource = tileSource; mFade = mTileSource.getFadeSteps(); } diff --git a/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java b/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java index 42e8d196..399700f3 100644 --- a/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java +++ b/vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java @@ -40,6 +40,8 @@ public class BitmapTileLayer extends TileLayer { protected static final Logger log = LoggerFactory.getLogger(BitmapTileLayer.class); + private final static int CACHE_LIMIT = 50; + private static final int TIMEOUT_CONNECT = 5000; private static final int TIMEOUT_READ = 10000; @@ -47,10 +49,13 @@ public class BitmapTileLayer extends TileLayer { private final FadeStep[] mFade; public BitmapTileLayer(Map map, TileSource tileSource) { - super(map, tileSource.getZoomLevelMin(), tileSource.getZoomLevelMax(), 100); + this(map, tileSource, CACHE_LIMIT); + } + + public BitmapTileLayer(Map map, TileSource tileSource, int cacheLimit) { + super(map, tileSource.getZoomLevelMin(), tileSource.getZoomLevelMax(), cacheLimit); mTileSource = tileSource; mFade = mTileSource.getFadeSteps(); - } @Override @@ -105,7 +110,7 @@ public class BitmapTileLayer extends TileLayer { return false; } - return false; + return true; } @Override diff --git a/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java b/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java index 86da77d6..1ad962e4 100644 --- a/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java +++ b/vtm/src/org/oscim/layers/tile/vector/VectorTileLayer.java @@ -39,6 +39,10 @@ public class VectorTileLayer extends TileLayer { super(map); } + public VectorTileLayer(Map map, int minZoom, int maxZoom, int cacheLimit) { + super(map, minZoom, maxZoom, cacheLimit); + } + @Override protected VectorTileLoader createLoader(TileManager tm) { return new VectorTileLoader(tm);