[google_maps_flutter] Add onPoiTap callback to GoogleMap

packages/google_maps_flutter/google_maps_flutter/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.15.0
+
+* Adds `onPoiTap` support to the `GoogleMap` widget to handle taps on base map landmarks and businesses.
+* Adds a "Place POI" example to the example app.
+
 ## 2.14.1
 
 * Replaces internal use of deprecated methods.

packages/google_maps_flutter/google_maps_flutter/example/lib/main.dart

@@ -23,6 +23,7 @@ import 'padding.dart';
 import 'page.dart';
 import 'place_circle.dart';
 import 'place_marker.dart';
+import 'place_poi.dart';
 import 'place_polygon.dart';
 import 'place_polyline.dart';
 import 'scrolling_map.dart';
@@ -41,6 +42,7 @@ final List<GoogleMapExampleAppPage> _allPages = <GoogleMapExampleAppPage>[
   const PlacePolylinePage(),
   const PlacePolygonPage(),
   const PlaceCirclePage(),
+  const PlacePoiPage(),
   const PaddingPage(),
   const SnapshotPage(),
   const LiteModePage(),

packages/google_maps_flutter/google_maps_flutter/example/lib/place_poi.dart

@@ -0,0 +1,95 @@
+// Copyright 2013 The Flutter Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/material.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart';
+
+import 'page.dart';
+
+/// Page for demonstrating Point of Interest (POI) tapping.
+class PlacePoiPage extends GoogleMapExampleAppPage {
+  /// Default constructor.
+  const PlacePoiPage({super.key})
+    : super(const Icon(Icons.business), 'Place POI');
+
+  @override
+  Widget build(BuildContext context) {
+    return const PlacePoiBody();
+  }
+}
+
+/// Body of the POI page.
+class PlacePoiBody extends StatefulWidget {
+  /// Default constructor.
+  const PlacePoiBody({super.key});
+
+  @override
+  State<StatefulWidget> createState() => PlacePoiBodyState();
+}
+
+/// State for [PlacePoiBody].
+class PlacePoiBodyState extends State<PlacePoiBody> {
+  /// The controller for the map.
+  ///
+  /// This is public to match the example pattern, but marked with a doc comment.
+  GoogleMapController? controller;
+  PointOfInterest? _lastPoi;
+
+  final CameraPosition _kKolkata = const CameraPosition(
+    target: LatLng(22.54222641620606, 88.34560669761545),
+    zoom: 16.0,
+  );
+
+  // ignore: use_setters_to_change_properties
+  void _onMapCreated(GoogleMapController controller) {
+    this.controller = controller;
+  }
+
+  void _onPoiTap(PointOfInterest poi) {
+    setState(() {
+      _lastPoi = poi;
+    });
+
+    controller?.animateCamera(CameraUpdate.newLatLng(poi.position));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: <Widget>[
+        Expanded(
+          child: GoogleMap(
+            onMapCreated: _onMapCreated,
+            initialCameraPosition: _kKolkata,
+            onPoiTap: _onPoiTap,
+            myLocationButtonEnabled: false,
+          ),
+        ),
+        Container(
+          color: Colors.white,
+          width: double.infinity,
+          padding: const EdgeInsets.all(16.0),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisSize: MainAxisSize.min,
+            children: <Widget>[
+              const Text(
+                'Last Tapped POI:',
+                style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16),
+              ),
+              const SizedBox(height: 8),
+              if (_lastPoi != null) ...<Widget>[
+                Text('Place ID: ${_lastPoi!.placeId}'),
+                Text(
+                  'Lat/Lng: ${_lastPoi!.position.latitude.toStringAsFixed(5)}, ${_lastPoi!.position.longitude.toStringAsFixed(5)}',
+                ),
+              ] else
+                const Text('Tap on a business or landmark icon...'),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}

packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml

@@ -18,8 +18,8 @@ dependencies:
     # The example app is bundled with the plugin so we use a path dependency on
     # the parent directory to use the current plugin's version.
     path: ../
-  google_maps_flutter_android: ^2.16.1
-  google_maps_flutter_platform_interface: ^2.14.0
+  google_maps_flutter_android: ^2.19.0
+  google_maps_flutter_platform_interface: ^2.14.1
 
 dev_dependencies:
   build_runner: ^2.1.10
@@ -33,3 +33,15 @@ flutter:
   uses-material-design: true
   assets:
     - assets/
+
+dependency_overrides:
+  google_maps_flutter:
+    path: ../
+  google_maps_flutter_android:
+    path: ../../google_maps_flutter_android
+  google_maps_flutter_ios:
+    path: ../../google_maps_flutter_ios
+  google_maps_flutter_platform_interface:
+    path: ../../google_maps_flutter_platform_interface
+  google_maps_flutter_web:
+    path: ../../google_maps_flutter_web

packages/google_maps_flutter/google_maps_flutter/lib/google_maps_flutter.dart

@@ -47,6 +47,7 @@ export 'package:google_maps_flutter_platform_interface/google_maps_flutter_platf
         MarkerId,
         MinMaxZoomPreference,
         PatternItem,
+        PointOfInterest,
         Polygon,
         PolygonId,
         Polyline,

packages/google_maps_flutter/google_maps_flutter/lib/src/controller.dart

@@ -99,6 +99,11 @@ class GoogleMapController {
             (InfoWindowTapEvent e) => _googleMapState.onInfoWindowTap(e.value),
           ),
     );
+    _streamSubscriptions.add(
+      GoogleMapsFlutterPlatform.instance
+          .onPoiTap(mapId: mapId)
+          .listen((MapPoiTapEvent e) => _googleMapState.onPoiTap(e.value)),
+    );
     _streamSubscriptions.add(
       GoogleMapsFlutterPlatform.instance
           .onPolylineTap(mapId: mapId)

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

@@ -133,6 +133,7 @@ class GoogleMap extends StatefulWidget {
     this.onCameraIdle,
     this.onTap,
     this.onLongPress,
+    this.onPoiTap,
     this.cloudMapId,
   });
 
@@ -290,6 +291,9 @@ class GoogleMap extends StatefulWidget {
   /// Called every time a [GoogleMap] is long pressed.
   final ArgumentCallback<LatLng>? onLongPress;
 
+  /// Called when a [PointOfInterest] is tapped.
+  final ArgumentCallback<PointOfInterest>? onPoiTap;
+
   /// True if a "My Location" layer should be shown on the map.
   ///
   /// This layer includes a location indicator at the current device location,
@@ -612,6 +616,10 @@ class _GoogleMapState extends State<GoogleMap> {
     }
   }
 
+  void onPoiTap(PointOfInterest poi) {
+    widget.onPoiTap?.call(poi);
+  }
+
   void onPolygonTap(PolygonId polygonId) {
     final Polygon? polygon = _polygons[polygonId];
     if (polygon == null) {

packages/google_maps_flutter/google_maps_flutter/pubspec.yaml

@@ -2,7 +2,7 @@ name: google_maps_flutter
 description: A Flutter plugin for integrating Google Maps in iOS and Android applications.
 repository: https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+maps%22
-version: 2.14.1
+version: 2.15.0
 
 environment:
   sdk: ^3.8.0
@@ -21,10 +21,10 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  google_maps_flutter_android: ^2.16.1
-  google_maps_flutter_ios: ^2.15.4
-  google_maps_flutter_platform_interface: ^2.14.0
-  google_maps_flutter_web: ^0.5.14
+  google_maps_flutter_android: ^2.19.0
+  google_maps_flutter_ios: ^2.18.0
+  google_maps_flutter_platform_interface: ^2.15.0
+  google_maps_flutter_web: ^0.5.15
 
 dev_dependencies:
   flutter_test:
@@ -41,3 +41,13 @@ topics:
 # The example deliberately includes limited-use secrets.
 false_secrets:
   - /example/web/index.html
+
+dependency_overrides:
+  google_maps_flutter_android:
+    path: ../google_maps_flutter_android
+  google_maps_flutter_ios:
+    path: ../google_maps_flutter_ios
+  google_maps_flutter_platform_interface:
+    path: ../google_maps_flutter_platform_interface
+  google_maps_flutter_web:
+    path: ../google_maps_flutter_web

packages/google_maps_flutter/google_maps_flutter/test/fake_google_maps_flutter_platform.dart

@@ -280,6 +280,11 @@ class FakeGoogleMapsFlutterPlatform extends GoogleMapsFlutterPlatform {
     return mapEventStreamController.stream.whereType<MapTapEvent>();
   }
 
+  @override
+  Stream<MapPoiTapEvent> onPoiTap({required int mapId}) {
+    return mapEventStreamController.stream.whereType<MapPoiTapEvent>();
+  }
+
   @override
   Stream<MapLongPressEvent> onLongPress({required int mapId}) {
     return mapEventStreamController.stream.whereType<MapLongPressEvent>();

packages/google_maps_flutter/google_maps_flutter/test/google_map_test.dart

@@ -659,4 +659,39 @@ void main() {
 
     expect(map.tileOverlaySets.length, 1);
   });
+
+  testWidgets('onPoiTap callback is called', (WidgetTester tester) async {
+    PointOfInterest? tappedPoi;
+    final mapCreatedCompleter = Completer<void>();
+
+    await tester.pumpWidget(
+      Directionality(
+        textDirection: TextDirection.ltr,
+        child: GoogleMap(
+          initialCameraPosition: const CameraPosition(target: LatLng(0, 0)),
+          onPoiTap: (PointOfInterest poi) => tappedPoi = poi,
+          onMapCreated: (_) => mapCreatedCompleter.complete(),
+        ),
+      ),
+    );
+
+    // Wait for the map to be fully initialized in the fake platform.
+    await mapCreatedCompleter.future;
+
+    // Use the top-level 'platform' variable instead of redeclaring it.
+    const poi = PointOfInterest(
+      position: LatLng(10.0, 10.0),
+      placeId: 'test_id_123',
+    );
+
+    // Inject the event into the fake platform's stream.
+    // mapId 0 is used as it's the first map created in the test.
+    platform.mapEventStreamController.add(MapPoiTapEvent(0, poi));
+
+    // Allow the stream and callback to process.
+    await tester.pump();
+
+    expect(tappedPoi, poi);
+    expect(tappedPoi!.placeId, 'test_id_123');
+  });
 }

packages/google_maps_flutter/google_maps_flutter_android/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.19.0
+
+* Implements `onPoiTap` support for Android using `OnPoiClickListener`.
+
 ## 2.18.12
 
 * Bumps com.google.maps.android:android-maps-utils from 3.20.1 to 4.0.0.

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

@@ -37,6 +37,7 @@
 import com.google.android.gms.maps.model.LatLngBounds;
 import com.google.android.gms.maps.model.MapStyleOptions;
 import com.google.android.gms.maps.model.Marker;
+import com.google.android.gms.maps.model.PointOfInterest;
 import com.google.android.gms.maps.model.Polygon;
 import com.google.android.gms.maps.model.Polyline;
 import com.google.android.gms.maps.model.TileOverlay;
@@ -67,6 +68,7 @@ class GoogleMapController
         MapsApi,
         MapsInspectorApi,
         OnMapReadyCallback,
+        GoogleMap.OnPoiClickListener,
         PlatformView {
 
   private static final String TAG = "GoogleMapController";
@@ -200,6 +202,7 @@ public void onMapReady(@NonNull GoogleMap googleMap) {
     this.googleMap.setIndoorEnabled(this.indoorEnabled);
     this.googleMap.setTrafficEnabled(this.trafficEnabled);
     this.googleMap.setBuildingsEnabled(this.buildingsEnabled);
+    this.googleMap.setOnPoiClickListener(this);
     installInvalidator();
     if (mapReadyResult != null) {
       mapReadyResult.success();
@@ -363,6 +366,17 @@ public void onMarkerDragEnd(Marker marker) {
     markersController.onMarkerDragEnd(marker.getId(), marker.getPosition());
   }
 
+  @Override
+  public void onPoiClick(PointOfInterest poi) {
+    Messages.PlatformPointOfInterest platformPoi =
+        new Messages.PlatformPointOfInterest.Builder()
+            .setPosition(Convert.latLngToPigeon(poi.latLng))
+            .setPlaceId(poi.placeId)
+            .build();
+
+    flutterApi.onPoiTap(platformPoi, new NoOpVoidResult());
+  }
+
   @Override
   public void onPolygonClick(Polygon polygon) {
     polygonsController.onPolygonTap(polygon.getId());