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

simplify UrlTileDataSource initialization

Browse Source
This commit is contained in:
Hannes Janetzek
2014-01-21 00:47:57 +01:00
parent 94011804be
commit 6e543303c6
11 changed files with 91 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vtm-gdx-html/src/org/oscim/gdx/client/GwtGdxMap.java
View File

@@ -19,8 +19,6 @@ package org.oscim.gdx.client;
import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.GL20;
import org.oscim.backend.GLAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.oscim.core.MapPosition;
import org.oscim.core.MercatorProjection;
import org.oscim.gdx.GdxMap;
@@ -30,6 +28,8 @@ import org.oscim.renderer.MapRenderer;
import org.oscim.tiling.source.TileSource;
import org.oscim.tiling.source.oscimap2.OSciMap2TileSource;
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.backends.gwt.GwtApplication;
@@ -108,12 +108,10 @@ class GwtGdxMap extends GdxMap {
TileSource tileSource;
if ("oscimap4".equals(sourceName))
tileSource = new OSciMap4TileSource();
tileSource = new OSciMap4TileSource(url);
else
//if ("oscimap2".equals(source))
tileSource = new OSciMap2TileSource();
tileSource.setOption("url", url);
tileSource = new OSciMap2TileSource(url);
initDefaultLayers(tileSource, false, true, true);

13
vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/common/UrlTileDataSource.java
View File

@@ -18,25 +18,22 @@ import java.io.IOException;
import java.io.InputStream;
import org.oscim.tiling.MapTile;
import org.oscim.tiling.source.ITileCache;
import org.oscim.tiling.source.ITileDataSink;
import org.oscim.tiling.source.ITileDataSource;
import org.oscim.tiling.source.ITileDecoder;
import org.oscim.tiling.source.TileSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
*
*
*/
public abstract class UrlTileDataSource implements ITileDataSource {
public class UrlTileDataSource implements ITileDataSource {
static final Logger log = LoggerFactory.getLogger(UrlTileDataSource.class);
protected LwHttp mConn;
protected final LwHttp mConn;
protected final ITileDecoder mTileDecoder;
public UrlTileDataSource(ITileDecoder tileDecoder, ITileCache cache) {
public UrlTileDataSource(TileSource tileSource, ITileDecoder tileDecoder, LwHttp conn) {
mTileDecoder = tileDecoder;
mConn = conn;
}
private ITileDataSink mSink;