Remove cloudMapId field

Author: aednlaxer

packages/google_maps_flutter/google_maps_flutter_android/lib/src/google_maps_flutter_android.dart

@@ -1307,7 +1307,7 @@ PlatformMapConfiguration _platformMapConfigurationFromMapConfiguration(
     trafficEnabled: config.trafficEnabled,
     buildingsEnabled: config.buildingsEnabled,
     liteModeEnabled: config.liteModeEnabled,
-    mapId: config.mapId ?? config.cloudMapId,
+    mapId: config.mapId,
     style: config.style,
   );
 }

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

@@ -35,10 +35,11 @@ class MapConfiguration {
     this.indoorViewEnabled,
     this.trafficEnabled,
     this.buildingsEnabled,
-    this.mapId,
-    @Deprecated('cloudMapId is deprecated. Use mapId instead.') this.cloudMapId,
+    String? mapId,
+    @Deprecated('cloudMapId is deprecated. Use mapId instead.')
+    String? cloudMapId,
     this.style,
-  });
+  }) : mapId = mapId ?? cloudMapId;
 
   /// This setting controls how the API handles gestures on the map. Web only.
   ///
@@ -115,13 +116,6 @@ class MapConfiguration {
   /// 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;
-
   /// Locally configured JSON style.
   ///
   /// To clear a previously set style, set this to an empty string.
@@ -188,7 +182,6 @@ class MapConfiguration {
       buildingsEnabled:
           buildingsEnabled != other.buildingsEnabled ? buildingsEnabled : null,
       mapId: mapId != other.mapId ? mapId : null,
-      cloudMapId: cloudMapId != other.cloudMapId ? cloudMapId : null,
       style: style != other.style ? style : null,
     );
   }
@@ -222,7 +215,6 @@ class MapConfiguration {
       trafficEnabled: diff.trafficEnabled ?? trafficEnabled,
       buildingsEnabled: diff.buildingsEnabled ?? buildingsEnabled,
       mapId: diff.mapId ?? mapId,
-      cloudMapId: diff.cloudMapId ?? cloudMapId,
       style: diff.style ?? style,
     );
   }
@@ -250,7 +242,6 @@ class MapConfiguration {
       trafficEnabled == null &&
       buildingsEnabled == null &&
       mapId == null &&
-      cloudMapId == null &&
       style == null;
 
   @override
@@ -283,7 +274,6 @@ class MapConfiguration {
         trafficEnabled == other.trafficEnabled &&
         buildingsEnabled == other.buildingsEnabled &&
         mapId == other.mapId &&
-        cloudMapId == other.cloudMapId &&
         style == other.style;
   }
 
@@ -310,7 +300,6 @@ class MapConfiguration {
         trafficEnabled,
         buildingsEnabled,
         mapId,
-        cloudMapId,
         style,
       ]);
 }

packages/google_maps_flutter/google_maps_flutter_platform_interface/lib/src/types/utils/map_configuration_serialization.dart

@@ -59,7 +59,6 @@ Map<String, Object> jsonForMapConfiguration(MapConfiguration config) {
     if (config.buildingsEnabled != null)
       'buildingsEnabled': config.buildingsEnabled!,
     if (config.mapId != null) 'mapId': config.mapId!,
-    if (config.cloudMapId != null) 'cloudMapId': config.cloudMapId!,
     if (config.style != null) 'style': config.style!,
   };
 }

packages/google_maps_flutter/google_maps_flutter_platform_interface/test/types/map_configuration_test.dart

@@ -405,7 +405,7 @@ void main() {
       // The diff from empty options should be the diff itself.
       expect(diff.diffFrom(empty), diff);
       // A diff applied to non-empty options should update that field.
-      expect(updated.cloudMapId, _kMapId);
+      expect(updated.mapId, _kMapId);
       // The hash code should change.
       expect(empty.hashCode, isNot(diff.hashCode));
     });

packages/google_maps_flutter/google_maps_flutter_web/lib/src/convert.dart

@@ -101,7 +101,7 @@ gmaps.MapOptions _configurationAndStyleToGmapsOptions(
   // See updateMapConfiguration for why this is not using configuration.style.
   options.styles = styles;
 
-  options.mapId = configuration.mapId ?? configuration.cloudMapId;
+  options.mapId = configuration.mapId;
 
   return options;
 }