summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2018-07-19 20:20:09 +0200
committerTobrun <tobrun.van.nuland@gmail.com>2018-07-19 20:42:29 +0200
commitaf0e889ccedcbc8ad1523dd40d86aa069e85d3f5 (patch)
treebb6ce89be839edd8d3ae28c652e85f1d731291f6
parent5d7e3e24e565afffe2bc9db5029286b167f039ed (diff)
downloadqtlocation-mapboxgl-upstream/tvn-expose-getmap.tar.gz
[android] - expose getMap on native_map_viewupstream/tvn-expose-getmap
-rwxr-xr-xplatform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java2
-rwxr-xr-xplatform/android/src/native_map_view.cpp4
-rwxr-xr-xplatform/android/src/native_map_view.hpp2
3 files changed, 7 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
index e427efc780..31910b206e 100755
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
@@ -64,7 +64,7 @@ final class NativeMapView {
private boolean destroyed = false;
// Holds the pointer to JNI NativeMapView
- private long nativePtr = 0;
+ long nativePtr = 0;
// Listener invoked to return a bitmap of the map
private MapboxMap.SnapshotReadyCallback snapshotReadyCallback;
diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp
index c648a22893..44b04fc538 100755
--- a/platform/android/src/native_map_view.cpp
+++ b/platform/android/src/native_map_view.cpp
@@ -940,6 +940,10 @@ jni::jboolean NativeMapView::getPrefetchesTiles(JNIEnv&) {
return jni::jboolean(map->getPrefetchZoomDelta() > 0);
}
+mbgl::Map& NativeMapView::getMap() {
+ return *map;
+}
+
// Static methods //
jni::Class<NativeMapView> NativeMapView::javaClass;
diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp
index 321d43c5e9..e577670323 100755
--- a/platform/android/src/native_map_view.hpp
+++ b/platform/android/src/native_map_view.hpp
@@ -248,6 +248,8 @@ public:
jni::jboolean getPrefetchesTiles(JNIEnv&);
+ mbgl::Map& getMap();
+
private:
std::unique_ptr<AndroidRendererFrontend> rendererFrontend;