From aea7cf2a5f434abca0f9ab7b36a4af6fe607ea18 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Thu, 4 Jul 2013 06:59:16 +0200
Subject: [PATCH] desktop: use oscimap2

---
 vtm-gdx-desktop/src/org/oscim/gdx/Main.java | 28 ++++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/vtm-gdx-desktop/src/org/oscim/gdx/Main.java b/vtm-gdx-desktop/src/org/oscim/gdx/Main.java
index 237f148c..98a6fc0b 100644
--- a/vtm-gdx-desktop/src/org/oscim/gdx/Main.java
+++ b/vtm-gdx-desktop/src/org/oscim/gdx/Main.java
@@ -4,8 +4,10 @@ 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.oscimap4.OSciMap4TileSource;
+import org.oscim.tilesource.oscimap2.OSciMap2TileSource;
 
 import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
 import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
@@ -30,9 +32,27 @@ public class Main {
 
 		new SharedLibraryLoader().load("vtm-jni");
 
-		TileSource tileSource = new OSciMap4TileSource();
-		tileSource.setOption("url", "http://city.informatik.uni-bremen.de/osci/testing");
+		//TileSource tileSource = new OSciMap4TileSource();
+		//tileSource.setOption("url", "http://city.informatik.uni-bremen.de/osci/testing-nocache");
 
-		new LwjglApplication(new GdxMap(tileSource), cfg);
+		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{
+
+		public GdxMapDesktop(TileSource tileSource) {
+	        super(tileSource);
+        }
+
+		@Override
+		public void create() {
+		    super.create();
+
+		    //mMapView.getLayerManager().add(new BitmapTileLayer(mMapView, ArcGISWorldShaded.INSTANCE));
+			//mMapView.getLayerManager().add(new GenericOverlay(mMapView, new GridRenderLayer(mMapView)));
+		}
 	}
 }