From cb5908a541bfed6febef43361c822fa715a6cf62 Mon Sep 17 00:00:00 2001 From: ghitier Date: Fri, 20 Jun 2025 11:19:43 +0200 Subject: [PATCH 1/2] fix(android): ignore camera padding for marker view --- .../com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerView.kt b/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerView.kt index 59cbf0b06c..e4fa86b339 100644 --- a/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerView.kt +++ b/android/src/main/java/com/rnmapbox/rnmbx/components/annotation/RNMBXMarkerView.kt @@ -186,7 +186,7 @@ class RNMBXMarkerView(context: Context?, private val mManager: RNMBXMarkerViewMa allowOverlapWithPuck(mAllowOverlapWithPuck) offsets(offset.dx, offset.dy) selected(mIsSelected) - + ignoreCameraPadding(true) } return options } From 66e3a58ee1d93f953af9f87400e63b6d89aa986e Mon Sep 17 00:00:00 2001 From: ghitier Date: Tue, 29 Jul 2025 09:14:47 +0200 Subject: [PATCH 2/2] fix(android): mapbox 10 build error (due to cameraIgnorePadding option) --- .../v10/com/rnmapbox/rnmbx/v11compat/Annotation.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Annotation.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Annotation.kt index 5f57247ab5..0216489c6e 100644 --- a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Annotation.kt +++ b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Annotation.kt @@ -21,7 +21,11 @@ fun ViewAnnotationOptions.Builder.height(value: Double): ViewAnnotationOptions.B return this.height(value.toInt()) } -fun com.mapbox.maps.ViewAnnotationOptions.Builder.allowOverlapWithPuck(value: Boolean): ViewAnnotationOptions.Builder { +fun ViewAnnotationOptions.Builder.allowOverlapWithPuck(value: Boolean): ViewAnnotationOptions.Builder { + return this; +} + +fun ViewAnnotationOptions.Builder.ignoreCameraPadding(value: Boolean): ViewAnnotationOptions.Builder { return this; }