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

remove TileSource from GdxMap constructor

Browse Source
This commit is contained in:
Hannes Janetzek
2013-08-04 14:32:39 +02:00
parent b433ca6dff
commit f82ee186d0
4 changed files with 94 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
vtm-gdx-html/src/org/oscim/gdx/client/GwtLauncher.java
View File

@@ -37,16 +37,7 @@ public class GwtLauncher extends GwtApplication {
else
Tile.SIZE = 360;
String url = getMapConfig("tileurl");
TileSource tileSource;
if ("oscimap4".equals(getMapConfig("tilesource")))
tileSource = new OSciMap4TileSource();
else
tileSource = new OSciMap2TileSource();
tileSource.setOption("url", url);
return new GwtGdxMap(tileSource);
return new GwtGdxMap();
}
private static native String getMapConfig(String key)/*-{
@@ -55,10 +46,6 @@ public class GwtLauncher extends GwtApplication {
class GwtGdxMap extends GdxMap {
public GwtGdxMap(TileSource tileSource) {
super(tileSource);
}
@Override
public void create() {
CanvasAdapter.g = GwtCanvasAdapter.INSTANCE;
@@ -78,6 +65,17 @@ public class GwtLauncher extends GwtApplication {
p.setZoomLevel(zoom);
p.setPosition(lat, lon);
mMapView.setMapPosition(p);
String url = getMapConfig("tileurl");
TileSource tileSource;
if ("oscimap4".equals(getMapConfig("tilesource")))
tileSource = new OSciMap4TileSource();
else
tileSource = new OSciMap2TileSource();
tileSource.setOption("url", url);
mMapView.setBaseMap(tileSource);
}
}
}