From 02706d40ef74d88b1fd8d39add1532ebfae871e2 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Sat, 30 Nov 2013 20:51:58 +0100
Subject: [PATCH] fix vtm-gdx-android build
---
vtm-gdx-android/.project | 5 +++++
.../src/org/oscim/gdx/MainActivity.java | 14 +++-----------
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/vtm-gdx-android/.project b/vtm-gdx-android/.project
index 3ac31c7c..c8d310fd 100644
--- a/vtm-gdx-android/.project
+++ b/vtm-gdx-android/.project
@@ -36,5 +36,10 @@
<type>2</type>
<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/vtm/assets</locationURI>
</link>
+ <link>
+ <name>libs</name>
+ <type>2</type>
+ <locationURI>$%7BPARENT-1-PROJECT_LOC%7D/vtm-ext-libs/vtm-gdx-android</locationURI>
+ </link>
</linkedResources>
</projectDescription>
diff --git a/vtm-gdx-android/src/org/oscim/gdx/MainActivity.java b/vtm-gdx-android/src/org/oscim/gdx/MainActivity.java
index d65c88de..6a0c8efc 100644
--- a/vtm-gdx-android/src/org/oscim/gdx/MainActivity.java
+++ b/vtm-gdx-android/src/org/oscim/gdx/MainActivity.java
@@ -1,14 +1,12 @@
package org.oscim.gdx;
-import org.oscim.android.AndroidLog;
import org.oscim.android.canvas.AndroidGraphics;
import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.GL20;
import org.oscim.backend.GLAdapter;
-import org.oscim.backend.Log;
import org.oscim.core.Tile;
import org.oscim.tiling.source.TileSource;
-import org.oscim.tiling.source.oscimap2.OSciMap2TileSource;
+import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
import android.os.Bundle;
@@ -26,10 +24,8 @@ public class MainActivity extends AndroidApplication {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- // set globals
CanvasAdapter.g = AndroidGraphics.INSTANCE;
GLAdapter.g = new AndroidGLAdapter();
- Log.logger = new AndroidLog();
// TODO make this dpi dependent
Tile.SIZE = 400;
@@ -43,15 +39,11 @@ public class MainActivity extends AndroidApplication {
}
class GdxMapAndroid extends GdxMap {
-
@Override
public void createLayers() {
- //TileSource ts = new OSciMap4TileSource();
- //ts.setOption("url", "http://opensciencemap.org/tiles/vtm");
-
- TileSource ts = new OSciMap2TileSource();
- ts.setOption("url", "http://opensciencemap.org/osci/map-live");
+ TileSource ts = new OSciMap4TileSource();
+ ts.setOption("url", "http://opensciencemap.org/tiles/vtm");
initDefaultLayers(ts, true, true, true);
}