summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun <tobrun@mapbox.com>2019-02-07 15:22:36 +0100
committerGitHub <noreply@github.com>2019-02-07 15:22:36 +0100
commit47fa19444e6c21326d99fbe38a3c25716e009971 (patch)
treeb486692126c7c1f7e9a9ee97501662213183f499
parentb8d2038810ec6e48682b2f22182dff41e8c4dc45 (diff)
downloadqtlocation-mapboxgl-47fa19444e6c21326d99fbe38a3c25716e009971.tar.gz
[android] - add experimental pointer (#13889)
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java7
-rwxr-xr-xplatform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java6
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.kt6
3 files changed, 18 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
index 3346bd6d64..8d35fa7176 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
@@ -228,6 +228,13 @@ public final class MapboxMap {
}
}
+ /**
+ * Experimental feature. Do not use.
+ */
+ long getNativeMapPtr() {
+ return nativeMapView.getNativePtr();
+ }
+
// Style
/**
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 894cbbf27b..10942d521c 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
@@ -70,7 +70,7 @@ final class NativeMapView implements NativeMap {
// Holds the pointer to JNI NativeMapView
@Keep
- long nativePtr = 0;
+ private long nativePtr = 0;
// Listener invoked to return a bitmap of the map
private MapboxMap.SnapshotReadyCallback snapshotReadyCallback;
@@ -1378,6 +1378,10 @@ final class NativeMapView implements NativeMap {
return viewCallback.getHeight();
}
+ long getNativePtr() {
+ return nativePtr;
+ }
+
//
// Snapshot
//
diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.kt
index 1c0d1f76b7..2426c42f53 100644
--- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.kt
+++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapTest.kt
@@ -35,6 +35,7 @@ class MapboxMapTest {
every { nativeMapView.isDestroyed } returns false
every { nativeMapView.setOnFpsChangedListener(any()) } answers {}
every { nativeMapView.prefetchTiles = any() } answers {}
+ every { nativeMapView.nativePtr } returns 5
every { nativeMapView.setLatLngBounds(any()) } answers {}
every { transform.minZoom = any() } answers {}
every { transform.maxZoom = any() } answers {}
@@ -102,4 +103,9 @@ class MapboxMapTest {
fun testEaseCameraChecksDurationPositive() {
mapboxMap.easeCamera(CameraUpdateFactory.newLatLng(LatLng(30.0, 30.0)), 0, null)
}
+
+ @Test
+ fun testGetNativeMapPtr() {
+ assertEquals(5, mapboxMap.nativeMapPtr)
+ }
} \ No newline at end of file