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

extract ThemeLoader from MapTileLayer

Browse Source
This commit is contained in:
Hannes Janetzek
2013-07-23 21:39:40 +02:00
parent e29c36d6e7
commit 5e9b517f50
5 changed files with 153 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
vtm-gdx/src/org/oscim/gdx/GdxMap.java
View File

@@ -10,6 +10,7 @@ import org.oscim.layers.tile.vector.MapTileLayer;
import org.oscim.renderer.GLRenderer;
import org.oscim.renderer.GLState;
import org.oscim.theme.InternalRenderTheme;
import org.oscim.theme.ThemeLoader;
import org.oscim.tilesource.TileSource;
import org.oscim.view.MapRenderCallback;
import org.oscim.view.MapView;
@@ -69,7 +70,7 @@ public class GdxMap implements ApplicationListener, MapRenderCallback {
// TileSource tileSource = new TestTileSource();
mMapLayer = mMapView.setBaseMap(mTileSource);
mMapLayer.setRenderTheme(InternalRenderTheme.DEFAULT);
mMapView.setTheme(InternalRenderTheme.DEFAULT);
mMapView.getLayerManager().add(new BuildingOverlay(mMapView, mMapLayer.getTileLayer()));
mMapView.getLayerManager().add(new LabelLayer(mMapView, mMapLayer.getTileLayer()));
@@ -87,8 +88,9 @@ public class GdxMap implements ApplicationListener, MapRenderCallback {
mMapView.getMapViewPosition().setViewport(w, h);
MapPosition p = new MapPosition();
p.setZoomLevel(17);
p.setPosition(53.08, 8.83);
p.setZoomLevel(3);
//p.setPosition(53.08, 8.83);
p.setPosition(0.0, 0.0);
mMapView.setMapPosition(p);
mMapRenderer.onSurfaceCreated();
@@ -264,18 +266,18 @@ public class GdxMap implements ApplicationListener, MapRenderCallback {
mMapView.updateMap(true);
break;
case Input.Keys.R:
mMapLayer.reloadTheme();
mMapView.updateMap(false);
break;
// case Input.Keys.R:
// mMapLayer.reloadTheme();
// mMapView.updateMap(false);
// break;
case Input.Keys.D:
mMapLayer.setRenderTheme(InternalRenderTheme.DEFAULT);
mMapView.setTheme(InternalRenderTheme.DEFAULT);
mMapView.updateMap(false);
break;
case Input.Keys.T:
mMapLayer.setRenderTheme(InternalRenderTheme.TRONRENDER);
mMapView.setTheme(InternalRenderTheme.TRONRENDER);
mMapView.updateMap(false);
break;