Use enum instead of boolean to indicate that marker is advanced

Author: aednlaxer

packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/ClusterManagersController.java

@@ -7,6 +7,7 @@
 import android.content.Context;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.model.AdvancedMarkerOptions;
 import com.google.android.gms.maps.model.Marker;
@@ -19,6 +20,7 @@
 import com.google.maps.android.clustering.view.DefaultClusterRenderer;
 import com.google.maps.android.collections.MarkerManager;
 import io.flutter.plugins.googlemaps.Messages.MapsCallbackApi;
+import io.flutter.plugins.googlemaps.Messages.PlatformMarkerType;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -32,10 +34,15 @@ class ClusterManagersController
     implements GoogleMap.OnCameraIdleListener,
         ClusterManager.OnClusterClickListener<MarkerBuilder> {
   @NonNull private final Context context;
-  @NonNull private final HashMap<String, ClusterManager<MarkerBuilder>> clusterManagerIdToManager;
+
+  @VisibleForTesting
+  @NonNull
+  protected final HashMap<String, ClusterManager<MarkerBuilder>> clusterManagerIdToManager;
+
   @NonNull private final MapsCallbackApi flutterApi;
   @Nullable private MarkerManager markerManager;
   @Nullable private GoogleMap googleMap;
+  @NonNull private PlatformMarkerType markerType;
 
   @Nullable
   private ClusterManager.OnClusterItemClickListener<MarkerBuilder> clusterItemClickListener;
@@ -44,10 +51,15 @@ class ClusterManagersController
   private ClusterManagersController.OnClusterItemRendered<MarkerBuilder>
       clusterItemRenderedListener;
 
-  ClusterManagersController(@NonNull MapsCallbackApi flutterApi, Context context) {
+  ClusterManagersController(
+      @NonNull MapsCallbackApi flutterApi,
+      @NonNull Context context,
+      @NonNull PlatformMarkerType markerType
+  ) {
     this.clusterManagerIdToManager = new HashMap<>();
     this.context = context;
     this.flutterApi = flutterApi;
+    this.markerType = markerType;
   }
 
   void init(GoogleMap googleMap, MarkerManager markerManager) {
@@ -92,6 +104,7 @@ void addClusterManagers(@NonNull List<Messages.PlatformClusterManager> clusterMa
   void addClusterManager(String clusterManagerId) {
     ClusterManager<MarkerBuilder> clusterManager =
         new ClusterManager<MarkerBuilder>(context, googleMap, markerManager);
+    initializeRenderer(clusterManager);
     clusterManagerIdToManager.put(clusterManagerId, clusterManager);
   }
 
@@ -100,13 +113,7 @@ void addClusterManager(String clusterManagerId) {
    * ClusterManager uses default renderer which should be changed to (legacy) renderer or
    * advanced renderer
    **/
-  void initializeRenderer(String clusterManagerId, boolean isAdvanced) {
-    final ClusterManager<MarkerBuilder> clusterManager = clusterManagerIdToManager.get(
-        clusterManagerId);
-    if (clusterManager == null) {
-      return;
-    }
-
+  private void initializeRenderer(ClusterManager<MarkerBuilder> clusterManager) {
     final ClusterRenderer<MarkerBuilder> renderer = clusterManager.getRenderer();
     if (renderer.getClass() == MarkerClusterRenderer.class
         || renderer.getClass() == AdvancedMarkerClusterRenderer.class) {
@@ -115,7 +122,7 @@ void initializeRenderer(String clusterManagerId, boolean isAdvanced) {
     }
 
     final ClusterRenderer<MarkerBuilder> clusterRenderer =
-        isAdvanced
+        markerType == PlatformMarkerType.ADVANCED
             ? new AdvancedMarkerClusterRenderer<>(context, googleMap, clusterManager, this)
             : new MarkerClusterRenderer<>(context, googleMap, clusterManager, this);
     clusterManager.setRenderer(clusterRenderer);
@@ -148,8 +155,6 @@ private void removeClusterManager(Object clusterManagerId) {
 
   /** Adds item to the ClusterManager it belongs to. */
   public void addItem(MarkerBuilder item) {
-    initializeRenderer(item.clusterManagerId(), item.isAdvanced);
-
     ClusterManager<MarkerBuilder> clusterManager =
         clusterManagerIdToManager.get(item.clusterManagerId());
     if (clusterManager != null) {
@@ -226,7 +231,8 @@ public boolean onClusterClick(Cluster<MarkerBuilder> cluster) {
    * MarkerClusterRenderer builds marker options for new markers to be rendered to the map. After
    * cluster item (marker) is rendered, it is sent to the listeners for control.
    */
-  private static class MarkerClusterRenderer<T extends MarkerBuilder> extends DefaultClusterRenderer<T> {
+  @VisibleForTesting
+  static class MarkerClusterRenderer<T extends MarkerBuilder> extends DefaultClusterRenderer<T> {
     private final ClusterManagersController clusterManagersController;
 
     public MarkerClusterRenderer(
@@ -254,7 +260,8 @@ protected void onClusterItemRendered(@NonNull T item, @NonNull Marker marker) {
   }
 
   /** AdvancedMarkerClusterRenderer is a ClusterRenderer that supports AdvancedMarkers */
-  private static class AdvancedMarkerClusterRenderer<T extends MarkerBuilder> extends
+  @VisibleForTesting
+  static class AdvancedMarkerClusterRenderer<T extends MarkerBuilder> extends
       DefaultAdvancedMarkersClusterRenderer<T> {
 
     private final ClusterManagersController clusterManagersController;

packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java

@@ -131,7 +131,7 @@ class GoogleMapController
     MapsInspectorApi.setUp(binaryMessenger, Integer.toString(id), this);
     AssetManager assetManager = context.getAssets();
     this.lifecycleProvider = lifecycleProvider;
-    this.clusterManagersController = new ClusterManagersController(flutterApi, context);
+    this.clusterManagersController = new ClusterManagersController(flutterApi, context, markerType);
     this.markersController =
         new MarkersController(
             flutterApi,

packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/MarkerBuilder.java

@@ -9,19 +9,20 @@
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.MarkerOptions;
 import com.google.maps.android.clustering.ClusterItem;
+import io.flutter.plugins.googlemaps.Messages.PlatformMarkerType;
 
 class MarkerBuilder implements MarkerOptionsSink, ClusterItem {
   private final MarkerOptions markerOptions;
   private String clusterManagerId;
   private String markerId;
   private boolean consumeTapEvents;
-  final boolean isAdvanced;
 
-  MarkerBuilder(String markerId, String clusterManagerId, boolean isAdvanced) {
-    this.markerOptions = isAdvanced ? new AdvancedMarkerOptions() : new MarkerOptions();
+  MarkerBuilder(String markerId, String clusterManagerId, PlatformMarkerType markerType) {
+    this.markerOptions = markerType == PlatformMarkerType.ADVANCED
+        ? new AdvancedMarkerOptions()
+        : new MarkerOptions();
     this.markerId = markerId;
     this.clusterManagerId = clusterManagerId;
-    this.isAdvanced = isAdvanced;
   }
 
   MarkerOptions build() {

packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/MarkersController.java

@@ -180,9 +180,8 @@ public void onClusterItemRendered(MarkerBuilder markerBuilder, Marker marker) {
   private void addMarker(@NonNull Messages.PlatformMarker marker) {
     String markerId = marker.getMarkerId();
     String clusterManagerId = marker.getClusterManagerId();
-    boolean isAdvancedMarker = markerType == PlatformMarkerType.ADVANCED;
     MarkerBuilder markerBuilder = new MarkerBuilder(markerId, clusterManagerId,
-        isAdvancedMarker);
+        markerType);
     Convert.interpretMarkerOptions(
         marker, markerBuilder, assetManager, density, bitmapDescriptorFactoryWrapper);
     addMarker(markerBuilder);

packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ClusterManagersControllerTest.java

@@ -6,6 +6,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.eq;
@@ -22,11 +23,15 @@
 import com.google.android.gms.maps.model.CameraPosition;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.maps.android.clustering.Cluster;
+import com.google.maps.android.clustering.ClusterManager;
 import com.google.maps.android.clustering.algo.StaticCluster;
 import com.google.maps.android.collections.MarkerManager;
 import io.flutter.plugin.common.BinaryMessenger;
+import io.flutter.plugins.googlemaps.ClusterManagersController.AdvancedMarkerClusterRenderer;
+import io.flutter.plugins.googlemaps.ClusterManagersController.MarkerClusterRenderer;
 import io.flutter.plugins.googlemaps.Messages.MapsCallbackApi;
 import io.flutter.plugins.googlemaps.Messages.PlatformMarkerCollisionBehavior;
+import io.flutter.plugins.googlemaps.Messages.PlatformMarkerType;
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -35,7 +40,6 @@
 import java.util.Set;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentMatchers;
@@ -66,7 +70,7 @@ public void setUp() {
     context = ApplicationProvider.getApplicationContext();
     assetManager = context.getAssets();
     flutterApi = spy(new MapsCallbackApi(mock(BinaryMessenger.class)));
-    controller = spy(new ClusterManagersController(flutterApi, context));
+    controller = spy(new ClusterManagersController(flutterApi, context, PlatformMarkerType.LEGACY));
     googleMap = mock(GoogleMap.class);
     markerManager = new MarkerManager(googleMap);
     controller.init(googleMap, markerManager);
@@ -102,8 +106,10 @@ public void AddClusterManagersAndMarkers() {
     clusterManagersToAdd.add(initialClusterManager);
     controller.addClusterManagers(clusterManagersToAdd);
 
-    MarkerBuilder markerBuilder1 = new MarkerBuilder(markerId1, clusterManagerId, false);
-    MarkerBuilder markerBuilder2 = new MarkerBuilder(markerId2, clusterManagerId, false);
+    MarkerBuilder markerBuilder1 = new MarkerBuilder(markerId1, clusterManagerId,
+        PlatformMarkerType.LEGACY);
+    MarkerBuilder markerBuilder2 = new MarkerBuilder(markerId2, clusterManagerId,
+        PlatformMarkerType.LEGACY);
 
     final Messages.PlatformMarker markerData1 =
         createPlatformMarker(markerId1, location1, clusterManagerId);
@@ -133,6 +139,56 @@ public void AddClusterManagersAndMarkers() {
     assertEquals("Cluster should contain exactly 2 markers", 2, cluster.getSize());
   }
 
+  @Test
+  public void SelectClusterRenderer() {
+    final String clusterManagerId1 = "cm_1";
+    final String clusterManagerId2 = "cm_2";
+    final String markerId1 = "mid_1";
+    final String markerId2 = "mid_2";
+
+    when(googleMap.getCameraPosition())
+        .thenReturn(CameraPosition.builder().target(new LatLng(0, 0)).build());
+
+    ClusterManagersController controller1 = spy(
+        new ClusterManagersController(flutterApi, context, PlatformMarkerType.LEGACY));
+    controller1.init(googleMap, markerManager);
+    ClusterManagersController controller2 = spy(
+        new ClusterManagersController(flutterApi, context, PlatformMarkerType.ADVANCED));
+    controller2.init(googleMap, markerManager);
+
+    Messages.PlatformClusterManager initialClusterManager1 =
+        new Messages.PlatformClusterManager.Builder().setIdentifier(clusterManagerId1).build();
+    List<Messages.PlatformClusterManager> clusterManagersToAdd1 = new ArrayList<>();
+    clusterManagersToAdd1.add(initialClusterManager1);
+    controller1.addClusterManagers(clusterManagersToAdd1);
+
+    Messages.PlatformClusterManager initialClusterManager2 =
+        new Messages.PlatformClusterManager.Builder().setIdentifier(clusterManagerId2).build();
+    List<Messages.PlatformClusterManager> clusterManagersToAdd2 = new ArrayList<>();
+    clusterManagersToAdd2.add(initialClusterManager2);
+    controller2.addClusterManagers(clusterManagersToAdd2);
+
+    MarkerBuilder markerBuilder1 = new MarkerBuilder(markerId1, clusterManagerId1,
+        PlatformMarkerType.LEGACY);
+    markerBuilder1.setPosition(new LatLng(10.0, 20.0));
+    controller1.addItem(markerBuilder1);
+
+    MarkerBuilder markerBuilder2 = new MarkerBuilder(markerId2, clusterManagerId2,
+        PlatformMarkerType.ADVANCED);
+    markerBuilder2.setPosition(new LatLng(20.0, 10.0));
+    controller2.addItem(markerBuilder2);
+
+    ClusterManager<?> clusterManager1 = controller1.clusterManagerIdToManager.get(
+        clusterManagerId1);
+    assertNotNull(clusterManager1);
+    assertSame(clusterManager1.getRenderer().getClass(), MarkerClusterRenderer.class);
+
+    ClusterManager<?> clusterManager2 = controller2.clusterManagerIdToManager.get(
+        clusterManagerId2);
+    assertNotNull(clusterManager2);
+    assertSame(clusterManager2.getRenderer().getClass(), AdvancedMarkerClusterRenderer.class);
+  }
+
   @Test
   public void OnClusterClickCallsMethodChannel() {
     String clusterManagerId = "cm_1";
@@ -142,11 +198,11 @@ public void OnClusterClickCallsMethodChannel() {
 
     StaticCluster<MarkerBuilder> cluster = new StaticCluster<>(clusterPosition);
 
-    MarkerBuilder marker1 = new MarkerBuilder("m_1", clusterManagerId, false);
+    MarkerBuilder marker1 = new MarkerBuilder("m_1", clusterManagerId, PlatformMarkerType.LEGACY);
     marker1.setPosition(markerPosition1);
     cluster.add(marker1);
 
-    MarkerBuilder marker2 = new MarkerBuilder("m_2", clusterManagerId, false);
+    MarkerBuilder marker2 = new MarkerBuilder("m_2", clusterManagerId, PlatformMarkerType.LEGACY);
     marker2.setPosition(markerPosition2);
     cluster.add(marker2);
 

packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/ConvertTest.java

@@ -38,6 +38,10 @@
 import com.google.maps.android.projection.SphericalMercatorProjection;
 import io.flutter.plugins.googlemaps.Convert.BitmapDescriptorFactoryWrapper;
 import io.flutter.plugins.googlemaps.Convert.FlutterInjectorWrapper;
+import io.flutter.plugins.googlemaps.Messages.PlatformMarkerType;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -100,11 +104,11 @@ public void ConvertClusterToPigeonReturnsCorrectData() {
 
     StaticCluster<MarkerBuilder> cluster = new StaticCluster<>(clusterPosition);
 
-    MarkerBuilder marker1 = new MarkerBuilder("m_1", clusterManagerId, false);
+    MarkerBuilder marker1 = new MarkerBuilder("m_1", clusterManagerId, PlatformMarkerType.LEGACY);
     marker1.setPosition(markerPosition1);
     cluster.add(marker1);
 
-    MarkerBuilder marker2 = new MarkerBuilder("m_2", clusterManagerId, false);
+    MarkerBuilder marker2 = new MarkerBuilder("m_2", clusterManagerId, PlatformMarkerType.LEGACY);
     marker2.setPosition(markerPosition2);
     cluster.add(marker2);
 
@@ -330,6 +334,18 @@ public void GetBitmapFromBytesThrowsErrorIfInvalidImageData() {
     fail("Expected an IllegalArgumentException to be thrown");
   }
 
+  @Test
+  public void GetBitmapFromPinConfig() {
+    Map<String, Object> assetDetails = new HashMap<>();
+    assetDetails.put("backgroundColor", 0xFFFFFFFF);
+    assetDetails.put("borderColor", 0xFFFFFFFF);
+
+    when(bitmapDescriptorFactoryWrapper.fromPinConfig(any())).thenReturn(mockBitmapDescriptor);
+    BitmapDescriptor result = Convert.getBitmapFromPinConfig(
+        assetDetails, assetManager, 1f, bitmapDescriptorFactoryWrapper);
+    Assert.assertEquals(mockBitmapDescriptor, result);
+  }
+
   @Test
   public void interpretMapConfiguration_handlesNulls() {
     final Messages.PlatformMapConfiguration config =

packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/GoogleMapControllerTest.java

@@ -221,7 +221,7 @@ public void SetInitialClusterManagers() {
   @Test
   public void OnClusterItemRenderedCallsMarkersController() {
     GoogleMapController googleMapController = getGoogleMapControllerWithMockedDependencies();
-    MarkerBuilder markerBuilder = new MarkerBuilder("m_1", "cm_1", false);
+    MarkerBuilder markerBuilder = new MarkerBuilder("m_1", "cm_1", PlatformMarkerType.LEGACY);
     final Marker marker = mock(Marker.class);
     googleMapController.onClusterItemRendered(markerBuilder, marker);
     verify(mockMarkersController, times(1)).onClusterItemRendered(markerBuilder, marker);
@@ -230,7 +230,7 @@ public void OnClusterItemRenderedCallsMarkersController() {
   @Test
   public void OnClusterItemClickCallsMarkersController() {
     GoogleMapController googleMapController = getGoogleMapControllerWithMockedDependencies();
-    MarkerBuilder markerBuilder = new MarkerBuilder("m_1", "cm_1", false);
+    MarkerBuilder markerBuilder = new MarkerBuilder("m_1", "cm_1", PlatformMarkerType.LEGACY);
 
     googleMapController.onClusterItemClick(markerBuilder);
     verify(mockMarkersController, times(1)).onMarkerTap(markerBuilder.markerId());

packages/google_maps_flutter/google_maps_flutter_android/android/src/test/java/io/flutter/plugins/googlemaps/MarkersControllerTest.java

@@ -96,7 +96,8 @@ public void setUp() {
     assetManager = ApplicationProvider.getApplicationContext().getAssets();
     context = ApplicationProvider.getApplicationContext();
     flutterApi = spy(new MapsCallbackApi(mock(BinaryMessenger.class)));
-    clusterManagersController = spy(new ClusterManagersController(flutterApi, context));
+    clusterManagersController = spy(
+        new ClusterManagersController(flutterApi, context, PlatformMarkerType.LEGACY));
     controller =
         new MarkersController(
             flutterApi,