Move MarkerType to MapConfiguration

Author: aednlaxer

packages/google_maps_flutter/google_maps_flutter/example/lib/clustering.dart

@@ -6,7 +6,6 @@ import 'dart:math';
 
 import 'package:flutter/material.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
-import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
 import 'page.dart';
 

packages/google_maps_flutter/google_maps_flutter/example/lib/marker_icons.dart

@@ -10,7 +10,6 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
-import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
 import 'custom_marker_icon.dart';
 import 'page.dart';

packages/google_maps_flutter/google_maps_flutter/example/lib/place_marker.dart

@@ -10,7 +10,6 @@ import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
-import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
 import 'custom_marker_icon.dart';
 import 'page.dart';

packages/google_maps_flutter/google_maps_flutter/example/lib/readme_sample_advanced_markers.dart

@@ -6,7 +6,6 @@
 
 import 'package:flutter/material.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
-import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
 void main() => runApp(const MyApp());
 

packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart

@@ -9,6 +9,7 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:google_maps_flutter_android/google_maps_flutter_android.dart';
 import 'package:google_maps_flutter_platform_interface/google_maps_flutter_platform_interface.dart';
 
@@ -45,6 +46,7 @@ export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf
         MapType,
         Marker,
         MarkerId,
+        MarkerType,
         MinMaxZoomPreference,
         PatternItem,
         Polygon,

packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart

@@ -358,7 +358,18 @@ class GoogleMap extends StatefulWidget {
   /// for more details.
   final String? mapId;
 
-  /// Indicates whether map should use [AdvancedMarker]s or [Marker]s.
+  /// Indicates whether map uses [AdvancedMarker]s or [Marker]s.
+  ///
+  /// [AdvancedMarker] and [Marker]s classes might not be related to each other
+  /// in the platform implementation. It's important to set the correct
+  /// [MarkerType] so that the platform implementation can handle the markers:
+  /// * If [MarkerType.advancedMarker] is used, all markers must be of type
+  /// [AdvancedMarker].
+  /// * If [MarkerType.marker] is used, markers cannot be of type
+  /// [AdvancedMarker].
+  ///
+  /// While some features work with either type, using the incorrect type
+  /// may result in unexpected behavior.
   final MarkerType markerType;
 
   /// Creates a [State] for this [GoogleMap].
@@ -394,7 +405,6 @@ class _GoogleMapState extends State<GoogleMap> {
             TextDirection.ltr,
         initialCameraPosition: widget.initialCameraPosition,
         gestureRecognizers: widget.gestureRecognizers,
-        markerType: widget.markerType,
       ),
       mapObjects: MapObjects(
         markers: widget.markers,

packages/google_maps_flutter/google_maps_flutter_android/example/lib/example_google_map.dart

@@ -421,7 +421,6 @@ class _ExampleGoogleMapState extends State<ExampleGoogleMap> {
             TextDirection.ltr,
         initialCameraPosition: widget.initialCameraPosition,
         gestureRecognizers: widget.gestureRecognizers,
-        markerType: widget.markerType,
       ),
       mapObjects: MapObjects(
         markers: widget.markers,

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

@@ -550,7 +550,6 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
     PlatformViewCreatedCallback onPlatformViewCreated, {
     required PlatformMapConfiguration mapConfiguration,
     required MapWidgetConfiguration widgetConfiguration,
-    required MarkerType markerType,
     MapObjects mapObjects = const MapObjects(),
   }) {
     assert(
@@ -647,7 +646,6 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
       mapObjects: mapObjects,
       mapConfiguration:
           _platformMapConfigurationFromMapConfiguration(mapConfiguration),
-      markerType: widgetConfiguration.markerType,
     );
   }
 
@@ -673,7 +671,6 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
       widgetConfiguration: MapWidgetConfiguration(
         initialCameraPosition: initialCameraPosition,
         textDirection: textDirection,
-        markerType: markerType,
       ),
       mapObjects: MapObjects(
           markers: markers,
@@ -683,7 +680,6 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
           clusterManagers: clusterManagers,
           tileOverlays: tileOverlays),
       mapConfiguration: _platformMapConfigurationFromOptionsJson(mapOptions),
-      markerType: markerType,
     );
   }
 
@@ -947,13 +943,6 @@ class GoogleMapsFlutterAndroid extends GoogleMapsFlutterPlatform {
     }
   }
 
-  PlatformMarkerType _platformMarkerTypeFromMarkerType(MarkerType markerType) {
-    return switch (markerType) {
-      MarkerType.marker => PlatformMarkerType.marker,
-      MarkerType.advancedMarker => PlatformMarkerType.advancedMarker,
-    };
-  }
-
   /// Convert [MapBitmapScaling] from platform interface to [PlatformMapBitmapScaling] Pigeon.
   @visibleForTesting
   static PlatformMapBitmapScaling platformMapBitmapScalingFromScaling(
@@ -1299,6 +1288,14 @@ PlatformEdgeInsets? _platformEdgeInsetsFromEdgeInsets(EdgeInsets? insets) {
           right: insets.right);
 }
 
+PlatformMarkerType? _platformMarkerTypeFromMarkerType(MarkerType? markerType) {
+  return switch (markerType) {
+    null => null,
+    MarkerType.marker => PlatformMarkerType.marker,
+    MarkerType.advancedMarker => PlatformMarkerType.advancedMarker,
+  };
+}
+
 PlatformMapConfiguration _platformMapConfigurationFromMapConfiguration(
     MapConfiguration config) {
   return PlatformMapConfiguration(
@@ -1322,6 +1319,7 @@ PlatformMapConfiguration _platformMapConfigurationFromMapConfiguration(
     trafficEnabled: config.trafficEnabled,
     buildingsEnabled: config.buildingsEnabled,
     liteModeEnabled: config.liteModeEnabled,
+    markerType: _platformMarkerTypeFromMarkerType(config.markerType),
     mapId: config.mapId,
     style: config.style,
   );
@@ -1363,6 +1361,7 @@ PlatformMapConfiguration _platformMapConfigurationFromOptionsJson(
     trafficEnabled: options['trafficEnabled'] as bool?,
     buildingsEnabled: options['buildingsEnabled'] as bool?,
     liteModeEnabled: options['liteModeEnabled'] as bool?,
+    markerType: _platformMarkerTypeFromIndex(options['markerType'] as int?),
     mapId: options['mapId'] as String?,
     style: options['style'] as String?,
   );
@@ -1430,6 +1429,14 @@ PlatformZoomRange? _platformZoomRangeFromMinMaxZoomPreferenceJson(
   return PlatformZoomRange(min: minMaxZoom[0], max: minMaxZoom[1]);
 }
 
+PlatformMarkerType _platformMarkerTypeFromIndex(int? index) {
+  return switch (index) {
+    0 => PlatformMarkerType.marker,
+    1 => PlatformMarkerType.advancedMarker,
+    _ => PlatformMarkerType.marker,
+  };
+}
+
 /// Converts platform interface's JointType to Pigeon's PlatformJointType.
 @visibleForTesting
 PlatformJointType platformJointTypeFromJointType(JointType jointType) {

packages/google_maps_flutter/google_maps_flutter_android/pigeons/messages.dart

@@ -490,6 +490,7 @@ class PlatformMapConfiguration {
     required this.trafficEnabled,
     required this.buildingsEnabled,
     required this.liteModeEnabled,
+    required this.markerType,
     required this.mapId,
     required this.style,
   });
@@ -512,6 +513,7 @@ class PlatformMapConfiguration {
   final bool? trafficEnabled;
   final bool? buildingsEnabled;
   final bool? liteModeEnabled;
+  final PlatformMarkerType? markerType;
   final String? mapId;
   final String? style;
 }

packages/google_maps_flutter/google_maps_flutter_android/test/google_maps_flutter_android_test.dart

@@ -1083,7 +1083,6 @@ void main() {
         widgetConfiguration: const MapWidgetConfiguration(
           initialCameraPosition: CameraPosition(target: LatLng(0, 0), zoom: 1),
           textDirection: TextDirection.ltr,
-          markerType: MarkerType.marker,
         ),
       );
 
@@ -1327,7 +1326,6 @@ void main() {
         widgetConfiguration: const MapWidgetConfiguration(
           initialCameraPosition: CameraPosition(target: LatLng(0, 0), zoom: 1),
           textDirection: TextDirection.ltr,
-          markerType: MarkerType.marker,
         ));
 
     expect(widget, isA<PlatformViewLink>());
@@ -1342,7 +1340,6 @@ void main() {
       widgetConfiguration: const MapWidgetConfiguration(
         initialCameraPosition: CameraPosition(target: LatLng(0, 0), zoom: 1),
         textDirection: TextDirection.ltr,
-        markerType: MarkerType.marker,
       ),
     );
 
@@ -1384,7 +1381,6 @@ void main() {
         widgetConfiguration: const MapWidgetConfiguration(
           initialCameraPosition: CameraPosition(target: LatLng(0, 0), zoom: 1),
           textDirection: TextDirection.ltr,
-          markerType: MarkerType.marker,
         ),
         // Here deprecated cloudMapId is used to test that creation params have
         // the correct mapId.
@@ -1432,7 +1428,6 @@ void main() {
         widgetConfiguration: const MapWidgetConfiguration(
           initialCameraPosition: CameraPosition(target: LatLng(0, 0), zoom: 1),
           textDirection: TextDirection.ltr,
-          markerType: MarkerType.marker,
         ),
         mapConfiguration: const MapConfiguration(mapId: mapId)));
 
@@ -1453,15 +1448,16 @@ void main() {
         widgetConfiguration: const MapWidgetConfiguration(
           initialCameraPosition: CameraPosition(target: LatLng(0, 0), zoom: 1),
           textDirection: TextDirection.ltr,
-          markerType: MarkerType.advancedMarker,
         ),
       );
 
       expect(widget, isA<AndroidView>());
       final dynamic creationParams = (widget as AndroidView).creationParams;
       expect(creationParams, isA<PlatformMapViewCreationParams>());
       expect(
-        (creationParams as PlatformMapViewCreationParams).markerType,
+        (creationParams as PlatformMapViewCreationParams)
+            .mapConfiguration
+            .markerType,
         PlatformMarkerType.advancedMarker,
       );
 
@@ -1471,13 +1467,13 @@ void main() {
         widgetConfiguration: const MapWidgetConfiguration(
           initialCameraPosition: CameraPosition(target: LatLng(0, 0), zoom: 1),
           textDirection: TextDirection.ltr,
-          markerType: MarkerType.marker,
         ),
       );
       expect(widget2, isA<AndroidView>());
       expect(
         ((widget2 as AndroidView).creationParams
                 as PlatformMapViewCreationParams)
+            .mapConfiguration
             .markerType,
         PlatformMarkerType.marker,
       );