diff --git a/settings.gradle b/settings.gradle index abf6f1c2..a2b08dd3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,4 +14,3 @@ include ':vtm-web-js' include ':vtm-ios' include ':vtm-jeo' include ':vtm-jeo-desktop' -include ':vtm-jeo-android' diff --git a/vtm-android-example/AndroidManifest.xml b/vtm-android-example/AndroidManifest.xml index 577d5eff..1b8a0e84 100644 --- a/vtm-android-example/AndroidManifest.xml +++ b/vtm-android-example/AndroidManifest.xml @@ -62,6 +62,11 @@ android:name="org.oscim.android.test.ThemeStylerActivity" android:label="@string/title_activity_map" > + + + \ No newline at end of file diff --git a/vtm-android-example/build.gradle b/vtm-android-example/build.gradle index 8441e321..c94d62e1 100644 --- a/vtm-android-example/build.gradle +++ b/vtm-android-example/build.gradle @@ -10,9 +10,8 @@ buildscript { apply plugin: 'android' dependencies { - //compile 'org.oscim:vtm-android:0.5.9-SNAPSHOT' - //compile 'org.oscim:vtm-themes:0.5.9-SNAPSHOT' compile project(':vtm-android') + compile project(':vtm-jeo') compile project(':vtm-themes') } @@ -32,6 +31,9 @@ android { debug.setRoot('build-types/debug') release.setRoot('build-types/release') } + packagingOptions { + exclude 'META-INF/services/org.jeo.data.Driver' + } } // Including configurations into Eclipse diff --git a/vtm-jeo-android/res/layout/activity_map.xml b/vtm-android-example/res/layout/jeo_indoor_map.xml similarity index 100% rename from vtm-jeo-android/res/layout/activity_map.xml rename to vtm-android-example/res/layout/jeo_indoor_map.xml diff --git a/vtm-jeo-android/src/org/oscim/jeo/android/TestActivity.java b/vtm-android-example/src/org/oscim/android/test/JeoIndoorMapActivity.java similarity index 80% rename from vtm-jeo-android/src/org/oscim/jeo/android/TestActivity.java rename to vtm-android-example/src/org/oscim/android/test/JeoIndoorMapActivity.java index 7bf1a36c..65d58437 100644 --- a/vtm-jeo-android/src/org/oscim/jeo/android/TestActivity.java +++ b/vtm-android-example/src/org/oscim/android/test/JeoIndoorMapActivity.java @@ -1,4 +1,4 @@ -package org.oscim.jeo.android; +package org.oscim.android.test; import java.io.IOException; import java.io.InputStream; @@ -8,15 +8,11 @@ import java.util.Arrays; import org.jeo.data.VectorDataset; import org.jeo.map.Style; -import org.oscim.android.MapActivity; import org.oscim.layers.OSMIndoorLayer; import org.oscim.layers.tile.vector.BuildingLayer; -import org.oscim.layers.tile.vector.VectorTileLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer; -import org.oscim.renderer.MapRenderer; import org.oscim.test.JeoTest; import org.oscim.theme.VtmThemes; -import org.oscim.tiling.source.oscimap4.OSciMap4TileSource; import org.oscim.utils.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,8 +23,8 @@ import android.view.View; import android.widget.Toast; import android.widget.ToggleButton; -public class TestActivity extends MapActivity { - public static final Logger log = LoggerFactory.getLogger(TestActivity.class); +public class JeoIndoorMapActivity extends BaseMapActivity { + public static final Logger log = LoggerFactory.getLogger(JeoIndoorMapActivity.class); // from http://overpass-turbo.eu/s/2vp String PATH = "https://gist.github.com/anonymous/8960337/raw/overpass.geojson"; @@ -36,12 +32,13 @@ public class TestActivity extends MapActivity { private OSMIndoorLayer mIndoorLayer; + public JeoIndoorMapActivity() { + super(R.layout.jeo_indoor_map); + } + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_map); - - MapRenderer.setBackgroundColor(0xff909090); mMap.addTask(new Runnable() { @Override @@ -49,9 +46,9 @@ public class TestActivity extends MapActivity { showToast("load data"); InputStream is = null; try { - //File file = new File(Environment.getExternalStorageDirectory() - // .getAbsolutePath(), "osmindoor.json"); - //is = new FileInputStream(file); + // File file = new File(Environment.getExternalStorageDirectory() + // .getAbsolutePath(), "osmindoor.json"); + // is = new FileInputStream(file); URL url = new URL(PATH); URLConnection conn = url.openConnection(); @@ -65,10 +62,9 @@ public class TestActivity extends MapActivity { } }); - VectorTileLayer baseLayer = mMap.setBaseMap(new OSciMap4TileSource()); - mMap.layers().add(new BuildingLayer(mMap, baseLayer)); - mMap.layers().add(new LabelLayer(mMap, baseLayer)); - mMap.setTheme(VtmThemes.NEWTRON); + mMap.layers().add(new BuildingLayer(mMap, mBaseLayer)); + mMap.layers().add(new LabelLayer(mMap, mBaseLayer)); + mMap.setTheme(VtmThemes.TRONRENDER); //mMap.setMapPosition(49.417, 8.673, 1 << 17); mMap.setMapPosition(53.5620092, 9.9866457, 1 << 16); diff --git a/vtm-android-example/src/org/oscim/android/test/Samples.java b/vtm-android-example/src/org/oscim/android/test/Samples.java index d160e950..c63d89dd 100644 --- a/vtm-android-example/src/org/oscim/android/test/Samples.java +++ b/vtm-android-example/src/org/oscim/android/test/Samples.java @@ -47,6 +47,7 @@ public class Samples extends Activity { linearLayout.addView(createButton(MarkerOverlayActivity.class)); linearLayout.addView(createButton(ThemeStylerActivity.class)); linearLayout.addView(createButton(S3DBMapActivity.class)); + linearLayout.addView(createButton(JeoIndoorMapActivity.class)); } private Button createButton(final Class clazz) { diff --git a/vtm-jeo-android/AndroidManifest.xml b/vtm-jeo-android/AndroidManifest.xml deleted file mode 100644 index 7dff7e16..00000000 --- a/vtm-jeo-android/AndroidManifest.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/vtm-jeo-android/build.gradle b/vtm-jeo-android/build.gradle deleted file mode 100644 index 5c66474c..00000000 --- a/vtm-jeo-android/build.gradle +++ /dev/null @@ -1,91 +0,0 @@ -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:0.8.+' - } -} - -apply plugin: 'android' - -dependencies { - compile project(':vtm-jeo') - compile project(':vtm-android') - compile project(':vtm-themes') -} - -android { - compileSdkVersion 19 - buildToolsVersion '19.0.1' - - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - resources.srcDirs = ['src', 'assets'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] - } - - debug.setRoot('build-types/debug') - release.setRoot('build-types/release') - } - - packagingOptions { - //exclude 'META-INF/**/*' - exclude 'META-INF/services/org.jeo.data.Driver' - } - // ignore deprecated - lintOptions.abortOnError false -} - -// Including configurations into Eclipse -eclipse { - sourceCompatibility = 1.6 - targetCompatibility = 1.6 - - // Configuring Eclipse classpath - classpath { - plusConfigurations += configurations.compile - - defaultOutputDir = file('bin/classes') - - file { - // Direct manipulation of the generated classpath XML - withXml { - def node = it.asNode() - node.appendNode('classpathentry kind="src" path="src"') - node.appendNode('classpathentry kind="src" path="gen"') - } - - // whenMerged { classpath -> - // classpath.entries.removeAll { entry -> - // entry.path.contains('vtm-android-0.5.9') } - // classpath.entries.removeAll { entry -> - // entry.path.contains('vtm-0.5.9') } - // } - } - } - - project { - natures = ['com.android.ide.eclipse.adt.AndroidNature', - 'org.eclipse.jdt.core.javanature'] - - buildCommand 'com.android.ide.eclipse.adt.ResourceManagerBuilder' - buildCommand 'com.android.ide.eclipse.adt.PreCompilerBuilder' - buildCommand 'com.android.ide.eclipse.adt.ApkBuilder' - } -} - -task run (dependsOn: 'installDebug'){ - doFirst { - println(">> adb run...") - String adb = System.getenv()['ANDROID_HOME'] + '/platform-tools/adb' - String cmd = "${adb} shell am start -n org.oscim.jeo.android/.TestActivity" - def proc = cmd.execute() - proc.in.eachLine {line -> println line} - proc.err.eachLine {line -> System.err.println( 'ERROR: ' + line)} - proc.waitFor() - } -} \ No newline at end of file diff --git a/vtm-jeo-android/project.properties b/vtm-jeo-android/project.properties deleted file mode 100644 index 1a75492e..00000000 --- a/vtm-jeo-android/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-19 -android.library.reference.1=../../vtm-android diff --git a/vtm-jeo-android/res/drawable/ic_launcher.png b/vtm-jeo-android/res/drawable/ic_launcher.png deleted file mode 100644 index 6496c5ad..00000000 Binary files a/vtm-jeo-android/res/drawable/ic_launcher.png and /dev/null differ