feat: passing ClusterManager List to addClusterManagers, removing dummy id generation

Author: Samo8

android/src/main/kotlin/com/google/maps/flutter/navigation/messages.g.kt

@@ -900,9 +900,6 @@ data class MarkerOptionsDto(
   val visible: Boolean,
   val zIndex: Double,
   val icon: ImageDescriptorDto,
-  /**
-   * Optional cluster manager ID. If provided, this marker will be managed by the cluster manager.
-   */
   val clusterManagerId: String? = null,
 ) {
   companion object {

example/lib/pages/clustering.dart

@@ -119,13 +119,13 @@ class _ClusteringPageState extends ExamplePageState<ClusteringPage> {
     final clusterManagerId = 'cluster_manager_id_$_clusterManagerIdCounter';
     _clusterManagerIdCounter++;
 
+    final clusterManager = ClusterManager(clusterManagerId: clusterManagerId);
     final List<ClusterManager> addedClusterManagers =
-        await _navigationViewController!.addClusterManagers(<String>[
-          clusterManagerId,
+        await _navigationViewController!.addClusterManagers(<ClusterManager>[
+          clusterManager,
         ]);
 
     if (addedClusterManagers.isNotEmpty) {
-      final clusterManager = addedClusterManagers.first;
       setState(() {
         _clusterManagers[clusterManagerId] = clusterManager;
       });

ios/google_navigation_flutter/Sources/google_navigation_flutter/messages.g.swift

@@ -763,7 +763,6 @@ struct MarkerOptionsDto: Hashable {
   var visible: Bool
   var zIndex: Double
   var icon: ImageDescriptorDto
-  /// Optional cluster manager ID. If provided, this marker will be managed by the cluster manager.
   var clusterManagerId: String? = nil
 
   // swift-format-ignore: AlwaysUseLowerCamelCase

lib/src/google_maps_map_view_controller.dart

@@ -317,11 +317,11 @@ class GoogleMapViewController {
   /// Cluster managers group nearby markers into clusters at different zoom levels.
   /// Markers can be assigned to a cluster manager by setting their [MarkerOptions.clusterManagerId].
   Future<List<ClusterManager>> addClusterManagers(
-    List<String> clusterManagerIds,
+    List<ClusterManager> clusterManagers,
   ) {
     return GoogleMapsNavigationPlatform.instance.viewAPI.addClusterManagers(
       viewId: _viewId,
-      clusterManagerIds: clusterManagerIds,
+      clusterManagers: clusterManagers,
     );
   }
 

lib/src/method_channel/convert/clustering.dart

@@ -15,6 +15,24 @@
 import '../../../google_navigation_flutter.dart';
 import '../method_channel.dart';
 
+/// [ClusterManager] convert extension.
+/// @nodoc
+extension ConvertClusterManager on ClusterManager {
+  /// Converts [ClusterManager] to [ClusterManagerDto]
+  ClusterManagerDto toDto() {
+    return ClusterManagerDto(clusterManagerId: clusterManagerId);
+  }
+}
+
+/// [ClusterManagerDto] convert extension.
+/// @nodoc
+extension ConvertClusterManagerDto on ClusterManagerDto {
+  /// Converts [ClusterManagerDto] to [ClusterManager]
+  ClusterManager toClusterManager() {
+    return ClusterManager(clusterManagerId: clusterManagerId);
+  }
+}
+
 /// [ClusterEventTypeDto] convert extension.
 /// @nodoc
 extension ConvertClusterEventType on ClusterEventTypeDto {

lib/src/method_channel/map_view_api.dart

@@ -68,14 +68,6 @@ class MapViewAPIImpl {
     return circleId;
   }
 
-  /// Keep track of cluster manager count, used to generate cluster manager ID's.
-  int _clusterManagerCounter = 0;
-  String _createClusterManagerId() {
-    final String clusterManagerId = 'ClusterManager_$_clusterManagerCounter';
-    _clusterManagerCounter += 1;
-    return clusterManagerId;
-  }
-
   Stream<T> _unwrapEventStream<T>({required int viewId}) {
     // If event that does not
     return _viewEventStreamController.stream
@@ -890,28 +882,19 @@ class MapViewAPIImpl {
 
     return clusterManagers
         .whereType<ClusterManagerDto>()
-        .map(
-          (ClusterManagerDto cm) =>
-              ClusterManager(clusterManagerId: cm.clusterManagerId),
-        )
+        .map((ClusterManagerDto cm) => cm.toClusterManager())
         .toList();
   }
 
   /// Add cluster managers to map view.
   Future<List<ClusterManager>> addClusterManagers({
     required int viewId,
-    required List<String> clusterManagerIds,
+    required List<ClusterManager> clusterManagers,
   }) async {
-    // Create cluster manager objects with provided or generated ID's
-    final List<ClusterManagerDto> clusterManagersToAdd = clusterManagerIds
-        .map(
-          (String id) => ClusterManagerDto(
-            clusterManagerId: id.isEmpty ? _createClusterManagerId() : id,
-          ),
-        )
+    final List<ClusterManagerDto> clusterManagersToAdd = clusterManagers
+        .map((cm) => cm.toDto())
         .toList();
 
-    // Add cluster managers to map
     final List<ClusterManagerDto?> clusterManagersAdded = await _viewApi
         .addClusterManagers(viewId, clusterManagersToAdd);
 

lib/src/method_channel/messages.g.dart

@@ -821,7 +821,6 @@ class MarkerOptionsDto {
 
   ImageDescriptorDto icon;
 
-  /// Optional cluster manager ID. If provided, this marker will be managed by the cluster manager.
   String? clusterManagerId;
 
   List<Object?> _toList() {