[google_maps_flutter_android] Batch clustered marker operations by elitree · Pull Request #10940 · flutter/packages

elitree · 2026-02-01T23:57:22Z

Note: this PR attempts to use the same strategy from the Google Maps Flutter Web PR #10562 and apply it to Google Maps Flutter Android.

Summary

Adds batch addItems() and removeItems() methods to ClusterManagersController
Refactors MarkersController to batch add/remove/change operations for clustered markers
Reduces redundant re-clustering calls when multiple markers are added/removed/changed at once

This improves performance when working with large numbers of clustered markers by calling ClusterManager.cluster() once per cluster manager instead of once per marker.

Test plan

Added unit tests for batch add/remove operations
Added unit test for batch cluster manager changes
Existing tests pass

Addresses flutter/flutter#170573

Pre-Review Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

Note: The Flutter team is currently trialing the use of Gemini Code Assist for GitHub. Comments from the gemini-code-assist bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.

🤖 Generated with Claude Code

Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling. ↩ ↩² ↩³

gemini-code-assist

Code Review

This pull request introduces batch operations for clustered markers to improve performance, which is a great enhancement. The changes involve adding addItems() and removeItems() methods to ClusterManagersController and refactoring MarkersController to group marker operations by cluster manager and execute them in batches. The new logic is well-tested with new unit tests. My review includes a few suggestions to use Map.computeIfAbsent in MarkersController for more concise and modern Java code.

...s_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/MarkersController.java

reidbaker · 2026-02-18T16:11:39Z

...r_android/android/src/main/java/io/flutter/plugins/googlemaps/ClusterManagersController.java

  }

+  /** Removes multiple items from the ClusterManager with the given ID. */
+  public void removeItems(String clusterManagerId, List<MarkerBuilder> items) {


Please mark items either @nonnull or @nullable

Should be set.

reidbaker · 2026-02-18T16:11:48Z

...r_android/android/src/main/java/io/flutter/plugins/googlemaps/ClusterManagersController.java

  }

+  /** Adds multiple items to the ClusterManager with the given ID. */
+  public void addItems(String clusterManagerId, List<MarkerBuilder> items) {


Please mark items either @nonnull or @nullable

Should be set.

reidbaker · 2026-02-18T16:12:04Z

...r_android/android/src/main/java/io/flutter/plugins/googlemaps/ClusterManagersController.java

+  public void removeItems(String clusterManagerId, List<MarkerBuilder> items) {
+    ClusterManager<MarkerBuilder> clusterManager = clusterManagerIdToManager.get(clusterManagerId);
+    if (clusterManager != null) {
+      clusterManager.removeItems(items);


What does remove items do if one of the items is not present?

ClusterManager.removeItems() from the maps-utils library silently ignores any items that aren't present. It's a no-op for missing items (returns false per item but doesn't throw).

This is consistent with the behavior of the existing single-item removeItem() method, which also makes no prior existence check before delegating to the underlying ClusterManager.

reidbaker · 2026-02-18T16:18:00Z

...utter_android/android/src/test/java/io/flutter/plugins/googlemaps/MarkersControllerTest.java


    Mockito.verify(spyMarkerCollection, times(1)).remove(marker);
  }
+


Would you be willing to add a test that handles updating an existing marker in place. (starting at line 138 in packages/google_maps_flutter/google_maps_flutter_android/android/src/main/java/io/flutter/plugins/googlemaps/MarkersController.java Or point to where that code is executed in the tests you have written if I missed it.

There's now a new controller_ChangeMarkerInPlace test for this.

reidbaker · 2026-02-18T16:30:14Z

I should have led with Thank you for your contribution

elitree · 2026-02-18T19:24:33Z

I'll see if I can get this rebased and add the requested items sometime later this week. Thanks

stuartmorgan-g

I'll wait on a final review until Reid's review comments have been incorporated, but from an initial review everything looks good to me modulo those comments.

elitree · 2026-02-25T03:04:19Z

I'm still working on this one, will update once I've made all my corrections.

@nonnull

- Incorporate upstream advanced markers support (v2.19.0–2.19.2): PlatformMarkerType, MarkerClusterRenderer/AdvancedMarkerClusterRenderer, 3-arg MarkerBuilder constructor, isAdvancedMarkersAvailable(), etc. - Keep batch add/remove logic in ClusterManagersController and MarkersController - Add @nonnull to addItems/removeItems parameters (r2823177045, r2823177715) - Add controller_ChangeMarkerInPlace test (r2823210221) - Bump version to 2.19.3

elitree · 2026-03-02T01:30:32Z

@reidbaker I've made the requested changes and rebased on top of the latest code. Thanks

mboetger · 2026-03-03T20:00:53Z

Oops, sorry @reidbaker got trigger happy with the re-review button.

stuartmorgan-g

LGTM!

elitree · 2026-03-17T22:41:23Z

Hi! Just checking in to see if you need anything else from me for this one. Thanks!

reidbaker · 2026-03-18T14:32:02Z

Sorry for the delay! Approved

auto-submit · 2026-03-18T14:33:30Z

auto label is removed for flutter/packages/10940, Failed to merge flutter/packages/10940 with Pull request flutter/packages/10940 could not be merged: Required status check "ci.yaml validation" is expected..

…ions (flutter/packages#10940)

flutter/packages@afa1a1c...99155a8 2026-03-19 engine-flutter-autoroll@skia.org Roll Flutter from d117642 to dd64978 (24 revisions) (flutter/packages#11281) 2026-03-18 stuartmorgan@google.com [local_auth] Convert to Kotlin gradle for the plugin build files (flutter/packages#11169) 2026-03-18 stuartmorgan@google.com [google_maps_flutter] Add color scheme support to app-facing package (flutter/packages#11280) 2026-03-18 10687576+bparrishMines@users.noreply.github.com [webview_flutter_wkwebview] Updates platform views on iOS to only have a weak reference to the native view (flutter/packages#11175) 2026-03-18 49699333+dependabot[bot]@users.noreply.github.com [dependabot]: Bump androidx.core:core from 1.17.0 to 1.18.0 in /packages/local_auth/local_auth_android/android (flutter/packages#11256) 2026-03-18 49699333+dependabot[bot]@users.noreply.github.com [dependabot]: Bump androidx.core:core-ktx from 1.13.0 to 1.18.0 in /packages/interactive_media_ads/android (flutter/packages#11255) 2026-03-18 engine-flutter-autoroll@skia.org Roll Flutter (stable) from ff37bef to 2c9eb20 (6 revisions) (flutter/packages#11285) 2026-03-18 stuartmorgan@google.com [google_maps_flutter] Add color scheme support to web implementation (flutter/packages#11279) 2026-03-18 elitree@gmail.com [google_maps_flutter_android] Batch clustered marker operations (flutter/packages#10940) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages-flutter-autoroll Please CC flutter-ecosystem@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

elitree requested a review from reidbaker as a code owner February 1, 2026 23:57

github-actions bot added p: google_maps_flutter platform-android labels Feb 1, 2026

gemini-code-assist bot reviewed Feb 1, 2026

View reviewed changes

elitree force-pushed the batch-marker-cluster-android branch from 22e3623 to 22037dc Compare February 2, 2026 00:24

stuartmorgan-g added the triage-android Should be looked at in Android triage label Feb 3, 2026

reidbaker requested review from a team and stuartmorgan-g February 17, 2026 19:53

reidbaker reviewed Feb 18, 2026

View reviewed changes

reidbaker approved these changes Feb 18, 2026

View reviewed changes

stuartmorgan-g reviewed Feb 19, 2026

View reviewed changes

elitree force-pushed the batch-marker-cluster-android branch 2 times, most recently from 4752f7b to 26401f7 Compare February 25, 2026 02:49

elitree added 4 commits March 1, 2026 19:50

batch cluster changes

5aad923

batch logic for changeMarker

8df77ef

Use computeIfAbsent for more concise map operations

3139551

format tool

bd70894

elitree force-pushed the batch-marker-cluster-android branch from 26401f7 to eb6deaa Compare March 2, 2026 00:58

elitree force-pushed the batch-marker-cluster-android branch from eb6deaa to b043794 Compare March 2, 2026 01:08

format

7f78dad

mboetger requested review from reidbaker and stuartmorgan-g March 3, 2026 20:00

stuartmorgan-g approved these changes Mar 3, 2026

View reviewed changes

reidbaker approved these changes Mar 18, 2026

View reviewed changes

reidbaker added the autosubmit Merge PR when tree becomes green via auto submit App label Mar 18, 2026

Merge branch 'main' into batch-marker-cluster-android

ab9ec61

auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Mar 18, 2026

stuartmorgan-g added CICD Run CI/CD autosubmit Merge PR when tree becomes green via auto submit App labels Mar 18, 2026

auto-submit bot merged commit b3280ae into flutter:main Mar 18, 2026
81 checks passed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Mar 19, 2026

b3280ae0d [google_maps_flutter_android] Batch clustered marker operat…

611b630

…ions (flutter/packages#10940)

engine-flutter-autoroll mentioned this pull request Mar 19, 2026

Roll Packages from afa1a1c3564e to 99155a84f372 (9 revisions) flutter/flutter#183890

Merged


		Mockito.verify(spyMarkerCollection, times(1)).remove(marker);
		}

Conversation

elitree commented Feb 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Test plan

Pre-Review Checklist

Footnotes

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

reidbaker commented Feb 18, 2026

Uh oh!

elitree commented Feb 18, 2026

Uh oh!

stuartmorgan-g left a comment

Choose a reason for hiding this comment

Uh oh!

elitree commented Feb 25, 2026

Uh oh!

elitree commented Mar 2, 2026

Uh oh!

mboetger commented Mar 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

stuartmorgan-g left a comment

Choose a reason for hiding this comment

Uh oh!

elitree commented Mar 17, 2026

Uh oh!

reidbaker commented Mar 18, 2026

Uh oh!

auto-submit bot commented Mar 18, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

elitree commented Feb 1, 2026 •

edited

Loading

mboetger commented Mar 3, 2026 •

edited

Loading