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

fix vtm-gdx-android build

Browse Source
This commit is contained in:
Hannes Janetzek 2013-11-30 20:51:58 +01:00
parent 294d50c50c
commit 02706d40ef
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vtm-gdx-android/.project
View File

@ -36,5 +36,10 @@
<type>2</type> <type>2</type>
<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/vtm/assets</locationURI> <locationURI>$%7BPARENT-1-PROJECT_LOC%7D/vtm/assets</locationURI>
</link> </link>
<link>
<name>libs</name>
<type>2</type>
<locationURI>$%7BPARENT-1-PROJECT_LOC%7D/vtm-ext-libs/vtm-gdx-android</locationURI>
</link>
</linkedResources> </linkedResources>
</projectDescription> </projectDescription>

14
vtm-gdx-android/src/org/oscim/gdx/MainActivity.java
View File

@ -1,14 +1,12 @@
package org.oscim.gdx; package org.oscim.gdx;
import org.oscim.android.AndroidLog;
import org.oscim.android.canvas.AndroidGraphics; import org.oscim.android.canvas.AndroidGraphics;
import org.oscim.backend.CanvasAdapter; import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.GL20; import org.oscim.backend.GL20;
import org.oscim.backend.GLAdapter; import org.oscim.backend.GLAdapter;
import org.oscim.backend.Log;
import org.oscim.core.Tile; import org.oscim.core.Tile;
import org.oscim.tiling.source.TileSource; import org.oscim.tiling.source.TileSource;
import org.oscim.tiling.source.oscimap2.OSciMap2TileSource; import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
import android.os.Bundle; import android.os.Bundle;
@ -26,10 +24,8 @@ public class MainActivity extends AndroidApplication {
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
// set globals
CanvasAdapter.g = AndroidGraphics.INSTANCE; CanvasAdapter.g = AndroidGraphics.INSTANCE;
GLAdapter.g = new AndroidGLAdapter(); GLAdapter.g = new AndroidGLAdapter();
Log.logger = new AndroidLog();
// TODO make this dpi dependent // TODO make this dpi dependent
Tile.SIZE = 400; Tile.SIZE = 400;
@ -43,15 +39,11 @@ public class MainActivity extends AndroidApplication {
} }
class GdxMapAndroid extends GdxMap { class GdxMapAndroid extends GdxMap {
@Override @Override
public void createLayers() { public void createLayers() {
//TileSource ts = new OSciMap4TileSource(); TileSource ts = new OSciMap4TileSource();
//ts.setOption("url", "http://opensciencemap.org/tiles/vtm"); ts.setOption("url", "http://opensciencemap.org/tiles/vtm");
TileSource ts = new OSciMap2TileSource();
ts.setOption("url", "http://opensciencemap.org/osci/map-live");
initDefaultLayers(ts, true, true, true); initDefaultLayers(ts, true, true, true);
} }