Merge branch 'main' into main

Author: tranhuongk

CHANGELOG.md

@@ -1,6 +1,42 @@
-### main
+### 2.1.0-rc.1
+
+* Bump Maps SDK to 11.5.0-rc.1
+* Expose `text-occlusion-opacity`, `icon-occlusion-opacity`, `line-occlusion-opacity`, `model-front-cutoff`, `lineZOffset` as experimental.
+* Add min/max/default values for most of the style properties.
+* Expose `clusterMinPoints` property for `GeoJSONSource`.
+* Expose `SlotLayer` and `RasterParticleLayer`.
+* Expose `LocationComponentSettings.slot`.
+* Add `@experimental` annotation to relevant APIs.
+
+### 2.1.0-beta.1
 
 * Add ModelLayer API.
+* Support for offline map, allowing users to download and store map data on their devices for use in environments with limited or no internet connectivity.
+* Layer expressions support. Specify expressions when constructing a layer with all new expression support for layers.
+*Before:*
+```dart
+mapboxMap.style.setStyleLayerProperty("layer", "line-gradient",
+    '["interpolate",["linear"],["line-progress"],0.0,["rgb",255,0,0],0.4,["rgb",0,255,0],1.0,["rgb",0,0,255]]');
+
+```
+*After:*
+```dart
+LineLayer(
+  ...
+  lineGradientExpression: [
+    "interpolate",
+    ["linear"],
+    ["line-progress"],
+    0.0,
+    ["rgb", 255, 0, 0],
+    0.4,
+    ["rgb", 0, 255, 0],
+    1.0,
+    ["rgb", 0, 0, 255]
+  ],
+);
+```
+* Bump Maps SDK to 11.5.0-beta.1
 
 ### 2.0.0
 

README.md

@@ -1,46 +1,46 @@
 # Mapbox Maps SDK Flutter Plugin
 
-The Mapbox Maps SDK Flutter Plugin is an officially developed solution from Mapbox that enables use of our latest Maps SDK product (v11.2.0). The plugin allows developers to embed highly customized maps using a Flutter widget on Android and iOS.
+The Mapbox Maps SDK Flutter Plugin is an officially developed solution from Mapbox that enables use of our latest Maps SDK product (v11.5.0). The plugin allows developers to embed highly customized maps using a Flutter widget on Android and iOS.
 
 Web and desktop are not supported. 
 
 Contributions welcome!
 
 ## Supported API
 
-| Feature | Android | iOS |
-| ------ | ------ | ----- |
-| Style | :white_check_mark:   | :white_check_mark: |
-| Camera position | :white_check_mark:   | :white_check_mark: |
-| Camera animations | :white_check_mark:   | :white_check_mark: |
-| Events | :white_check_mark:   | :white_check_mark: |
-| Gestures | :white_check_mark:   | :white_check_mark: |
+| Feature | Android            | iOS |
+| ------ |--------------------| -- |
+| Style | :white_check_mark: | :white_check_mark: |
+| Camera position | :white_check_mark: | :white_check_mark: |
+| Camera animations | :white_check_mark: | :white_check_mark: |
+| Events | :white_check_mark: | :white_check_mark: |
+| Gestures | :white_check_mark: | :white_check_mark: |
 | User Location | :white_check_mark: | :white_check_mark: |
-| Circle Layer | :white_check_mark:   | :white_check_mark: |
-| Fill Layer | :white_check_mark:   | :white_check_mark: |
-| Fill extrusion Layer | :white_check_mark:   | :white_check_mark: |
-| Line Layer | :white_check_mark:   | :white_check_mark: |
-| Circle Layer | :white_check_mark:   | :white_check_mark: |
-| Raster Layer  | :white_check_mark:  | :white_check_mark:  |
-| Symbol Layer | :white_check_mark:   | :white_check_mark: |
-| Hillshade Layer | :white_check_mark:   | :white_check_mark: |
-| Heatmap Layer   | :white_check_mark:  | :white_check_mark:  |
-| Sky Layer | :white_check_mark:   | :white_check_mark: |
-| GeoJson Source  | :white_check_mark:   | :white_check_mark: |
-| Image Source   | :white_check_mark:   | :white_check_mark: |
-| Vector Source   |  :white_check_mark:  | :white_check_mark:  |
-| Raster Source  |  :white_check_mark:  | :white_check_mark:  |
-| Rasterdem Source  |  :white_check_mark:  | :white_check_mark:  |
-| Circle Annotations | :white_check_mark:   | :white_check_mark: |
-| Point Annotations | :white_check_mark:   | :white_check_mark: |
-| Line Annotations | :white_check_mark:   | :white_check_mark: |
-| Fill Annotations | :white_check_mark:   | :white_check_mark: |
+| Circle Layer | :white_check_mark: | :white_check_mark: |
+| Fill Layer | :white_check_mark: | :white_check_mark: |
+| Fill extrusion Layer | :white_check_mark: | :white_check_mark: |
+| Line Layer | :white_check_mark: | :white_check_mark: |
+| Circle Layer | :white_check_mark: | :white_check_mark: |
+| Raster Layer  | :white_check_mark: | :white_check_mark: |
+| Symbol Layer | :white_check_mark: | :white_check_mark: |
+| Hillshade Layer | :white_check_mark: | :white_check_mark: |
+| Heatmap Layer   | :white_check_mark: | :white_check_mark: |
+| Sky Layer | :white_check_mark: | :white_check_mark: |
+| GeoJson Source  | :white_check_mark: | :white_check_mark: |
+| Image Source   | :white_check_mark: | :white_check_mark: |
+| Vector Source   | :white_check_mark: | :white_check_mark: |
+| Raster Source  | :white_check_mark: | :white_check_mark: |
+| Rasterdem Source  | :white_check_mark: | :white_check_mark: |
+| Circle Annotations | :white_check_mark: | :white_check_mark: |
+| Point Annotations | :white_check_mark: | :white_check_mark: |
+| Line Annotations | :white_check_mark: | :white_check_mark: |
+| Fill Annotations | :white_check_mark: | :white_check_mark: |
 | Snapshotter | :white_check_mark: | :white_check_mark: |
-| Offline | :x: | :x: |
-| Viewport | :x: | :x: |
-| Style DSL   | :x:  | :x:  |
-| Expression DSL   | :x:  | :x:  |
-| View Annotations   | :x:  | :x:  |
+| Offline | :white_check_mark: | :white_check_mark: |
+| Viewport | :x:                | :x: |
+| Style DSL   | :x:                | :x: |
+| Expression DSL   | :x:                | :x: |
+| View Annotations   | :x:                | :x: |
 
 ## Requirements
 
@@ -111,7 +111,7 @@ To use the Maps Flutter Plugin add the git dependency to the pubspec.yaml:
 
 ```
 dependencies:
-  mapbox_maps_flutter: ^2.0.0
+  mapbox_maps_flutter: ^2.1.0-rc.1
 ```
 
 ### Configure permissions

android/build.gradle

@@ -78,7 +78,7 @@ if (file("$rootDir/gradle/ktlint.gradle").exists() && file("$rootDir/gradle/lint
 }
 
 dependencies {
-    implementation "com.mapbox.maps:android:11.4.0"
+    implementation "com.mapbox.maps:android:11.5.0-rc.1"
 
     implementation "androidx.annotation:annotation:1.7.1"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.3.0"

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

@@ -5,15 +5,20 @@ import android.graphics.Bitmap
 import com.google.gson.Gson
 import com.mapbox.bindgen.Expected
 import com.mapbox.bindgen.None
+import com.mapbox.bindgen.Value
+import com.mapbox.common.TileRegionError
 import com.mapbox.geojson.*
 import com.mapbox.maps.EdgeInsets
+import com.mapbox.maps.StylePackError
+import com.mapbox.maps.extension.style.expressions.dsl.generated.min
 import com.mapbox.maps.extension.style.layers.properties.generated.ProjectionName
 import com.mapbox.maps.extension.style.light.LightPosition
 import com.mapbox.maps.extension.style.light.generated.ambientLight
 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.logE
 import com.mapbox.maps.mapbox_maps.pigeons.*
 import org.json.JSONArray
 import org.json.JSONObject
@@ -28,6 +33,14 @@ fun GlyphsRasterizationMode.toGlyphsRasterizationMode(): com.mapbox.maps.GlyphsR
     GlyphsRasterizationMode.IDEOGRAPHS_RASTERIZED_LOCALLY -> com.mapbox.maps.GlyphsRasterizationMode.IDEOGRAPHS_RASTERIZED_LOCALLY
   }
 }
+
+fun com.mapbox.maps.GlyphsRasterizationMode.toFLTGlyphsRasterizationMode(): GlyphsRasterizationMode {
+  return when (this) {
+    com.mapbox.maps.GlyphsRasterizationMode.NO_GLYPHS_RASTERIZED_LOCALLY -> GlyphsRasterizationMode.NO_GLYPHS_RASTERIZED_LOCALLY
+    com.mapbox.maps.GlyphsRasterizationMode.IDEOGRAPHS_RASTERIZED_LOCALLY -> GlyphsRasterizationMode.IDEOGRAPHS_RASTERIZED_LOCALLY
+    com.mapbox.maps.GlyphsRasterizationMode.ALL_GLYPHS_RASTERIZED_LOCALLY -> GlyphsRasterizationMode.ALL_GLYPHS_RASTERIZED_LOCALLY
+  }
+}
 fun GlyphsRasterizationOptions.toGlyphsRasterizationOptions(): com.mapbox.maps.GlyphsRasterizationOptions {
   return com.mapbox.maps.GlyphsRasterizationOptions.Builder()
     .rasterizationMode(rasterizationMode.toGlyphsRasterizationMode())
@@ -528,10 +541,198 @@ fun Bitmap.toMbxImage(): MbxImage {
   return MbxImage(width.toLong(), height.toLong(), outputStream.toByteArray())
 }
 
+fun StylePackLoadOptions.toStylePackLoadOptions(): com.mapbox.maps.StylePackLoadOptions {
+  return com.mapbox.maps.StylePackLoadOptions.Builder()
+    .glyphsRasterizationMode(glyphsRasterizationMode?.toGlyphsRasterizationMode())
+    .metadata(metadata?.toValue())
+    .acceptExpired(acceptExpired)
+    .build()
+}
+
+fun com.mapbox.maps.StylePack.toFLTStylePack(): StylePack {
+  return StylePack(
+    styleURI = this.styleURI,
+    glyphsRasterizationMode = this.glyphsRasterizationMode.toFLTGlyphsRasterizationMode(),
+    requiredResourceCount = this.requiredResourceCount,
+    completedResourceSize = this.completedResourceCount,
+    completedResourceCount = this.completedResourceCount,
+    expires = this.expires?.time
+  )
+}
+
+fun com.mapbox.maps.StylePackLoadProgress.toFLTStylePackLoadProgress(): StylePackLoadProgress {
+  return StylePackLoadProgress(
+    this.completedResourceCount,
+    this.completedResourceSize,
+    this.erroredResourceCount,
+    this.requiredResourceCount,
+    this.loadedResourceCount,
+    this.loadedResourceSize
+  )
+}
+
+fun TilesetDescriptorOptions.toTilesetDescriptorOptions(): com.mapbox.maps.TilesetDescriptorOptions {
+  val builder = com.mapbox.maps.TilesetDescriptorOptions.Builder()
+    .styleURI(styleURI)
+    .minZoom(minZoom.toByte())
+    .maxZoom(maxZoom.toByte())
+  pixelRatio?.let { builder.pixelRatio(it.toFloat()) }
+  tilesets?.let { builder.tilesets(it) }
+  stylePackOptions?.let { builder.stylePackOptions(it.toStylePackLoadOptions()) }
+  extraOptions?.let { builder.extraOptions(it.toValue()) }
+  return builder.build()
+}
+
+fun NetworkRestriction.toNetworkRestriction(): com.mapbox.common.NetworkRestriction {
+  return when (this) {
+    NetworkRestriction.DISALLOW_ALL -> com.mapbox.common.NetworkRestriction.DISALLOW_ALL
+    NetworkRestriction.DISALLOW_EXPENSIVE -> com.mapbox.common.NetworkRestriction.DISALLOW_EXPENSIVE
+    NetworkRestriction.NONE -> com.mapbox.common.NetworkRestriction.NONE
+  }
+}
+
+fun com.mapbox.common.TileRegion.toFLTTileRegion(): TileRegion {
+  return TileRegion(
+    this.id,
+    this.requiredResourceCount,
+    this.completedResourceCount,
+    this.completedResourceSize
+  )
+}
+
+fun TileRegionEstimateOptions.toTileRegionEstimateOptions(): com.mapbox.common.TileRegionEstimateOptions {
+  return com.mapbox.common.TileRegionEstimateOptions(
+    this.errorMargin.toFloat(),
+    this.preciseEstimationTimeout.toLong(),
+    this.preciseEstimationTimeout.toLong(),
+    this.extraOptions?.toValue()
+  )
+}
+
+fun com.mapbox.common.TileRegionEstimateResult.toFLTTileRegionEstimateResult(): TileRegionEstimateResult {
+  return TileRegionEstimateResult(
+    this.errorMargin, this.transferSize, this.storageSize,
+  )
+}
+
+fun com.mapbox.common.TileRegionLoadProgress.toFLTTileRegionLoadProgress(): TileRegionLoadProgress {
+  return TileRegionLoadProgress(
+    this.completedResourceCount,
+    this.completedResourceSize,
+    this.erroredResourceCount,
+    this.requiredResourceCount,
+    this.loadedResourceCount,
+    this.loadedResourceSize
+  )
+}
+
+fun com.mapbox.common.TileRegionEstimateProgress.toFLTTileRegionEstimateProgress(): TileRegionEstimateProgress {
+  return TileRegionEstimateProgress(
+    this.requiredResourceCount, this.completedResourceCount, this.erroredResourceCount
+  )
+}
+
 fun Expected<String, None>.handleResult(callback: (Result<Unit>) -> Unit) {
   if (this.isError) {
     callback(Result.failure(Throwable(this.error)))
   } else {
     callback(Result.success(Unit))
   }
+}
+
+@JvmName("toStylePackResult")
+fun <V : Any, NewValue> Expected<StylePackError, V>.toResult(valueTransform: (V) -> NewValue): Result<NewValue> {
+  return fold(
+    {
+      Result.failure(Throwable(it.message))
+    },
+    {
+      Result.success(valueTransform(it))
+    }
+  )
+}
+
+@JvmName("toTileRegionResult")
+fun <V : Any, NewValue> Expected<TileRegionError, V>.toResult(valueTransform: (V) -> NewValue): Result<NewValue> {
+  return fold(
+    {
+      Result.failure(Throwable(it.message))
+    },
+    {
+      Result.success(valueTransform(it))
+    }
+  )
+}
+
+fun Value.toFLTValue(): Any? {
+  return when (contents) {
+    is List<*> -> {
+      (contents as List<*>).map { (it as? Value)?.toFLTValue() ?: it }
+    }
+
+    is Map<*, *> -> {
+      (contents as Map<*, *>)
+        .mapKeys { (it.key as? Value)?.toFLTValue() ?: it.key }
+        .mapValues { (it.value as? Value)?.toFLTValue() ?: it.value }
+    }
+
+    else -> {
+      contents
+    }
+  }
+}
+
+fun Any.toValue(): Value {
+  return if (this is String) {
+    if (this.startsWith("{") || this.startsWith("[")) {
+      Value.fromJson(this).value!!
+    } else {
+      val number = this.toDoubleOrNull()
+      if (number != null) {
+        Value.valueOf(number)
+      } else {
+        Value.valueOf(this)
+      }
+    }
+  } else if (this is Double) {
+    Value.valueOf(this)
+  } else if (this is Long) {
+    Value.valueOf(this)
+  } else if (this is Int) {
+    Value.valueOf(this.toLong())
+  } else if (this is Boolean) {
+    Value.valueOf(this)
+  } else if (this is IntArray) {
+    val valueArray = this.map { Value(it.toLong()) }
+    Value(valueArray)
+  } else if (this is BooleanArray) {
+    val valueArray = this.map(::Value)
+    Value(valueArray)
+  } else if (this is DoubleArray) {
+    val valueArray = this.map(::Value)
+    Value(valueArray)
+  } else if (this is FloatArray) {
+    val valueArray = this.map { Value(it.toDouble()) }
+    Value(valueArray)
+  } else if (this is LongArray) {
+    val valueArray = this.map(::Value)
+    Value(valueArray)
+  } else if (this is Array<*>) {
+    val valueArray = this.map { it?.toValue() }
+    Value(valueArray)
+  } else if (this is List<*>) {
+    val valueArray = this.map { it?.toValue() }
+    Value(valueArray)
+  } else if (this is HashMap<*, *>) {
+    val valueMap = this
+      .mapKeys { it.key as? String }
+      .mapValues { it.value.toValue() }
+    Value.valueOf(kotlin.collections.HashMap(valueMap))
+  } else {
+    logE(
+      "StyleController",
+      "Can not map value, type is not supported: ${this::class.java.canonicalName}"
+    )
+    Value.valueOf("")
+  }
 }