[google_maps_flutter_ios] Add advanced marker support

Author: jokerttu

packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/integration_test/google_maps_test.dart

@@ -21,7 +21,7 @@ const CameraPosition _kInitialCameraPosition = CameraPosition(
   target: _kInitialMapCenter,
   zoom: _kInitialZoomLevel,
 );
-const String _kCloudMapId = '000000000000000'; // Dummy map ID.
+const String _kMapId = '000000000000000'; // Dummy map ID.
 
 // The tolerance value for floating-point comparisons in the tests.
 // This value was selected as the minimum possible value that the test passes.
@@ -1388,6 +1388,104 @@ void main() {
     }
   });
 
+  testWidgets('advanced markers clustering', (WidgetTester tester) async {
+    final Key key = GlobalKey();
+    const int clusterManagersAmount = 2;
+    const int markersPerClusterManager = 5;
+    final Map<MarkerId, AdvancedMarker> markers = <MarkerId, AdvancedMarker>{};
+    final Set<ClusterManager> clusterManagers = <ClusterManager>{};
+
+    for (int i = 0; i < clusterManagersAmount; i++) {
+      final ClusterManagerId clusterManagerId = ClusterManagerId(
+        'cluster_manager_$i',
+      );
+      final ClusterManager clusterManager = ClusterManager(
+        clusterManagerId: clusterManagerId,
+      );
+      clusterManagers.add(clusterManager);
+    }
+
+    for (final ClusterManager cm in clusterManagers) {
+      for (int i = 0; i < markersPerClusterManager; i++) {
+        final MarkerId markerId = MarkerId(
+          '${cm.clusterManagerId.value}_marker_$i',
+        );
+        final AdvancedMarker marker = AdvancedMarker(
+          markerId: markerId,
+          clusterManagerId: cm.clusterManagerId,
+          position: LatLng(
+            _kInitialMapCenter.latitude + i,
+            _kInitialMapCenter.longitude,
+          ),
+        );
+        markers[markerId] = marker;
+      }
+    }
+
+    final Completer<ExampleGoogleMapController> controllerCompleter =
+        Completer<ExampleGoogleMapController>();
+
+    final GoogleMapsInspectorPlatform inspector =
+        GoogleMapsInspectorPlatform.instance!;
+
+    await tester.pumpWidget(
+      Directionality(
+        textDirection: TextDirection.ltr,
+        child: ExampleGoogleMap(
+          key: key,
+          initialCameraPosition: _kInitialCameraPosition,
+          clusterManagers: clusterManagers,
+          markerType: MarkerType.advancedMarker,
+          markers: Set<Marker>.of(markers.values),
+          onMapCreated: (ExampleGoogleMapController googleMapController) {
+            controllerCompleter.complete(googleMapController);
+          },
+        ),
+      ),
+    );
+
+    final ExampleGoogleMapController controller =
+        await controllerCompleter.future;
+
+    for (final ClusterManager cm in clusterManagers) {
+      final List<Cluster> clusters = await inspector.getClusters(
+        mapId: controller.mapId,
+        clusterManagerId: cm.clusterManagerId,
+      );
+      final int markersAmountForClusterManager = clusters
+          .map<int>((Cluster cluster) => cluster.count)
+          .reduce((int value, int element) => value + element);
+      expect(markersAmountForClusterManager, markersPerClusterManager);
+    }
+
+    // Remove markers from clusterManagers and test that clusterManagers are empty.
+    for (final MapEntry<MarkerId, AdvancedMarker> entry in markers.entries) {
+      markers[entry.key] = _copyAdvancedMarkerWithClusterManagerId(
+        entry.value,
+        null,
+      );
+    }
+    await tester.pumpWidget(
+      Directionality(
+        textDirection: TextDirection.ltr,
+        child: ExampleGoogleMap(
+          key: key,
+          initialCameraPosition: _kInitialCameraPosition,
+          clusterManagers: clusterManagers,
+          markers: Set<Marker>.of(markers.values),
+        ),
+      ),
+    );
+
+    for (final ClusterManager cm in clusterManagers) {
+      final List<Cluster> clusters = await inspector.getClusters(
+        mapId: controller.mapId,
+        clusterManagerId: cm.clusterManagerId,
+      );
+      expect(clusters.length, 0);
+    }
+  });
+
   testWidgets('testSetStyleMapId', (WidgetTester tester) async {
     final Key key = GlobalKey();
 
@@ -1397,7 +1495,7 @@ void main() {
         child: ExampleGoogleMap(
           key: key,
           initialCameraPosition: _kInitialCameraPosition,
-          cloudMapId: _kCloudMapId,
+          mapId: _kMapId,
         ),
       ),
     );
@@ -2099,6 +2197,39 @@ void main() {
     // Hanging in CI, https://github.com/flutter/flutter/issues/166139
     skip: true,
   );
+
+  testWidgets('markerWithPinConfig', (WidgetTester tester) async {
+    final Set<AdvancedMarker> markers = <AdvancedMarker>{
+      AdvancedMarker(
+        markerId: const MarkerId('1'),
+        icon: BitmapDescriptor.pinConfig(
+          backgroundColor: Colors.green,
+          borderColor: Colors.greenAccent,
+          glyph: const TextGlyph(text: 'A', textColor: Colors.white),
+        ),
+      ),
+    };
+
+    final Completer<ExampleGoogleMapController> controllerCompleter =
+        Completer<ExampleGoogleMapController>();
+
+    await tester.pumpWidget(
+      Directionality(
+        textDirection: ui.TextDirection.ltr,
+        child: ExampleGoogleMap(
+          initialCameraPosition: const CameraPosition(
+            target: LatLng(10.0, 20.0),
+          ),
+          markers: markers,
+          markerType: MarkerType.advancedMarker,
+          onMapCreated: (ExampleGoogleMapController controller) =>
+              controllerCompleter.complete(controller),
+        ),
+      ),
+    );
+    await tester.pumpAndSettle();
+    await controllerCompleter.future;
+  });
 }
 
 class _DebugTileProvider implements TileProvider {
@@ -2285,3 +2416,29 @@ Future<void> _checkCameraUpdateByType(
       expect(currentPosition.zoom, wrapMatcher(equals(_kInitialZoomLevel - 1)));
   }
 }
+
+AdvancedMarker _copyAdvancedMarkerWithClusterManagerId(
+  AdvancedMarker marker,
+  ClusterManagerId? clusterManagerId,
+) {
+  return AdvancedMarker(
+    markerId: marker.markerId,
+    alpha: marker.alpha,
+    anchor: marker.anchor,
+    consumeTapEvents: marker.consumeTapEvents,
+    draggable: marker.draggable,
+    flat: marker.flat,
+    icon: marker.icon,
+    infoWindow: marker.infoWindow,
+    position: marker.position,
+    rotation: marker.rotation,
+    visible: marker.visible,
+    zIndex: marker.zIndex.toInt(),
+    onTap: marker.onTap,
+    onDragStart: marker.onDragStart,
+    onDrag: marker.onDrag,
+    onDragEnd: marker.onDragEnd,
+    clusterManagerId: clusterManagerId,
+    collisionBehavior: marker.collisionBehavior,
+  );
+}

packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerTests/FGMClusterManagersControllerTests.m

@@ -35,7 +35,8 @@ - (void)testClustering {
       [[FLTMarkersController alloc] initWithMapView:mapView
                                     callbackHandler:handler
                           clusterManagersController:clusterManagersController
-                                          registrar:registrar];
+                                          registrar:registrar
+                                         markerType:FGMPlatformMarkerTypeMarker];
 
   // Add cluster managers.
   NSString *clusterManagerId = @"cm";
@@ -71,7 +72,8 @@ - (void)testClustering {
                                                         visible:YES
                                                          zIndex:1
                                                        markerId:markerId1
-                                               clusterManagerId:clusterManagerId];
+                                               clusterManagerId:clusterManagerId
+                                              collisionBehavior:NULL];
   FGMPlatformMarker *marker2 = [FGMPlatformMarker makeWithAlpha:1
                                                          anchor:zeroPoint
                                                consumeTapEvents:NO
@@ -84,7 +86,8 @@ - (void)testClustering {
                                                         visible:YES
                                                          zIndex:1
                                                        markerId:markerId2
-                                               clusterManagerId:clusterManagerId];
+                                               clusterManagerId:clusterManagerId
+                                              collisionBehavior:NULL];
 
   [markersController addMarkers:@[ marker1, marker2 ]];