port changes from release/2.19 branch (#10522)

+ add padding to follow puck viewport state options.

cc @mapbox/maps-flutter

GitOrigin-RevId: b952ac7ee6c6414bb24e1e087ab707fc551af3d0

Author: evil159

CHANGELOG.md

@@ -4,6 +4,16 @@
 * Introduce new `LineLayer.lineElevationGroundScale` property to scale elevated lines with terrain exaggeration.
 * Promote elevated lines properties to stable: `LineLayer.lineZOffset` and `LineLayer.lineElevationReference`.
 * Add experimental `ModelLayer.modelAllowDensityReduction` property to disable density reduction in model layers.
+* Add `FollowPuckViewportState.padding` to control camera padding when following the user's location puck, allowing the puck to be offset from the viewport center (e.g. for navigation UIs where the puck should appear near the bottom of the screen).
+
+### 2.19.1
+
+* [Android] Fix Gradle build failure when `SDK_REGISTRY_TOKEN` is not set in the environment or `gradle.properties`.
+* [Android] Fix `customData` not being applied when updating Circle, Point, Polygon, and Polyline annotations.
+
+### 2.19.0
+
+* Update Maps SDK to v11.19.0
 
 ### 2.19.0-rc.1
 

LICENSE

@@ -1,6 +1,6 @@
 ## License
 
-Mapbox Maps for Flutter version 2.19.0-rc.1
+Mapbox Maps for Flutter version 2.19.1
 Mapbox Maps Flutter SDK
 
 Copyright © 2022 - 2026 Mapbox, Inc. All rights reserved.

android/build.gradle

@@ -28,7 +28,7 @@ rootProject.allprojects {
             }
             credentials {
                 username = "mapbox"
-                password = System.getenv("SDK_REGISTRY_TOKEN") ?: project.property("SDK_REGISTRY_TOKEN") as String
+                password = System.getenv("SDK_REGISTRY_TOKEN") ?: project.findProperty("SDK_REGISTRY_TOKEN") as String
             }
         }
     }

android/src/main/kotlin/com/mapbox/maps/mapbox_maps/ViewportController.kt

@@ -160,7 +160,7 @@ fun ViewportPlugin.viewportStateFromFLTState(
   return when (stateStorage.type) {
     _ViewportStateType.IDLE -> idle().let { null }
     _ViewportStateType.FOLLOW_PUCK ->
-      makeFollowPuckViewportState((stateStorage.options as _FollowPuckViewportStateOptions).toOptions())
+      makeFollowPuckViewportState((stateStorage.options as _FollowPuckViewportStateOptions).toOptions(context))
 
     _ViewportStateType.OVERVIEW ->
       makeOverviewViewportState(
@@ -179,7 +179,7 @@ fun ViewportPlugin.viewportStateFromFLTState(
   }
 }
 
-fun _FollowPuckViewportStateOptions.toOptions(): FollowPuckViewportStateOptions {
+fun _FollowPuckViewportStateOptions.toOptions(context: Context): FollowPuckViewportStateOptions {
   val bearing: FollowPuckViewportStateBearing? = when (this.bearing) {
     _FollowPuckViewportStateBearing.HEADING -> FollowPuckViewportStateBearing.SyncWithLocationPuck
     _FollowPuckViewportStateBearing.COURSE -> FollowPuckViewportStateBearing.SyncWithLocationPuck
@@ -201,6 +201,7 @@ fun _FollowPuckViewportStateOptions.toOptions(): FollowPuckViewportStateOptions
     .zoom(zoom)
     .bearing(bearing)
     .pitch(pitch)
+    .padding(padding?.toEdgeInsets(context))
     .build()
 }
 

android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/CircleAnnotationController.kt

@@ -191,6 +191,9 @@ class CircleAnnotationController(private val delegate: ControllerDelegate) : _Ci
     annotation.circleStrokeWidth?.let {
       originalAnnotation.circleStrokeWidth = it
     }
+    annotation.customData?.let {
+      originalAnnotation.setData(Gson().toJsonTree(it))
+    }
     return originalAnnotation
   }
 

android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PointAnnotationController.kt

@@ -300,6 +300,9 @@ class PointAnnotationController(private val delegate: ControllerDelegate) : _Poi
     annotation.textOpacity?.let {
       originalAnnotation.textOpacity = it
     }
+    annotation.customData?.let {
+      originalAnnotation.setData(Gson().toJsonTree(it))
+    }
     return originalAnnotation
   }
 

android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolygonAnnotationController.kt

@@ -190,6 +190,9 @@ class PolygonAnnotationController(private val delegate: ControllerDelegate) : _P
     annotation.fillZOffset?.let {
       originalAnnotation.fillZOffset = it
     }
+    annotation.customData?.let {
+      originalAnnotation.setData(Gson().toJsonTree(it))
+    }
     return originalAnnotation
   }
 

android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolylineAnnotationController.kt

@@ -212,6 +212,9 @@ class PolylineAnnotationController(private val delegate: ControllerDelegate) : _
     annotation.lineWidth?.let {
       originalAnnotation.lineWidth = it
     }
+    annotation.customData?.let {
+      originalAnnotation.setData(Gson().toJsonTree(it))
+    }
     return originalAnnotation
   }
 

android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/ViewportInternal.kt

@@ -265,15 +265,17 @@ data class _FollowPuckViewportStateOptions(
   val zoom: Double? = null,
   val bearingValue: Double? = null,
   val bearing: _FollowPuckViewportStateBearing? = null,
-  val pitch: Double? = null
+  val pitch: Double? = null,
+  val padding: MbxEdgeInsets? = null
 ) {
   companion object {
     fun fromList(pigeonVar_list: List<Any?>): _FollowPuckViewportStateOptions {
       val zoom = pigeonVar_list[0] as Double?
       val bearingValue = pigeonVar_list[1] as Double?
       val bearing = pigeonVar_list[2] as _FollowPuckViewportStateBearing?
       val pitch = pigeonVar_list[3] as Double?
-      return _FollowPuckViewportStateOptions(zoom, bearingValue, bearing, pitch)
+      val padding = pigeonVar_list[4] as MbxEdgeInsets?
+      return _FollowPuckViewportStateOptions(zoom, bearingValue, bearing, pitch, padding)
     }
   }
   fun toList(): List<Any?> {
@@ -282,6 +284,7 @@ data class _FollowPuckViewportStateOptions(
       bearingValue,
       bearing,
       pitch,
+      padding,
     )
   }
   override fun equals(other: Any?): Boolean {
@@ -294,7 +297,8 @@ data class _FollowPuckViewportStateOptions(
     return zoom == other.zoom &&
       bearingValue == other.bearingValue &&
       bearing == other.bearing &&
-      pitch == other.pitch
+      pitch == other.pitch &&
+      padding == other.padding
   }
 
   override fun hashCode(): Int = toList().hashCode()

ios/mapbox_maps_flutter.podspec

@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'mapbox_maps_flutter'
-  s.version          = '2.19.0-rc.1'
+  s.version          = '2.19.1'
 
   s.summary          = 'Mapbox Maps SDK Flutter Plugin.'
   s.description      = 'An officially developed solution from Mapbox that enables use of our latest Maps SDK product.'