diff options
| author | tobrun <tobrun.van.nuland@gmail.com> | 2018-09-11 22:11:09 +0200 |
|---|---|---|
| committer | Chris Loer <chris.loer@mapbox.com> | 2018-09-12 14:10:46 -0700 |
| commit | 5238c77696eb29bef7ca8a0e4c905e4d4ca89931 (patch) | |
| tree | 5254917354f24d2695f45f5f7b55af1535a866ad /platform/android/src | |
| parent | d735d89835fb3076e09594fce2a141fe1495e33f (diff) | |
| download | qtlocation-mapboxgl-5238c77696eb29bef7ca8a0e4c905e4d4ca89931.tar.gz | |
[android] - add binding integration for cross source collision
Diffstat (limited to 'platform/android/src')
| -rwxr-xr-x | platform/android/src/native_map_view.cpp | 7 | ||||
| -rwxr-xr-x | platform/android/src/native_map_view.hpp | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp index 25605e09e4..adcc54ea4f 100755 --- a/platform/android/src/native_map_view.cpp +++ b/platform/android/src/native_map_view.cpp @@ -60,7 +60,8 @@ NativeMapView::NativeMapView(jni::JNIEnv& _env, const jni::Object<NativeMapView>& _obj, const jni::Object<FileSource>& jFileSource, const jni::Object<MapRenderer>& jMapRenderer, - jni::jfloat _pixelRatio) + jni::jfloat _pixelRatio, + jni::jboolean _crossSourceCollisions) : javaPeer(_env, _obj) , mapRenderer(MapRenderer::getNativePeer(_env, jMapRenderer)) , pixelRatio(_pixelRatio) @@ -83,7 +84,7 @@ NativeMapView::NativeMapView(jni::JNIEnv& _env, mbgl::Size{ static_cast<uint32_t>(width), static_cast<uint32_t>(height) }, pixelRatio, fileSource, *threadPool, MapMode::Continuous, - ConstrainMode::HeightOnly, ViewportMode::Default); + ConstrainMode::HeightOnly, ViewportMode::Default, _crossSourceCollisions); } /** @@ -942,7 +943,7 @@ void NativeMapView::registerNative(jni::JNIEnv& env) { // Register the peer jni::RegisterNativePeer<NativeMapView>(env, javaClass, "nativePtr", - jni::MakePeer<NativeMapView, const jni::Object<NativeMapView>&, const jni::Object<FileSource>&, const jni::Object<MapRenderer>&, jni::jfloat>, + jni::MakePeer<NativeMapView, const jni::Object<NativeMapView>&, const jni::Object<FileSource>&, const jni::Object<MapRenderer>&, jni::jfloat, jni::jboolean>, "nativeInitialize", "nativeDestroy", METHOD(&NativeMapView::resizeView, "nativeResizeView"), diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp index 969833a25b..3e1a698ed6 100755 --- a/platform/android/src/native_map_view.hpp +++ b/platform/android/src/native_map_view.hpp @@ -51,7 +51,8 @@ public: const jni::Object<NativeMapView>&, const jni::Object<FileSource>&, const jni::Object<MapRenderer>&, - jni::jfloat pixelRatio); + jni::jfloat, + jni::jboolean); virtual ~NativeMapView(); |