diff --git a/vtm-extras/src/org/oscim/tiling/source/mapnik/MapnikVectorTileSource.java b/vtm-extras/src/org/oscim/tiling/source/mapnik/MapnikVectorTileSource.java index 0611e38b..abb551ad 100644 --- a/vtm-extras/src/org/oscim/tiling/source/mapnik/MapnikVectorTileSource.java +++ b/vtm-extras/src/org/oscim/tiling/source/mapnik/MapnikVectorTileSource.java @@ -30,10 +30,10 @@ public class MapnikVectorTileSource extends UrlTileSource { @Override public ITileDataSource getDataSource() { - return new UrlTileDataSource(this, new TileDecoder(), new LwHttp(mUrl)); + return new UrlTileDataSource(this, new TileDecoder(), new LwHttp(getUrl())); } - protected int formatTilePath(Tile tile, byte[] path, int pos) { + public int formatTilePath(Tile tile, byte[] path, int pos) { // url formatter for mapbox streets byte[] hexTable = { '0', '1', '2', '3', diff --git a/vtm-extras/src/org/oscim/tiling/source/oscimap/OSciMap1TileSource.java b/vtm-extras/src/org/oscim/tiling/source/oscimap/OSciMap1TileSource.java index d6934fa4..50ae2b26 100644 --- a/vtm-extras/src/org/oscim/tiling/source/oscimap/OSciMap1TileSource.java +++ b/vtm-extras/src/org/oscim/tiling/source/oscimap/OSciMap1TileSource.java @@ -35,6 +35,6 @@ public class OSciMap1TileSource extends UrlTileSource { @Override public ITileDataSource getDataSource() { - return new UrlTileDataSource(this, new TileDecoder(), new LwHttp(mUrl)); + return new UrlTileDataSource(this, new TileDecoder(), new LwHttp(getUrl())); } } diff --git a/vtm-extras/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java b/vtm-extras/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java index 6df01661..77f881e2 100644 --- a/vtm-extras/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java +++ b/vtm-extras/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java @@ -44,7 +44,7 @@ public class OSciMap2TileSource extends UrlTileSource { @Override public ITileDataSource getDataSource() { - return new UrlTileDataSource(this, new TileDecoder(), new LwHttp(mUrl)); + return new UrlTileDataSource(this, new TileDecoder(), new LwHttp(getUrl())); } static class TileDecoder extends PbfDecoder { diff --git a/vtm/src/org/oscim/tiling/source/UrlTileSource.java b/vtm/src/org/oscim/tiling/source/UrlTileSource.java index ecf61dd9..89515d14 100644 --- a/vtm/src/org/oscim/tiling/source/UrlTileSource.java +++ b/vtm/src/org/oscim/tiling/source/UrlTileSource.java @@ -24,7 +24,7 @@ import org.oscim.tiling.TileSource; public abstract class UrlTileSource extends TileSource { - protected final URL mUrl; + private final URL mUrl; private byte[] mExt; public UrlTileSource(String urlString) { @@ -83,7 +83,7 @@ public abstract class UrlTileSource extends TileSource { * @param pos current position * @return new position */ - protected int formatTilePath(Tile tile, byte[] buf, int pos) { + public int formatTilePath(Tile tile, byte[] buf, int pos) { String p = getTileUrl(tile); if (p != null) { byte[] b = p.getBytes(); @@ -103,4 +103,8 @@ public abstract class UrlTileSource extends TileSource { System.arraycopy(mExt, 0, buf, pos, mExt.length); return pos + mExt.length; } + + public URL getUrl() { + return mUrl; + } } diff --git a/vtm/src/org/oscim/tiling/source/bitmap/BitmapTileSource.java b/vtm/src/org/oscim/tiling/source/bitmap/BitmapTileSource.java index f5d65f61..86ffb540 100644 --- a/vtm/src/org/oscim/tiling/source/bitmap/BitmapTileSource.java +++ b/vtm/src/org/oscim/tiling/source/bitmap/BitmapTileSource.java @@ -32,7 +32,7 @@ public abstract class BitmapTileSource extends UrlTileSource { @Override public ITileDataSource getDataSource() { - return new UrlTileDataSource(this, new BitmapTileDecoder(), new LwHttp(mUrl)); + return new UrlTileDataSource(this, new BitmapTileDecoder(), new LwHttp(getUrl())); } public class BitmapTileDecoder implements ITileDecoder { diff --git a/vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java b/vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java index 2cea4fb2..b5dbc5a8 100644 --- a/vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java +++ b/vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java @@ -34,6 +34,6 @@ public class OSciMap4TileSource extends UrlTileSource { @Override public ITileDataSource getDataSource() { - return new UrlTileDataSource(this, new TileDecoder(), new LwHttp(mUrl)); + return new UrlTileDataSource(this, new TileDecoder(), new LwHttp(getUrl())); } }