diff --git a/vtm-android-example/res/menu/theme_menu.xml b/vtm-android-example/res/menu/theme_menu.xml index 91d58b89..02ff295b 100644 --- a/vtm-android-example/res/menu/theme_menu.xml +++ b/vtm-android-example/res/menu/theme_menu.xml @@ -4,7 +4,6 @@ - - - + + diff --git a/vtm-android-example/res/values/strings.xml b/vtm-android-example/res/values/strings.xml index b2b21f51..fdd1f739 100644 --- a/vtm-android-example/res/values/strings.xml +++ b/vtm-android-example/res/values/strings.xml @@ -6,6 +6,7 @@ Default Tubes Osmarender + NewTron OK Cancel Error diff --git a/vtm-android-example/src/org/oscim/android/test/SimpleMapActivity.java b/vtm-android-example/src/org/oscim/android/test/SimpleMapActivity.java index b1e53520..acdc0938 100644 --- a/vtm-android-example/src/org/oscim/android/test/SimpleMapActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/SimpleMapActivity.java @@ -68,6 +68,11 @@ public class SimpleMapActivity extends BaseMapActivity { mMap.setTheme(VtmThemes.OSMARENDER); item.setChecked(true); return true; + + case R.id.theme_newtron: + mMap.setTheme(VtmThemes.NEWTRON); + item.setChecked(true); + return true; } return false; diff --git a/vtm-gdx-ios/src/org/oscim/ios/RobovmLauncher.java b/vtm-gdx-ios/src/org/oscim/ios/RobovmLauncher.java index 7e436d2f..df7feb9c 100644 --- a/vtm-gdx-ios/src/org/oscim/ios/RobovmLauncher.java +++ b/vtm-gdx-ios/src/org/oscim/ios/RobovmLauncher.java @@ -26,19 +26,17 @@ public class RobovmLauncher extends IOSApplication.Delegate { config.orientationPortrait = true; config.stencilFormat = GLKViewDrawableStencilFormat.Format8; - - return new IOSApplication(new GdxMap() { @Override public void createLayers() { TileSource tileSource = new OSciMap4TileSource(); - //initDefaultLayers(tileSource, false,true, false); - VectorTileLayer l = mMap.setBaseMap(tileSource); + //initDefaultLayers(tileSource, false,true, false); + VectorTileLayer l = mMap.setBaseMap(tileSource); mMap.setTheme(VtmThemes.NEWTRON); mMap.layers().add(new BuildingLayer(mMap, l)); mMap.layers().add(new LabelLayer(mMap, l)); - + // mMap.getLayers().add(new GenericLayer(mMap, new // GridRenderer(1,new Line(Color.LTGRAY, 1.2f),null))); @@ -54,7 +52,7 @@ public class RobovmLauncher extends IOSApplication.Delegate { System.setProperty(org.slf4j.impl.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "TRACE"); CanvasAdapter.g = IosGraphics.get(); GLAdapter.g = new IosGLAdapter(); - + UIApplication.main(argv, null, RobovmLauncher.class); pool.drain(); } diff --git a/vtm-themes/src/org/oscim/theme/VtmThemes.java b/vtm-themes/src/org/oscim/theme/VtmThemes.java index 4c9b80bf..325376b6 100644 --- a/vtm-themes/src/org/oscim/theme/VtmThemes.java +++ b/vtm-themes/src/org/oscim/theme/VtmThemes.java @@ -40,6 +40,5 @@ public enum VtmThemes implements ThemeFile { @Override public InputStream getRenderThemeAsStream() { return AssetAdapter.g.openFileAsStream(mPath); - //InternalRenderTheme.class.getResourceAsStream(mPath); } }