remove TileSource from GdxMap constructor

vtm-gdx-android/src/org/oscim/gdx/MainActivity.java

@@ -8,7 +8,7 @@ import org.oscim.backend.GLAdapter;
 import org.oscim.backend.Log;
 import org.oscim.core.Tile;
 import org.oscim.tilesource.TileSource;
-import org.oscim.tilesource.oscimap4.OSciMap4TileSource;
+import org.oscim.tilesource.oscimap2.OSciMap2TileSource;
 
 import android.os.Bundle;
 
@@ -26,10 +26,11 @@ public class MainActivity extends AndroidApplication {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        // set our globals
+        // set globals
         CanvasAdapter.g = AndroidGraphics.INSTANCE;
         GLAdapter.g = new AndroidGLAdapter();
 		Log.logger = new AndroidLog();
+
 		// TODO make this dpi dependent
 		Tile.SIZE = 400;
 
@@ -38,9 +39,22 @@ public class MainActivity extends AndroidApplication {
 
         new SharedLibraryLoader().load("vtm-jni");
 
-        TileSource tileSource = new OSciMap4TileSource();
+        initialize(new GdxMapAndroid(), cfg);
-		tileSource.setOption("url", "http://city.informatik.uni-bremen.de/osci/testing");
-
-        initialize(new GdxMap(tileSource), cfg);
     }
+
+	class GdxMapAndroid extends GdxMap{
+		@Override
+		public void create() {
+		    super.create();
+
+	        //TileSource ts = new OSciMap4TileSource();
+			//ts.setOption("url", "http://city.informatik.uni-bremen.de/osci/testing");
+
+	        TileSource ts = new OSciMap2TileSource();
+			ts.setOption("url", "http://city.informatik.uni-bremen.de/osci/map-live");
+
+		    initDefaultMap(ts, true, true, true);
+		}
+
+	}
 }

vtm-gdx-desktop/src/org/oscim/gdx/Main.java

@@ -4,10 +4,8 @@ import org.oscim.awt.AwtGraphics;
 import org.oscim.backend.CanvasAdapter;
 import org.oscim.backend.GLAdapter;
 import org.oscim.core.Tile;
-import org.oscim.layers.overlay.GenericOverlay;
-import org.oscim.renderer.layers.GridRenderLayer;
 import org.oscim.tilesource.TileSource;
-import org.oscim.tilesource.oscimap2.OSciMap2TileSource;
+import org.oscim.tilesource.oscimap4.OSciMap4TileSource;
 
 import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
 import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
@@ -28,31 +26,29 @@ public class Main {
 		// set our globals
 		CanvasAdapter.g = AwtGraphics.INSTANCE;
 		GLAdapter.g = new GdxGLAdapter();
-		Tile.SIZE = 256;
+		GLAdapter.GDX_DESKTOP_QUIRKS = true;
+
+		Tile.SIZE = 360;
 
 		new SharedLibraryLoader().load("vtm-jni");
 
-		//TileSource tileSource = new OSciMap4TileSource();
+		new LwjglApplication(new GdxMapDesktop(), cfg);
-		//tileSource.setOption("url", "http://city.informatik.uni-bremen.de/osci/testing-nocache");
-
-		TileSource tileSource = new OSciMap2TileSource();
-		tileSource.setOption("url", "http://city.informatik.uni-bremen.de/osci/map-live");
-
-		new LwjglApplication(new GdxMapDesktop(tileSource), cfg);
 	}
 
-	static class GdxMapDesktop extends GdxMap{
+	static class GdxMapDesktop extends GdxMap {
 
-		public GdxMapDesktop(TileSource tileSource) {
+		public GdxMapDesktop() {
-	        super(tileSource);
+			super();
-        }
+		}
 
 		@Override
 		public void create() {
-		    super.create();
+			super.create();
 
-		    //mMapView.getLayerManager().add(new BitmapTileLayer(mMapView, ArcGISWorldShaded.INSTANCE));
+			TileSource tileSource = new OSciMap4TileSource();
-			//mMapView.getLayerManager().add(new GenericOverlay(mMapView, new GridRenderLayer(mMapView)));
+			tileSource.setOption("url", "http://city.informatik.uni-bremen.de/tiles/vtm");
+
+			initDefaultMap(tileSource, false, true, true);
 		}
 	}
 }

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

@@ -37,16 +37,7 @@ public class GwtLauncher extends GwtApplication {
 		else
 			Tile.SIZE = 360;
 
-		String url = getMapConfig("tileurl");
+		return new GwtGdxMap();
-
-		TileSource tileSource;
-		if ("oscimap4".equals(getMapConfig("tilesource")))
-			tileSource = new OSciMap4TileSource();
-		else
-			tileSource = new OSciMap2TileSource();
-
-		tileSource.setOption("url", url);
-		return new GwtGdxMap(tileSource);
 	}
 
 	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);
 		}
 	}
 }

vtm-gdx/src/org/oscim/gdx/GdxMap.java

@@ -6,9 +6,11 @@ import org.oscim.core.MapPosition;
 import org.oscim.core.Tile;
 import org.oscim.layers.labeling.LabelLayer;
 import org.oscim.layers.overlay.BuildingOverlay;
+import org.oscim.layers.overlay.GenericOverlay;
 import org.oscim.layers.tile.vector.MapTileLayer;
 import org.oscim.renderer.GLRenderer;
 import org.oscim.renderer.GLState;
+import org.oscim.renderer.layers.GridRenderLayer;
 import org.oscim.theme.InternalRenderTheme;
 import org.oscim.tilesource.TileSource;
 import org.oscim.view.MapView;
@@ -31,13 +33,11 @@ public class GdxMap implements ApplicationListener {
 
 	protected final MapView mMapView;
 	private final GLRenderer mMapRenderer;
-	private final TileSource mTileSource;
 
 	boolean mRenderRequest;
 
-	public GdxMap(TileSource tileSource) {
+	public GdxMap() {
 		AssetAdapter.g = new GdxAssetAdapter();
-		mTileSource = tileSource;
 
 		mMapView = new MapView() {
 			@Override
@@ -75,11 +75,12 @@ public class GdxMap implements ApplicationListener {
 
 			@Override
 			public boolean postDelayed(final Runnable action, long delay) {
-				Timer.schedule(new Task(){
+				Timer.schedule(new Task() {
 					@Override
 					public void run() {
 						action.run();
-					}}, delay / 1000f);
+					}
+				}, delay / 1000f);
 				return true;
 			}
 		};
@@ -88,10 +89,33 @@ public class GdxMap implements ApplicationListener {
 
 	}
 
+	protected void initDefaultMap(TileSource tileSource, boolean tileGrid, boolean labels,
+			boolean buildings) {
+
+		if (tileSource != null) {
+			mMapLayer = mMapView.setBaseMap(tileSource);
+			mMapView.setTheme(InternalRenderTheme.DEFAULT);
+
+			if (buildings)
+				mMapView.getLayerManager().add(
+						new BuildingOverlay(mMapView, mMapLayer.getTileLayer()));
+
+			if (labels)
+				mMapView.getLayerManager().add(new LabelLayer(mMapView,
+						mMapLayer.getTileLayer()));
+		}
+
+		if (tileGrid)
+			mMapView.getLayerManager().add(new GenericOverlay(mMapView,
+					new GridRenderLayer(mMapView)));
+	}
+
 	// Stage ui;
 	// Label fps;
 	// BitmapFont font;
+
 	MapTileLayer mMapLayer;
+	GenericOverlay mGridLayer;
 
 	int mHeight, mWidth;
 
@@ -108,39 +132,11 @@ public class GdxMap implements ApplicationListener {
 		mWidth = w;
 		mHeight = h;
 
-		if (mTileSource != null) {
-			//TileSource tileSource = new OSciMap2TileSource();
-			//tileSource.setOption("url",
-			//		"http://city.informatik.uni-bremen.de/osci/map-live");
-
-			// TileSource tileSource = new OSciMap4TileSource();
-			// tileSource.setOption("url",
-			// "http://city.informatik.uni-bremen.de/osci/testing");
-
-			// TileSource tileSource = new TestTileSource();
-
-			mMapLayer = mMapView.setBaseMap(mTileSource);
-			mMapView.setTheme(InternalRenderTheme.DEFAULT);
-
-			mMapView.getLayerManager().add(new BuildingOverlay(mMapView, mMapLayer.getTileLayer()));
-			mMapView.getLayerManager().add(new LabelLayer(mMapView, mMapLayer.getTileLayer()));
-
-		}
-
-		//mMapView.setBackgroundMap(new BitmapTileLayer(mMapView,
-		//		ArcGISWorldShaded.INSTANCE));
-
-		//mMapView.setBackgroundMap(new BitmapTileLayer(mMapView,
-		//		OpenStreetMapMapnik.INSTANCE));
-
-		//mMapView.getLayerManager().add(new GenericOverlay(mMapView, new
-		//		GridRenderLayer(mMapView)));
-
 		mMapView.getMapViewPosition().setViewport(w, h);
 		MapPosition p = new MapPosition();
-		p.setZoomLevel(3);
+		p.setZoomLevel(14);
-		//p.setPosition(53.08, 8.83);
+		p.setPosition(53.08, 8.83);
-		p.setPosition(0.0, 0.0);
+		//p.setPosition(0.0, 0.0);
 		mMapView.setMapPosition(p);
 
 		mMapRenderer.onSurfaceCreated();
@@ -168,7 +164,6 @@ public class GdxMap implements ApplicationListener {
 
 	@Override
 	public void render() {
-		// Log.d("yo", )
 		// GLState.enableVertexArrays(-1, -1);
 		// GLState.blend(false);
 		// GLState.test(false, false);
@@ -281,6 +276,22 @@ public class GdxMap implements ApplicationListener {
 					mMapView.updateMap(false);
 					break;
 
+				case Input.Keys.G:
+					if (mGridLayer == null) {
+						mGridLayer = new GenericOverlay(mMapView, new GridRenderLayer(mMapView));
+						mGridLayer.setEnabled(true);
+						mMapView.getLayerManager().add(mGridLayer);
+					} else {
+						if (mGridLayer.isEnabled()) {
+							mGridLayer.setEnabled(false);
+							mMapView.getLayerManager().remove(mGridLayer);
+						} else {
+							mGridLayer.setEnabled(true);
+							mMapView.getLayerManager().add(mGridLayer);
+						}
+					}
+					mMapView.render();
+					break;
 			}
 			return true;
 		}