poi3D for Android

vtm-android-example/AndroidManifest.xml

@@ -46,6 +46,9 @@
         <activity
             android:name=".GdxActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
+        <activity
+            android:name=".GdxPoi3DActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name=".JeoIndoorActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />

vtm-android-example/build.gradle

@@ -19,6 +19,7 @@ dependencies {
 
     implementation project(':vtm-android-gdx')
     implementation project(':vtm-gdx')
+    implementation project(':vtm-gdx-poi3d')
     implementation "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
 
     implementation 'org.mapsforge:mapsforge-poi-android:master-SNAPSHOT'

vtm-android-example/src/org/oscim/android/test/GdxActivity.java

@@ -33,6 +33,12 @@ import org.oscim.core.Tile;
 import org.oscim.gdx.AndroidGL;
 import org.oscim.gdx.GdxAssets;
 import org.oscim.gdx.GdxMap;
+import org.oscim.gdx.poi3d.Poi3DLayer;
+import org.oscim.layers.tile.buildings.BuildingLayer;
+import org.oscim.layers.tile.buildings.S3DBLayer;
+import org.oscim.layers.tile.vector.VectorTileLayer;
+import org.oscim.layers.tile.vector.labeling.LabelLayer;
+import org.oscim.theme.VtmThemes;
 import org.oscim.tiling.TileSource;
 import org.oscim.tiling.source.OkHttpEngine;
 import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
@@ -40,6 +46,18 @@ import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
 public class GdxActivity extends AndroidApplication {
     MapPreferences mPrefs;
 
+    private boolean mPoi3d;
+    private boolean mS3db;
+
+    public GdxActivity() {
+        this(false, false);
+    }
+
+    public GdxActivity(boolean s3db, boolean poi3d) {
+        mS3db = s3db;
+        mPoi3d = poi3d;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -65,11 +83,21 @@ public class GdxActivity extends AndroidApplication {
     class GdxMapAndroid extends GdxMap {
         @Override
         public void createLayers() {
-            TileSource ts = OSciMap4TileSource.builder()
+            TileSource tileSource = OSciMap4TileSource.builder()
                     .httpFactory(new OkHttpEngine.OkHttpFactory())
                     .build();
-            initDefaultLayers(ts, false, true, true);
+            VectorTileLayer l = mMap.setBaseMap(tileSource);
+            mMap.setTheme(VtmThemes.DEFAULT);
 
+            if (mS3db)
+                mMap.layers().add(new S3DBLayer(mMap, l));
+            else
+                mMap.layers().add(new BuildingLayer(mMap, l));
+
+            if (mPoi3d)
+                mMap.layers().add(new Poi3DLayer(mMap, l));
+
+            mMap.layers().add(new LabelLayer(mMap, l));
             mPrefs.load(getMap());
         }
 

vtm-android-example/src/org/oscim/android/test/GdxPoi3DActivity.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2018 Gustl22
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.oscim.android.test;
+
+public class GdxPoi3DActivity extends GdxActivity {
+
+    public GdxPoi3DActivity() {
+        super(false, true);
+    }
+}

vtm-android-example/src/org/oscim/android/test/Samples.java

@@ -134,5 +134,6 @@ public class Samples extends Activity {
         linearLayout.addView(createButton(OSciMapS3DBActivity.class));
         linearLayout.addView(createButton(ThemeStylerActivity.class));
         linearLayout.addView(createButton(JeoIndoorActivity.class));
+        linearLayout.addView(createButton(GdxPoi3DActivity.class));
     }
 }