Remove isAdvanced flag from AdvancedMarker class

Author: aednlaxer

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.
@@ -1138,7 +1138,7 @@ void main() {
       child: ExampleGoogleMap(
         key: key,
         initialCameraPosition: _kInitialCameraPosition,
-        cloudMapId: _kCloudMapId,
+        mapId: _kMapId,
       ),
     ));
   });

packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/lib/example_google_map.dart

@@ -272,7 +272,6 @@ class ExampleGoogleMap extends StatefulWidget {
     this.onTap,
     this.onLongPress,
     this.mapId,
-    @Deprecated('cloudMapId is deprecated. Use mapId instead') this.cloudMapId,
     this.style,
   });
 
@@ -382,13 +381,6 @@ class ExampleGoogleMap extends StatefulWidget {
   /// for more details.
   final String? mapId;
 
-  /// Identifier that's associated with a specific cloud-based map style.
-  ///
-  /// See https://developers.google.com/maps/documentation/get-map-id
-  /// for more details.
-  @Deprecated('cloudMapId is deprecated. Use mapId instead')
-  final String? cloudMapId;
-
   /// The locally configured style for the map.
   final String? style;
 
@@ -613,7 +605,7 @@ MapConfiguration _configurationFromMapWidget(ExampleGoogleMap map) {
     indoorViewEnabled: map.indoorViewEnabled,
     trafficEnabled: map.trafficEnabled,
     buildingsEnabled: map.buildingsEnabled,
-    mapId: map.mapId ?? map.cloudMapId,
+    mapId: map.mapId,
     style: map.style,
   );
 }

packages/google_maps_flutter/google_maps_flutter_ios/example/shared/maps_example_dart/lib/map_map_id.dart

@@ -54,7 +54,7 @@ class MapIdBodyState extends State<MapIdBody> {
         zoom: 7.0,
       ),
       key: _key,
-      cloudMapId: _mapId,
+      mapId: _mapId,
     );
 
     final List<Widget> columnChildren = <Widget>[

packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapController.m

@@ -162,6 +162,7 @@ - (instancetype)initWithMapView:(GMSMapView *_Nonnull)mapView
     NSString *pigeonSuffix = [NSString stringWithFormat:@"%lld", viewId];
     _dartCallbackHandler = [[FGMMapsCallbackApi alloc] initWithBinaryMessenger:registrar.messenger
                                                           messageChannelSuffix:pigeonSuffix];
+    FGMPlatformMarkerType markerType = creationParameters.markerType;
     _mapView.delegate = self;
     _mapView.paddingAdjustmentBehavior = kGMSMapViewPaddingAdjustmentBehaviorNever;
     _registrar = registrar;
@@ -171,7 +172,8 @@ - (instancetype)initWithMapView:(GMSMapView *_Nonnull)mapView
     _markersController = [[FLTMarkersController alloc] initWithMapView:_mapView
                                                        callbackHandler:_dartCallbackHandler
                                              clusterManagersController:_clusterManagersController
-                                                             registrar:registrar];
+                                                             registrar:registrar
+                                                            markerType:markerType];
     _polygonsController = [[FLTPolygonsController alloc] initWithMapView:_mapView
                                                          callbackHandler:_dartCallbackHandler
                                                                registrar:registrar];

packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapMarkerController.h

@@ -28,7 +28,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)initWithMapView:(GMSMapView *)mapView
                 callbackHandler:(FGMMapsCallbackApi *)callbackHandler
       clusterManagersController:(nullable FGMClusterManagersController *)clusterManagersController
-                      registrar:(NSObject<FlutterPluginRegistrar> *)registrar;
+                      registrar:(NSObject<FlutterPluginRegistrar> *)registrar
+                     markerType:(FGMPlatformMarkerType)markerType;
 - (void)addMarkers:(NSArray<FGMPlatformMarker *> *)markersToAdd;
 - (void)changeMarkers:(NSArray<FGMPlatformMarker *> *)markersToChange;
 - (void)removeMarkersWithIdentifiers:(NSArray<NSString *> *)identifiers;

packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapMarkerController.m

@@ -147,6 +147,7 @@ @interface FLTMarkersController ()
 @property(weak, nonatomic, nullable) FGMClusterManagersController *clusterManagersController;
 @property(weak, nonatomic) NSObject<FlutterPluginRegistrar> *registrar;
 @property(weak, nonatomic) GMSMapView *mapView;
+@property(nonatomic) FGMPlatformMarkerType markerType;
 
 @end
 
@@ -155,14 +156,16 @@ @implementation FLTMarkersController
 - (instancetype)initWithMapView:(GMSMapView *)mapView
                 callbackHandler:(FGMMapsCallbackApi *)callbackHandler
       clusterManagersController:(nullable FGMClusterManagersController *)clusterManagersController
-                      registrar:(NSObject<FlutterPluginRegistrar> *)registrar {
+                      registrar:(NSObject<FlutterPluginRegistrar> *)registrar
+                     markerType:(FGMPlatformMarkerType)markerType {
   self = [super init];
   if (self) {
     _callbackHandler = callbackHandler;
     _mapView = mapView;
     _clusterManagersController = clusterManagersController;
     _markerIdentifierToController = [[NSMutableDictionary alloc] init];
     _registrar = registrar;
+    _markerType = markerType;
   }
   return self;
 }
@@ -177,9 +180,9 @@ - (void)addMarker:(FGMPlatformMarker *)markerToAdd {
   CLLocationCoordinate2D position = FGMGetCoordinateForPigeonLatLng(markerToAdd.position);
   NSString *markerIdentifier = markerToAdd.markerId;
   NSString *clusterManagerIdentifier = markerToAdd.clusterManagerId;
-  NSNumber *isAdvanced = markerToAdd[@"isAdvanced"];
-  GMSMarker *marker = isAdvanced ? [GMSAdvancedMarker markerWithPosition:position]
-                                 : [GMSMarker markerWithPosition:position];
+    GMSMarker *marker = (self.markerType == FGMPlatformMarkerTypeAdvanced)
+                          ? [GMSAdvancedMarker markerWithPosition:position]
+                          : [GMSMarker markerWithPosition:position];
 
   FLTGoogleMapMarkerController *controller =
       [[FLTGoogleMapMarkerController alloc] initWithMarker:marker

packages/google_maps_flutter/google_maps_flutter_ios/lib/src/google_maps_flutter_ios.dart

@@ -524,6 +524,8 @@ class GoogleMapsFlutterIOS extends GoogleMapsFlutterPlatform {
       initialGroundOverlays: mapObjects.groundOverlays
           .map(_platformGroundOverlayFromGroundOverlay)
           .toList(),
+      markerType:
+          _platformMarkerTypeFromMarkerType(widgetConfiguration.markerType),
     );
 
     return UiKitView(
@@ -773,6 +775,14 @@ class GoogleMapsFlutterIOS extends GoogleMapsFlutterPlatform {
         identifier: clusterManager.clusterManagerId.value);
   }
 
+  static PlatformMarkerType _platformMarkerTypeFromMarkerType(
+      MarkerType markerType) {
+    return switch (markerType) {
+      MarkerType.legacy => PlatformMarkerType.legacy,
+      MarkerType.advanced => PlatformMarkerType.advanced,
+    };
+  }
+
   static PlatformCameraUpdate _platformCameraUpdateFromCameraUpdate(
       CameraUpdate update) {
     switch (update.updateType) {

packages/google_maps_flutter/google_maps_flutter_ios/pigeons/messages.dart

@@ -399,6 +399,7 @@ class PlatformMapViewCreationParams {
     required this.initialTileOverlays,
     required this.initialClusterManagers,
     required this.initialGroundOverlays,
+    required this.markerType,
   });
 
   final PlatformCameraPosition initialCameraPosition;

packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/method_channel/method_channel_google_maps_flutter.dart

@@ -556,6 +556,7 @@ class MethodChannelGoogleMapsFlutter extends GoogleMapsFlutterPlatform {
       'circlesToAdd': serializeCircleSet(mapObjects.circles),
       'heatmapsToAdd': serializeHeatmapSet(mapObjects.heatmaps),
       'tileOverlaysToAdd': serializeTileOverlaySet(mapObjects.tileOverlays),
+      'markerType': widgetConfiguration.markerType.index,
     };
 
     if (defaultTargetPlatform == TargetPlatform.android) {

packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/advanced_marker.dart

@@ -109,11 +109,6 @@ class AdvancedMarker extends Marker {
       }
     }
 
-    // Add a flag indicating that this is an advanced marker. This might be used
-    // by platform implementations to distinguish between legacy and advanced
-    // markers
-    addIfPresent('isAdvanced', true);
-
     addIfPresent('markerId', markerId.value);
     addIfPresent('alpha', alpha);
     addIfPresent('anchor', offsetToJson(anchor));