Expose LineJoin.NONE (#613)

* Bump Maps SDK to 11.5.0 * Expose LineJoin.NONE * Replace plugin references with SDK. (#614) * Bump version to 2.1.0 (#615) * Replace plugin references with SDK. * Bump version to 2.1.0 * Update changelog
mapbox · Jul 9, 2024 · 776f68b · 776f68b
1 parent e99cca7
commit 776f68b
Show file tree

Hide file tree

Showing 15 changed files with 68 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,39 @@
-### main
+### 2.1.0
 
-* Bump Maps SDK to 11.5.0.
+* 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]
+  ],
+);
+```
+* 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.
+* Expose `LineJoin.NONE`.
+* Bump Maps SDK to 11.5.0 for Android and 11.5.1 for iOS.
 
 ### 2.1.0-rc.1
 

diff --git a/LICENSE b/LICENSE
@@ -1,12 +1,12 @@
 ### License
 
-Mapbox Maps Flutter Plugin
+Mapbox Maps Flutter SDK
 
 Copyright © 2022 - 2023 Mapbox, Inc. All rights reserved.
 
 The software and files in this repository (collectively, “Software”) are licensed under the Mapbox TOS for use only with the relevant Mapbox product(s) listed at www.mapbox.com/pricing. This license allows developers with a current active Mapbox account to use and modify the authorized portions of the Software as needed for use only with the relevant Mapbox product(s) through their Mapbox account in accordance with the Mapbox TOS.  This license terminates automatically if a developer no longer has a Mapbox account in good standing or breaches the Mapbox TOS. For the license terms, please see the Mapbox TOS at https://www.mapbox.com/legal/tos/ which incorporates the Mapbox Product Terms at www.mapbox.com/legal/service-terms.  If this Software is a SDK, modifications that change or interfere with marked portions of the code related to billing, accounting, or data collection are not authorized and the SDK sends limited de-identified location and usage data which is used in accordance with the Mapbox TOS. [Updated 2023-01]
 
-## Additional Mapbox Maps Flutter Plugin licenses
+## Additional Mapbox Maps Flutter SDK licenses
 
 [enum_to_string](https://pub.dev/packages/enum_to_string).
 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# Mapbox Maps SDK Flutter Plugin
+# Mapbox Maps SDK Flutter SDK
 
-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.
+The Mapbox Maps SDK Flutter SDK is an officially developed solution from Mapbox that enables use of our latest Maps SDK product (v11.5.0). The SDK allows developers to embed highly customized maps using a Flutter widget on Android and iOS.
 
 Web and desktop are not supported. 
 
@@ -44,7 +44,7 @@ Contributions welcome!
 
 ## Requirements
 
-The Maps Flutter Plugin is compatible with applications:
+The Maps Flutter SDK is compatible with applications:
 
 - Deployed on iOS 12 or higher
 - Built using the Android SDK 21 or higher
@@ -53,7 +53,7 @@ The Maps Flutter Plugin is compatible with applications:
 ## Installation
 
 ### Configure credentials
-To run the Maps Flutter Plugin you will need to configure the Mapbox Access Tokens. 
+To run the Maps Flutter SDK you will need to configure the Mapbox Access Tokens. 
 Read more about access tokens and public/secret scopes at the platform [Android](https://docs.mapbox.com/android/maps/guides/install/#configure-credentials) or [iOS](https://docs.mapbox.com/ios/maps/guides/install/#configure-credentials) docs.
 
 #### Secret token
@@ -70,7 +70,7 @@ To access platform SDKs you will need to create a secret access token with the `
 ```
 
 #### Public token
-You can set the access token for Mapbox Maps Flutter Plugin(as well as for every Mapbox SDK) via `MapboxOptions`:
+You can set the access token for Mapbox Maps Flutter SDK(as well as for every Mapbox SDK) via `MapboxOptions`:
 ```
   MapboxOptions.setAccessToken(ACCESS_TOKEN);
 ```
@@ -107,15 +107,15 @@ String ACCESS_TOKEN = String.fromEnvironment("ACCESS_TOKEN");
 ```
 
 ### Add the dependency
-To use the Maps Flutter Plugin add the git dependency to the pubspec.yaml:
+To use the Maps Flutter SDK add the git dependency to the pubspec.yaml:
 
 ```
 dependencies:
-  mapbox_maps_flutter: ^2.1.0-rc.1
+  mapbox_maps_flutter: ^2.1.0
 ```
 
 ### Configure permissions
-You will need to grant location permission in order to use the location component of the Maps Flutter Plugin.
+You will need to grant location permission in order to use the location component of the Maps Flutter SDK.
 
 You can use an existing library to request location permission, e.g. with [permission_handler](https://pub.dev/packages/permission_handler) `await Permission.locationWhenInUse.request();` will trigger permission request. 
 
@@ -155,7 +155,7 @@ It also allows or add listeners for various events - related to style loading, m
 #### MapboxMap controller
 The `MapboxMap` controller instance is provided with `MapWidget.onMapCreated` callback.
 
-`MapboxMap` exposes an entry point to the most of the APIs Maps Flutter Plugin provides. It allows to control the map, camera, styles, observe map events, 
+`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.5.0/mapbox-maps-android/com.mapbox.maps/-mapbox-map/) and [iOS](https://docs.mapbox.com/ios/maps/api/11.5.0/documentation/mapboxmaps/mapboxmap) counterparts.
@@ -237,7 +237,7 @@ You can find more examples of the AnnotationManagers usage in the sample app : [
 ## Map styles
 Platform docs : [Android](https://docs.mapbox.com/android/maps/guides/styles/), [iOS](https://docs.mapbox.com/ios/maps/guides/styles/).
 
-The Mapbox Maps Flutter Plugin allows full customization of the look of the map used in your application. 
+The Mapbox Maps Flutter SDK allows full customization of the look of the map used in your application. 
 
 ### Set a style
 You can specify the initial style uri at `MapWidget.styleUri`, or load it at runtime using `MapboxMap.loadStyleURI` / `MapboxMap.loadStyleJson` : 
@@ -276,7 +276,7 @@ To apply an expression to interpolate gradient color to a line layer:
 
 ## Camera and animations
 Platform docs : [Android](https://docs.mapbox.com/android/maps/guides/camera-and-animation/), [iOS](https://docs.mapbox.com/ios/maps/guides/camera-and-animation/). 
-The camera is the user's viewpoint above the map. The Maps Flutter Plugin provides you with options to set and adjust the camera position, listen for camera changes, get the camera position, and restrict the camera position to set bounds.
+The camera is the user's viewpoint above the map. The Maps Flutter SDK provides you with options to set and adjust the camera position, listen for camera changes, get the camera position, and restrict the camera position to set bounds.
 
 ### Camera position
 You can set the starting camera position using `MapWidget.cameraOptions` :

diff --git a/...c/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolylineAnnotationEnumsExtensions.kt b/...c/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolylineAnnotationEnumsExtensions.kt
@@ -17,6 +17,7 @@ fun LineJoin.toLineJoin(): com.mapbox.maps.extension.style.layers.properties.gen
     LineJoin.BEVEL -> com.mapbox.maps.extension.style.layers.properties.generated.LineJoin.BEVEL
     LineJoin.ROUND -> com.mapbox.maps.extension.style.layers.properties.generated.LineJoin.ROUND
     LineJoin.MITER -> com.mapbox.maps.extension.style.layers.properties.generated.LineJoin.MITER
+    LineJoin.NONE -> com.mapbox.maps.extension.style.layers.properties.generated.LineJoin.NONE
     else -> throw(RuntimeException("Unsupported LineJoin: $this"))
   }
 }
@@ -43,6 +44,7 @@ fun com.mapbox.maps.extension.style.layers.properties.generated.LineJoin.toFLTLi
     com.mapbox.maps.extension.style.layers.properties.generated.LineJoin.BEVEL -> LineJoin.BEVEL
     com.mapbox.maps.extension.style.layers.properties.generated.LineJoin.ROUND -> LineJoin.ROUND
     com.mapbox.maps.extension.style.layers.properties.generated.LineJoin.MITER -> LineJoin.MITER
+    com.mapbox.maps.extension.style.layers.properties.generated.LineJoin.NONE -> LineJoin.NONE
     else -> throw(RuntimeException("Unsupported LineJoin: $this"))
   }
 }

diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PolylineAnnotationMessenger.kt b/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/pigeons/PolylineAnnotationMessenger.kt
@@ -66,7 +66,9 @@ enum class LineJoin(val raw: Int) {
   /** A join with a rounded end which is drawn beyond the endpoint of the line at a radius of one-half of the line's width and centered on the endpoint of the line. */
   ROUND(1),
   /** A join with a sharp, angled corner which is drawn with the outer sides beyond the endpoint of the path until they meet. */
-  MITER(2);
+  MITER(2),
+  /** Line segments are not joined together, each one creates a separate line. Useful in combination with line-pattern. Line-cap property is not respected. Can't be used with data-driven styling. */
+  NONE(3);
 
   companion object {
     fun ofRaw(raw: Int): LineJoin? {

diff --git a/example/README.md b/example/README.md
@@ -1,6 +1,6 @@
 # mapbox_maps_example
 
-Demonstrates how to use the mapbox_maps plugin.
+Demonstrates how to use the Mapbox Maps Flutter SDK.
 
 ## Getting Started
 

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -2,7 +2,7 @@ PODS:
   - Flutter (1.0.0)
   - integration_test (0.0.1):
     - Flutter
-  - mapbox_maps_flutter (2.1.0-rc.1):
+  - mapbox_maps_flutter (2.1.0):
     - Flutter
     - MapboxMaps (~> 11.5.1)
     - Turf (= 2.8.0)
@@ -49,7 +49,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   integration_test: ce0a3ffa1de96d1a89ca0ac26fca7ea18a749ef4
-  mapbox_maps_flutter: 07bd5180ffcd126dc5b44556654a14475ade81d2
+  mapbox_maps_flutter: c7e9ddad4b3e7e68397fc0f8643ff408913dc44f
   MapboxCommon: c69a04a1accd77650372c96d8978a15ed1d95186
   MapboxCoreMaps: 9d8833b738b94d63ee842722641e8cfdc1fa1191
   MapboxMaps: 24a52620178b5390373489c083d4a3acd319c1d3

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -192,7 +192,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.1.0-rc.1"
+    version: "2.1.0"
   matcher:
     dependency: transitive
     description:

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -1,5 +1,5 @@
 name: mapbox_maps_example
-description: Demonstrates how to use the mapbox_maps_flutter plugin.
+description: Demonstrates how to use the Mapbox Maps Flutter SDK.
 version: "1.0.0-beta.1"
 
 # The following line prevents the package from being accidentally published to

diff --git a/ios/Classes/EnumsMapping.swift b/ios/Classes/EnumsMapping.swift
@@ -50,6 +50,7 @@ extension MapboxMaps.LineJoin {
         case .bEVEL: self = .bevel
         case .rOUND: self = .round
         case .mITER: self = .miter
+        case .nONE: self = .none
         }
     }
 
@@ -58,6 +59,7 @@ extension MapboxMaps.LineJoin {
         case .bevel: return .bEVEL
         case .round: return .rOUND
         case .miter: return .mITER
+        case .none: return .nONE
         default: return nil
         }
     }

diff --git a/ios/Classes/Generated/PolylineAnnotationMessenger.swift b/ios/Classes/Generated/PolylineAnnotationMessenger.swift
@@ -64,6 +64,8 @@ enum LineJoin: Int {
   case rOUND = 1
   /// A join with a sharp, angled corner which is drawn with the outer sides beyond the endpoint of the path until they meet.
   case mITER = 2
+  /// Line segments are not joined together, each one creates a separate line. Useful in combination with line-pattern. Line-cap property is not respected. Can't be used with data-driven styling.
+  case nONE = 3
 }
 
 /// Controls the frame of reference for `line-translate`.

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

diff --git a/lib/src/map_widget.dart b/lib/src/map_widget.dart
@@ -187,7 +187,7 @@ class _MapWidgetState extends State<MapWidget> {
       'textureView': widget.textureView,
       'styleUri': widget.styleUri,
       'channelSuffix': _suffix,
-      'mapboxPluginVersion': '2.1.0-rc.1',
+      'mapboxPluginVersion': '2.1.0',
       'eventTypes': _events.eventTypes.map((e) => e.index).toList(),
     };
 

diff --git a/lib/src/pigeons/polyline_annotation_messenger.dart b/lib/src/pigeons/polyline_annotation_messenger.dart
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: mapbox_maps_flutter
-description: A Flutter plugin for integrating Mapbox Maps SDK v11 in Android/iOS application.
-version: 2.1.0-rc.1
+description: Interactive, thoroughly customizable maps powered by Mapbox Maps mobile SDKs.
+version: 2.1.0
 homepage: https://github.com/mapbox/mapbox-maps-flutter
 
 environment: