[CP] Prepare release 2.6.0-rc.1 (#857)

* Update README.md for viewport support (#841)

* Update README.md (#837) (#842)

it is not nullable
and it is Point object

Co-authored-by: shinriyo <[email protected]>

* Align tap propagation behavior on Android and iOS. (#847)

* Introduce Interactions API (#748)

* Initial implementation of QRF and Featurestate

* Add Standard experimental, build out Android

* Finish up Android interfaces, general cleanup

* Linting updates

* Additional lint edits

* Clean up type conversions, restore tests

* Update for linting

* Change toValue back

* Update example, some docs cleanup

* Revert

* Build out geometries

* Address review feedback

* Add framework for typed interactions

* Update generated code

* Add map.addInteraction, add Standard featuresets

* Update for sanity check

* Remove viewport query, general cleanup

* Update viewport QRF implementation

* Remove FeaturesetQueryTarget, minor updates from review

* Update Android interface, some formatting

* Make Interactions internal, update implementation

* Initial generics implementation

* Update Podfile

* Update to move _Interactions internal

* Update error handling and interfaces

* Update for lint

* Move interaction to pigeon generation

* Expand use of generics, rename

---------

Co-authored-by: Release SDK bot for Maps SDK team <[email protected]>

* Bump platform SDKs version (#855)

* Bump SDK version to 2.6.0-rc.1 (#856)

---------

Co-authored-by: Patrick Leonard <[email protected]>
Co-authored-by: shinriyo <[email protected]>
Co-authored-by: Release SDK bot for Maps SDK team <[email protected]>

Author: 4 people

CHANGELOG.md

@@ -1,4 +1,27 @@
-# main
+### 2.6.0-rc.1
+
+> [!IMPORTANT]
+> The iOS minimum deployment target is now iOS 14.0.
+
+* Align tap propagation behavior on Android and iOS.
+* Introduce the experimental Interactions API, a toolset that allows you to handle interactions on both layers and basemap features for styles. This API introduces a new concept called `Featureset`, which allows Evolving Basemap styles, such as Standard, to export an abstract set of features, such as POI, buildings, and place labels, regardless of which layers they are rendered on. An `Interaction` can then be targeted to these features, modifying their state when interacted with. For example, you can add a `TapInteraction` to your map which targets the `buildings` `Featureset`. When a user taps on a building, the building will be highlighted and its color will change to blue. 
+
+```dart
+var tapInteraction = TapInteraction(StandardBuildings(),
+    (_, feature) {
+  mapboxMap.setFeatureStateForFeaturesetFeature(feature, StandardBuildingState(highlight: true));
+  log("Building group: ${feature.group}");
+});
+mapboxMap.addInteraction(tapInteraction);
+```
+
+Specific changes: 
+  * Introduce the experimental `MapboxMap.addInteractions` method, which allows you to add interactions to the map. 
+  * Introduce `TapInteraction` and `LongTapInteraction`, which allow you to add tap and longTap interactions to the map.
+  * Introduce `FeaturesetDescriptor` -- and convenience descriptors for `StandardBuildings`, `StandardPOIs`, and `StandardPlaceLabels` -- which allow you to describe the featureset you want `Interactions` to target.
+  * Introduce low-level methods for creating and manipulating interactive features: `queryRenderedFeatures`, `querySourceFeatures`, `setFeatureState`, `getFeatureState`, `removeFeatureState`, `resetFeatureState`
+* For more guidance with using these new features see `interactive_features_example.dart`.
+* Update Maps SDK to 11.10.0-rc.1
 
 ### 2.6.0-beta.1
 

README.md

@@ -1,6 +1,6 @@
 # Mapbox Maps SDK Flutter SDK
 
-The Mapbox Maps SDK Flutter SDK is an officially developed solution from Mapbox that enables use of our latest Maps SDK product (v11.10.0-beta.1). The SDK allows developers to embed highly-customized maps using a Flutter widget on Android and iOS.
+The Mapbox Maps SDK Flutter SDK is an officially developed solution from Mapbox that enables use of our latest Maps SDK product (v11.10.0-rc.1). The SDK allows developers to embed highly-customized maps using a Flutter widget on Android and iOS.
 
 Web and desktop are not supported. 
 
@@ -37,7 +37,7 @@ Contributions welcome!
 | Fill Annotations | :white_check_mark: | :white_check_mark: |
 | Snapshotter | :white_check_mark: | :white_check_mark: |
 | Offline | :white_check_mark: | :white_check_mark: |
-| Viewport | :x:                | :x: |
+| Viewport | :white_check_mark: | :white_check_mark: |
 | Style DSL   | :x:                | :x: |
 | Expression DSL   | :x:                | :x: |
 | View Annotations   | :x:                | :x: |
@@ -137,7 +137,7 @@ The `MapboxMap` controller instance is provided with `MapWidget.onMapCreated` ca
 `MapboxMap` exposes an entry point to the most of the APIs Maps Flutter SDK provides. It allows to control the map, camera, styles, observe map events, 
 query rendered features, etc.
 
-It's organized similarly to the [Android](https://docs.mapbox.com/android/maps/api/11.10.0-beta.1/mapbox-maps-android/com.mapbox.maps/-mapbox-map/) and [iOS](https://docs.mapbox.com/ios/maps/api/11.10.0-beta.1/documentation/mapboxmaps/mapboxmap) counterparts.
+It's organized similarly to the [Android](https://docs.mapbox.com/android/maps/api/11.10.0-rc.1/mapbox-maps-android/com.mapbox.maps/-mapbox-map/) and [iOS](https://docs.mapbox.com/ios/maps/api/11.10.0-rc.1/documentation/mapboxmaps/mapboxmap) counterparts.
 
 To interact with the map after it's created store the MapboxMap object somewhere : 
 ```
@@ -204,9 +204,9 @@ To create 5 point annotations using custom icon:
     var options = <PointAnnotationOptions>[];
     for (var i = 0; i < 5; i++) {
       options.add(PointAnnotationOptions(
-          geometry: createRandomPoint().toJson(), image: list));
+          geometry: Point.fromJson(createRandomPoint().toJson()), image: list));
     }
-    pointAnnotationManager?.createMulti(options);
+    pointAnnotationManager.createMulti(options);
   });
 ```
 You can find more examples of the AnnotationManagers usage in the sample app : [point annotations](example/lib/point_annotations.dart), [circle annotations](example/lib/circle_annotations.dart), [polygon annotations](example/lib/polygon_annotations.dart), [polyline annotations](example/lib/polyline_annotations.dart). 

android/build.gradle

@@ -59,7 +59,7 @@ if (file("$rootDir/gradle/ktlint.gradle").exists() && file("$rootDir/gradle/lint
 }
 
 dependencies {
-    implementation "com.mapbox.maps:android:11.10.0-beta.1"
+    implementation "com.mapbox.maps:android:11.10.0-rc.1"
 
     implementation "androidx.annotation:annotation:1.5.0"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"

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

@@ -1,5 +1,6 @@
 package com.mapbox.maps.mapbox_maps
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Bitmap
 import com.google.gson.Gson
@@ -9,6 +10,7 @@ import com.mapbox.bindgen.Value
 import com.mapbox.common.TileRegionError
 import com.mapbox.geojson.*
 import com.mapbox.maps.EdgeInsets
+import com.mapbox.maps.MapboxExperimental
 import com.mapbox.maps.StylePackError
 import com.mapbox.maps.applyDefaultParams
 import com.mapbox.maps.debugoptions.MapViewDebugOptions
@@ -19,6 +21,8 @@ import com.mapbox.maps.extension.style.light.generated.directionalLight
 import com.mapbox.maps.extension.style.light.generated.flatLight
 import com.mapbox.maps.extension.style.projection.generated.Projection
 import com.mapbox.maps.extension.style.types.StyleTransition
+import com.mapbox.maps.interactions.FeatureState
+import com.mapbox.maps.interactions.TypedFeaturesetDescriptor
 import com.mapbox.maps.logE
 import com.mapbox.maps.mapbox_maps.pigeons.*
 import org.json.JSONArray
@@ -263,6 +267,50 @@ fun RenderedQueryOptions.toRenderedQueryOptions(): com.mapbox.maps.RenderedQuery
   return com.mapbox.maps.RenderedQueryOptions(layerIds, filter?.toValue())
 }
 
+fun FeaturesetFeatureId.toFeaturesetFeatureId(): com.mapbox.maps.FeaturesetFeatureId {
+  return com.mapbox.maps.FeaturesetFeatureId(id, namespace)
+}
+
+@OptIn(MapboxExperimental::class)
+fun FeaturesetDescriptor.toTypedFeaturesetDescriptor(): TypedFeaturesetDescriptor<FeatureState, com.mapbox.maps.interactions.FeaturesetFeature<FeatureState>>? {
+  featuresetId?.let {
+    return TypedFeaturesetDescriptor.Featureset(
+      featuresetId, importId
+    )
+  } ?: layerId?.let {
+    return TypedFeaturesetDescriptor.Layer(
+      layerId
+    )
+  }
+  return null
+}
+
+@OptIn(MapboxExperimental::class)
+fun Map<String, Any?>.toFeatureState(): com.mapbox.maps.interactions.FeatureState {
+  val map = this
+  return FeatureState {
+    for ((key, value) in map) {
+      value?.let {
+        when (value) {
+          is String -> {
+            addStringState(key, value)
+          }
+          is Long -> {
+            addLongState(key, value)
+          }
+          is Double -> {
+            addDoubleState(key, value)
+          }
+          is Boolean -> {
+            addBooleanState(key, value)
+          }
+          else -> throw (RuntimeException("Unsupported (key, value): ($key, $value)"))
+        }
+      }
+    }
+  }
+}
+
 fun MapDebugOptions.toMapDebugOptions(): com.mapbox.maps.MapDebugOptions {
   return com.mapbox.maps.MapDebugOptions.values()[data.ordinal]
 }
@@ -379,6 +427,44 @@ fun CameraBoundsOptions.toCameraBoundsOptions(): com.mapbox.maps.CameraBoundsOpt
     .minZoom(minZoom)
     .build()
 
+fun Geometry.toMap(): Map<String?, Any?> {
+  return when (this) {
+    is Point -> mapOf(
+      "type" to "Point",
+      "coordinates" to listOf(this.latitude(), this.longitude())
+    )
+    is LineString -> mapOf(
+      "type" to "LineString",
+      "coordinates" to this.coordinates().map { listOf(it.latitude(), it.longitude()) }
+    )
+    is Polygon -> mapOf(
+      "type" to "Polygon",
+      "coordinates" to this.coordinates().map { ring ->
+        ring.map { listOf(it.latitude(), it.longitude()) }
+      }
+    )
+    is MultiPoint -> mapOf(
+      "type" to "MultiPoint",
+      "coordinates" to this.coordinates().map { listOf(it.latitude(), it.longitude()) }
+    )
+    is MultiLineString -> mapOf(
+      "type" to "MultiLineString",
+      "coordinates" to this.coordinates().map { line ->
+        line.map { listOf(it.latitude(), it.longitude()) }
+      }
+    )
+    is MultiPolygon -> mapOf(
+      "type" to "MultiPolygon",
+      "coordinates" to this.coordinates().map { polygon ->
+        polygon.map { ring ->
+          ring.map { listOf(it.latitude(), it.longitude()) }
+        }
+      }
+    )
+    else -> throw IllegalArgumentException("Unsupported geometry type")
+  }
+}
+
 fun Map<String?, Any?>.toGeometry(): Geometry {
   when {
     this["type"] == "Point" -> {
@@ -504,6 +590,35 @@ fun com.mapbox.maps.QueriedRenderedFeature.toFLTQueriedRenderedFeature(): Querie
   return QueriedRenderedFeature(queriedFeature.toFLTQueriedFeature(), layers)
 }
 
+fun com.mapbox.maps.FeaturesetFeatureId.toFLTFeaturesetFeatureId(): FeaturesetFeatureId {
+  return FeaturesetFeatureId(featureId, featureNamespace)
+}
+
+fun com.mapbox.maps.FeaturesetDescriptor.toFLTFeaturesetDescriptor(): FeaturesetDescriptor {
+  return FeaturesetDescriptor(featuresetId, importId, layerId)
+}
+
+@SuppressLint("RestrictedApi")
+@OptIn(MapboxExperimental::class)
+fun com.mapbox.maps.interactions.FeaturesetFeature<FeatureState>.toFLTFeaturesetFeature(): FeaturesetFeature {
+  return FeaturesetFeature(
+    id?.toFLTFeaturesetFeatureId(),
+    descriptor.toFeaturesetDescriptor().toFLTFeaturesetDescriptor(),
+    geometry.toMap(),
+    properties.toFilteredMap(),
+    JSONObject(state.asJsonString()).toFilteredMap()
+  )
+}
+
+@SuppressLint("RestrictedApi")
+fun com.mapbox.maps.InteractionContext.toFLTMapContentGestureContext(): MapContentGestureContext {
+  return MapContentGestureContext(
+    ScreenCoordinate(screenCoordinate.x, screenCoordinate.y),
+    coordinateInfo.coordinate,
+    GestureState.ENDED
+  )
+}
+
 fun com.mapbox.maps.QueriedSourceFeature.toFLTQueriedSourceFeature(): QueriedSourceFeature {
   return QueriedSourceFeature(queriedFeature.toFLTQueriedFeature())
 }
@@ -594,6 +709,13 @@ fun JSONObject.toMap(): Map<String?, Any?> = keys().asSequence().associateWith {
   }
 }
 
+@OptIn(MapboxExperimental::class)
+fun JSONObject.toFilteredMap(): Map<String, Any?> {
+  return this.toMap()
+    .filterKeys { it != null } // Filter out null keys
+    .mapKeys { it.key!! }
+}
+
 fun Number.toLogicalPixels(context: Context): Double {
   return this.toDouble() / context.resources.displayMetrics.density
 }