diff options
author | tobrun <tobrun.van.nuland@gmail.com> | 2018-09-11 22:11:09 +0200 |
---|---|---|
committer | tobrun <tobrun.van.nuland@gmail.com> | 2018-09-11 22:19:42 +0200 |
commit | 6692bb68d4f7d94751b0e5dfd9f2cd012154dcdf (patch) | |
tree | f35423d046f214686fe3a4489367c6cbe19243f3 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java | |
parent | 6d2fcc4e7f9c33b5f3403c3145a77d14a1b333a1 (diff) | |
download | qtlocation-mapboxgl-upstream/tvn-per-source-collision.tar.gz |
[android] - add binding integration for cross source collisionupstream/tvn-per-source-collision
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java')
-rwxr-xr-x | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java | 13 |
1 files changed, 7 insertions, 6 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 75359f7f44..bf8c675cfa 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 @@ -12,7 +12,6 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.text.TextUtils; import android.util.DisplayMetrics; - import com.mapbox.geojson.Feature; import com.mapbox.geojson.Geometry; import com.mapbox.mapboxsdk.LibraryLoader; @@ -85,18 +84,19 @@ final class NativeMapView { // Constructors // - public NativeMapView(final Context context, final ViewCallback viewCallback, final MapRenderer mapRenderer) { - this(context, context.getResources().getDisplayMetrics().density, viewCallback, mapRenderer); + public NativeMapView(final Context context, final boolean crossSourceCollisions, final ViewCallback viewCallback, + final MapRenderer mapRenderer) { + this(context, context.getResources().getDisplayMetrics().density, crossSourceCollisions, viewCallback, mapRenderer); } - public NativeMapView(final Context context, float pixelRatio, + public NativeMapView(final Context context, final float pixelRatio, final boolean crossSourceCollisions, final ViewCallback viewCallback, final MapRenderer mapRenderer) { this.mapRenderer = mapRenderer; this.viewCallback = viewCallback; this.fileSource = FileSource.getInstance(context); this.pixelRatio = pixelRatio; this.thread = Thread.currentThread(); - nativeInitialize(this, fileSource, mapRenderer, pixelRatio); + nativeInitialize(this, fileSource, mapRenderer, pixelRatio, crossSourceCollisions); } // @@ -936,7 +936,8 @@ final class NativeMapView { private native void nativeInitialize(NativeMapView nativeMapView, FileSource fileSource, MapRenderer mapRenderer, - float pixelRatio); + float pixelRatio, + boolean crossSourceCollisions); @Keep private native void nativeDestroy(); |