[google_maps_flutter] Update google_maps_flutter to 2.10.0 (#816)

Author: JSUYA

packages/google_maps_flutter/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.11
+
+* Update google_maps_flutter to 2.10.0.
+* Update google_maps_flutter_platform_interface to 2.10.0.
+* Updates minimum supported SDK version to Flutter 3.22/Dart 3.4.
+
 ## 0.1.10
 
 * Update webview_flutter_lwe to 0.3.7.

packages/google_maps_flutter/README.md

@@ -20,8 +20,8 @@ This package is not an _endorsed_ implementation of `google_maps_flutter`. There
 
 ```yaml
 dependencies:
-  google_maps_flutter: ^2.7.0
-  google_maps_flutter_tizen: ^0.1.10
+  google_maps_flutter: ^2.10.0
+  google_maps_flutter_tizen: ^0.1.11
 ```
 
 For detailed usage, see https://pub.dev/packages/google_maps_flutter#sample-usage.
@@ -36,4 +36,4 @@ In addition, you need a Maps JavaScript API Key to use this plugin. You can get
 
 - This plugin was implemented using the [Google JavaScript API](https://developers.google.com/maps/documentation/javascript/overview).
 The Marker feature uses the [Legacy API](https://developers.google.com/maps/documentation/javascript/markers). Depending on the Deprecate plan of the JavaScript API, some parts may not work.
-- The [marker clustering feature](https://pub.dev/packages/google_maps_flutter_platform_interface/changelog#260) is not yet supported.
+- [Marker clustering features](https://pub.dev/packages/google_maps_flutter_platform_interface/changelog#260), [heatmap layers](https://pub.dev/packages/google_maps_flutter_platform_interface/changelog#290), and tile overlays are not yet supported.

packages/google_maps_flutter/example/integration_test/src/maps_controller.dart

@@ -93,7 +93,7 @@ void runTests() {
         },
       ),
     );
-    await tester.pumpAndSettle(const Duration(seconds: 3));
+    await tester.pumpAndSettle();
     final GoogleMapController mapController =
         await mapControllerCompleter.future;
 
@@ -161,6 +161,8 @@ void runTests() {
 
     const String mapStyle =
         '[{"elementType":"geometry","stylers":[{"color":"#242f3e"}]}]';
+    // Intentionally testing the deprecated code path.
+    // ignore: deprecated_member_use
     await controller.setMapStyle(mapStyle);
   });
 
@@ -183,6 +185,8 @@ void runTests() {
     final GoogleMapController controller = await controllerCompleter.future;
 
     try {
+      // Intentionally testing the deprecated code path.
+      // ignore: deprecated_member_use
       await controller.setMapStyle('invalid_value');
       fail('expected MapStyleException');
     } on MapStyleException catch (e) {
@@ -207,6 +211,8 @@ void runTests() {
     );
     final GoogleMapController controller = await controllerCompleter.future;
 
+    // Intentionally testing the deprecated code path.
+    // ignore: deprecated_member_use
     await controller.setMapStyle(null);
   });
 
@@ -231,7 +237,7 @@ void runTests() {
     // TODO(cyanglaz): Remove this after we added `mapRendered` callback, and `mapControllerCompleter.complete(controller)` above should happen
     // in `mapRendered`.
     // https://github.com/flutter/flutter/issues/54758
-    await Future<void>.delayed(const Duration(seconds: 3));
+    await Future<void>.delayed(const Duration(seconds: 1));
 
     final LatLngBounds visibleRegion = await controller.getVisibleRegion();
     final LatLng topLeft =
@@ -265,7 +271,7 @@ void runTests() {
     // TODO(cyanglaz): Remove this after we added `mapRendered` callback, and `mapControllerCompleter.complete(controller)` above should happen
     // in `mapRendered`.
     // https://github.com/flutter/flutter/issues/54758
-    await Future<void>.delayed(const Duration(seconds: 3));
+    await Future<void>.delayed(const Duration(seconds: 1));
 
     double zoom = await controller.getZoomLevel();
     expect(zoom, kInitialZoomLevel);
@@ -299,7 +305,7 @@ void runTests() {
     // TODO(cyanglaz): Remove this after we added `mapRendered` callback, and `mapControllerCompleter.complete(controller)` above should happen
     // in `mapRendered`.
     // https://github.com/flutter/flutter/issues/54758
-    await Future<void>.delayed(const Duration(seconds: 3));
+    await Future<void>.delayed(const Duration(seconds: 1));
 
     final LatLngBounds visibleRegion = await controller.getVisibleRegion();
     final LatLng northWest = LatLng(
@@ -346,7 +352,7 @@ void runTests() {
     // TODO(cyanglaz): Remove this after we added `mapRendered` callback, and `mapControllerCompleter.complete(controller)` above should happen
     // in `mapRendered`.
     // https://github.com/flutter/flutter/issues/54758
-    await Future<void>.delayed(const Duration(seconds: 3));
+    await Future<void>.delayed(const Duration(seconds: 1));
 
     // Simple call to make sure that the app hasn't crashed.
     final LatLngBounds bounds1 = await controller.getVisibleRegion();
@@ -381,7 +387,7 @@ void runTests() {
     // https://github.com/flutter/flutter/issues/131783. It may be related
     // to https://github.com/flutter/flutter/issues/54758 and should be
     // re-evaluated when that issue is fixed.
-    await Future<void>.delayed(const Duration(seconds: 3));
+    await Future<void>.delayed(const Duration(seconds: 1));
 
     bool iwVisibleStatus =
         await controller.isMarkerInfoWindowShown(marker.markerId);
@@ -470,6 +476,8 @@ void runTests() {
     final Set<Marker> markers = <Marker>{
       Marker(
           markerId: const MarkerId('1'),
+          // Intentionally testing the deprecated code path.
+          // ignore: deprecated_member_use
           icon: await BitmapDescriptor.fromAssetImage(
             imageConfiguration,
             'assets/red_square.png',
@@ -492,6 +500,8 @@ void runTests() {
     final Set<Marker> markers = <Marker>{
       Marker(
           markerId: const MarkerId('1'),
+          // Intentionally testing the deprecated code path.
+          // ignore: deprecated_member_use
           icon: BitmapDescriptor.fromBytes(
             bytes,
             size: const Size(100, 100),
@@ -527,7 +537,7 @@ void runTests() {
     final Uint8List? bytes = await controller.takeSnapshot();
     expect(bytes?.isNotEmpty, true);
   },
-      // // In Tizen, TakeSnapshot is not supported.
+      // In Tizen, TakeSnapshot is not supported.
       skip: true);
 
   testWidgets(
@@ -552,7 +562,7 @@ void runTests() {
       // Await mapIdCompleter to finish to make sure map can be created with cloudMapId
       await mapIdCompleter.future;
     },
-    // // In Tizen, CloudMap is not supported.
+    // In Tizen, CloudMap is not supported.
     skip: true,
   );
 

packages/google_maps_flutter/example/integration_test/src/maps_inspector.dart

@@ -533,4 +533,106 @@ void runTests() {
       expect(myLocationButtonEnabled, true);
     });
   }, skip: !isIOS);
+
+  testWidgets('marker clustering', (WidgetTester tester) async {
+    final Key key = GlobalKey();
+    const int clusterManagersAmount = 2;
+    const int markersPerClusterManager = 5;
+    final Map<MarkerId, Marker> markers = <MarkerId, Marker>{};
+    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 Marker marker = Marker(
+            markerId: markerId,
+            clusterManagerId: cm.clusterManagerId,
+            position: LatLng(
+                kInitialMapCenter.latitude + i, kInitialMapCenter.longitude));
+        markers[markerId] = marker;
+      }
+    }
+
+    final Completer<GoogleMapController> controllerCompleter =
+        Completer<GoogleMapController>();
+
+    await pumpMap(
+      tester,
+      GoogleMap(
+        key: key,
+        initialCameraPosition: kInitialCameraPosition,
+        clusterManagers: clusterManagers,
+        markers: Set<Marker>.of(markers.values),
+        onMapCreated: (GoogleMapController googleMapController) {
+          controllerCompleter.complete(googleMapController);
+        },
+      ),
+    );
+
+    final GoogleMapController controller = await controllerCompleter.future;
+
+    final GoogleMapsInspectorPlatform inspector =
+        GoogleMapsInspectorPlatform.instance!;
+
+    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, Marker> entry in markers.entries) {
+      markers[entry.key] = _copyMarkerWithClusterManagerId(entry.value, null);
+    }
+
+    await pumpMap(
+      tester,
+      GoogleMap(
+          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);
+    }
+  });
+}
+
+Marker _copyMarkerWithClusterManagerId(
+    Marker marker, ClusterManagerId? clusterManagerId) {
+  return Marker(
+    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,
+    onTap: marker.onTap,
+    onDragStart: marker.onDragStart,
+    onDrag: marker.onDrag,
+    onDragEnd: marker.onDragEnd,
+    clusterManagerId: clusterManagerId,
+  );
 }