[google_maps_flutter_platform_(web/android/ios)] Add a new zIndexInt param to marker and deprecate zIndex #9408

Hari-07 · 2025-06-09T13:51:46Z

List which issues are fixed by this PR. You must list at least one issue.
This is just the web, android and ios package part of #8012

Pre-Review Checklist

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

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

stuartmorgan-g · 2025-06-09T14:37:23Z

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

@@ -730,3 +730,13 @@ gmaps.LatLng _pixelToLatLng(gmaps.Map map, int x, int y) {

  return projection.fromPointToLatLng(point)!;
 }
+
+extension on Marker {


Extensions violate Flutter's style guide. There are cases where we have to use them for JS interop, but that doesn't apply here.

Why do we need this at all, vs just using zIndex with a comment like in the Android example?

Right. IIRC this was written when 2 different parameters were there initially, now that we don't allow the constructor to pass in both at the same time, this isn't required

stuartmorgan-g · 2025-06-09T14:37:52Z

packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml

@@ -2,11 +2,11 @@ name: google_maps_flutter_web
 description: Web platform implementation of google_maps_flutter
 repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_web
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
-version: 0.5.12
+version: 0.5.13


This should be 0.5.12+1 as it's a very small change.

stuartmorgan-g · 2025-06-09T14:38:44Z

packages/google_maps_flutter/google_maps_flutter_android/example/pubspec.yaml

@@ -4,7 +4,7 @@ publish_to: none

 environment:
  sdk: ^3.6.0
-  flutter: ">=3.27.0"
+  flutter: '>=3.27.0'


Why does this PR change the style of all the string values in pubspec.yaml files to deviate from our usual style?

I assume there might be something wrong with my linte, will fix that. I had to do it manually for the interface package

stuartmorgan-g · 2025-06-10T01:52:04Z

packages/google_maps_flutter/google_maps_flutter_android/pubspec.yaml

@@ -21,7 +21,7 @@ dependencies:
  flutter:
    sdk: flutter
  flutter_plugin_android_lifecycle: ^2.0.1
-  google_maps_flutter_platform_interface: ^2.11.0
+  google_maps_flutter_platform_interface: ^2.12.1


Looking at the PR again... do we actually need any of the changes to this file? It looks like the only actual change is to the integration tests and the example pubspec, and those don't require publishing the package.

In that case Im gonna close this PR. And since it doesn't need a new version, the main PR's overrides can all be removed.

Doesn't it need to target the updated platform interface package though? Not sure if Im misunderstanding this line from the federated packages section

If new functionality is being added to the API surface of the app-facing package, be sure to update the version constraints of the implementation packages in its pubspec.yaml

Doesn't it need to target the updated platform interface package though?

What is "it" here? If it's google_maps_flutter_android, what part of the google_maps_flutter_android requires the new APIs added to the platform interface?

If it's the app-facing package (in the other PR), yes, because it's exporting that surface to clients.

Not sure if Im misunderstanding this line from the federated packages section

If new functionality is being added to the API surface of the app-facing package, be sure to update the version constraints of the implementation packages in its pubspec.yaml

See the explanation in the following sentence for the reason this would need to be done.

For example, if the platform interface adds a new Future<void> foo() { throw UnimplementedError(); }, and all the platforms are updated to implement foo(), and the app-facing package is updated to call foo(), we don't want a valid set of resolved packages where clients can get the updated version of the app-facing and platform interface packages, but not the implementation packages, such that everything compiles but all calls to foo() throw.

Ok got it. For android we dont't need a new version. I guess even web doesn't need a new version by the same logic since that's just a comment change?

I guess even web doesn't need a new version by the same logic since that's just a comment change?

Correct; IIRC the tooling will do the right thing with a comment-only change, but if not we can override the version check.

stuartmorgan-g · 2025-06-10T01:53:07Z

packages/google_maps_flutter/google_maps_flutter_ios/pubspec.yaml

@@ -2,7 +2,7 @@ name: google_maps_flutter_ios
 description: iOS implementation of the google_maps_flutter plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_ios
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
-version: 2.15.2
+version: 2.15.3


Similarly, the only change to this package is to a file in the example app that's not the one visible on pub.dev, so this should be exempt from versioning.

Although, why is only the example changing for iOS? Shouldn't it be using zIndexInt instead of the deprecated zIndex now, since it can't use any fractional values anyway?

You're right, not sure how that ended up getting removed or at what point. I think the reasonable thing to do would be to make ios's PlatformMarker expect an integral zIndex, so that this truncation would now be a type error to which we can pass zIndexInt

Agreed, the iOS changes look good here.

Based on the CI failure though, it appears that the Obj-C compiler flags 64-bit int assignment to 32-bit int assignment as lossy, but did not flag it when it was assigning a double to a 32-bit int. Odd, but you'll need to add an explicit cast here to make the analysis check happy.

That's seems reasonable from flags.
-Wno-float-conversion looks like it allows implicit float conversion which is what was happening
-Wshorten-64-to-32 would disallow the long to int cast that's happening at the line you pointed out

stuartmorgan-g

LGTM

stuartmorgan-g · 2025-06-12T15:20:57Z

packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md

The changes to this file can be reverted as well; we don't need to CHANGELOG an integration test comment.

stuartmorgan-g · 2025-06-12T15:22:25Z

@vashworth / @cbracken could you give the second approval here since the substantive change is iOS?

…runcation-platform-implementations

vashworth

LGTM

…zIndexInt param to marker and deprecate zIndex (flutter/packages#9408)

flutter/packages@03a6abb...25d4fa4 2025-06-17 [email protected] [google_maps_flutter] Add a new zIndexInt param to marker and deprecate zIndex (flutter/packages#8012) 2025-06-17 [email protected] [pigeon] Use a const for custom type ids for gobject generated files (#156100) (flutter/packages#9306) 2025-06-16 [email protected] [google_maps_flutter_platform_(web/android/ios)] Add a new zIndexInt param to marker and deprecate zIndex (flutter/packages#9408) 2025-06-16 [email protected] [camera_avfoundation] fix race condition when starting image stream on iOS (flutter/packages#8733) 2025-06-16 [email protected] Roll Flutter from f79452e to 8303a96 (21 revisions) (flutter/packages#9433) 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 [email protected] 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

All platform implementation changes from the main PR

9ec71a6

Hari-07 requested review from vashworth, cbracken, reidbaker and ditman as code owners June 9, 2025 13:51

github-actions bot added p: google_maps_flutter platform-android platform-ios platform-web labels Jun 9, 2025

stuartmorgan-g requested changes Jun 9, 2025

View reviewed changes

Hari-07 added 4 commits June 9, 2025 19:06

Fix quotes on flutter version string

2b3db64

Another quotes fix

fd18f22

Use build number for web package

5fdb91b

Remove extension in web marker conversion

26b6037

Hari-07 requested a review from stuartmorgan-g June 9, 2025 15:21

stuartmorgan-g reviewed Jun 10, 2025

View reviewed changes

Hari-07 closed this Jun 10, 2025

Hari-07 reopened this Jun 10, 2025

Hari-07 added 3 commits June 10, 2025 17:33

Change zIndex on ios to integer field

f7726bf

Revert android version change

d619269

Add an explicit cast

378b108

stuartmorgan-g approved these changes Jun 12, 2025

View reviewed changes

Hari-07 added 3 commits June 13, 2025 08:36

Remove android changelog

9ab5e86

Merge branch 'main' of github.com:flutter/packages into maps-zindex-t…

1824936

…runcation-platform-implementations

Update ios version

4ad3e6e

vashworth approved these changes Jun 16, 2025

View reviewed changes

vashworth added the autosubmit Merge PR when tree becomes green via auto submit App label Jun 16, 2025

auto-submit bot merged commit 538d174 into flutter:main Jun 16, 2025
78 checks passed

Hari-07 deleted the maps-zindex-truncation-platform-implementations branch June 16, 2025 17:05

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 17, 2025

538d1749b [google_maps_flutter_platform_(web/android/ios)] Add a new …

4b11722

…zIndexInt param to marker and deprecate zIndex (flutter/packages#9408)

engine-flutter-autoroll mentioned this pull request Jun 17, 2025

Roll Packages from 03a6abbedabb to 25d4fa425508 (5 revisions) flutter/flutter#170743

Merged

[google_maps_flutter_platform_(web/android/ios)] Add a new zIndexInt param to marker and deprecate zIndex #9408

[google_maps_flutter_platform_(web/android/ios)] Add a new zIndexInt param to marker and deprecate zIndex #9408

Conversation

Hari-07 commented Jun 9, 2025

Pre-Review Checklist

Footnotes

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!

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!

Hari-07 Jun 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

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!

stuartmorgan-g left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

stuartmorgan-g commented Jun 12, 2025

Uh oh!

vashworth left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Hari-07 Jun 10, 2025 •

edited

Loading