From ebe5fd8a3718c5d47fcdaef440fac2f1bb9c555f Mon Sep 17 00:00:00 2001
From: Bartek Pacia <barpac02@gmail.com>
Date: Fri, 4 Aug 2023 13:59:26 +0200
Subject: [PATCH 1/2] fix cast error in `Location.onLocationChanged`

---
 .../lib/src/method_channel_location.dart          | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/location_platform_interface/lib/src/method_channel_location.dart b/packages/location_platform_interface/lib/src/method_channel_location.dart
index 09dfa4f1..cbe4ba1b 100644
--- a/packages/location_platform_interface/lib/src/method_channel_location.dart
+++ b/packages/location_platform_interface/lib/src/method_channel_location.dart
@@ -140,12 +140,15 @@ class MethodChannelLocation extends LocationPlatform {
   /// Throws an error if the app has no permission to access location.
   @override
   Stream<LocationData> get onLocationChanged {
-    return _onLocationChanged ??=
-        _eventChannel!.receiveBroadcastStream().map<LocationData>(
-              (dynamic event) => LocationData.fromMap(
-                Map<String, dynamic>.of(event as Map<String, dynamic>),
-              ),
-            );
+    return _onLocationChanged ??= _eventChannel!
+        .receiveBroadcastStream()
+        .map<LocationData>((dynamic event) {
+      event as Map<Object?, Object?>;
+
+      return LocationData.fromMap(
+        Map<String, dynamic>.of(event.cast<String, dynamic>()),
+      );
+    });
   }
 
   /// Change options of sticky background notification on Android.

From 5c38a1a056e0c07ee57d86a3979573d4075263ee Mon Sep 17 00:00:00 2001
From: Bartek Pacia <barpac02@gmail.com>
Date: Fri, 4 Aug 2023 14:19:13 +0200
Subject: [PATCH 2/2] location_platform_interface: bump version to 3.1.1

---
 packages/location_platform_interface/CHANGELOG.md | 4 ++++
 packages/location_platform_interface/pubspec.yaml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/location_platform_interface/CHANGELOG.md b/packages/location_platform_interface/CHANGELOG.md
index a88dfb19..86731124 100644
--- a/packages/location_platform_interface/CHANGELOG.md
+++ b/packages/location_platform_interface/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.1.1
+
+- Fix cast error in `Location.onLocationChanged` (#871)
+
 ## 3.1.0
 
 - Refactoring (#853)
diff --git a/packages/location_platform_interface/pubspec.yaml b/packages/location_platform_interface/pubspec.yaml
index 06adced1..a32dde34 100644
--- a/packages/location_platform_interface/pubspec.yaml
+++ b/packages/location_platform_interface/pubspec.yaml
@@ -1,6 +1,6 @@
 name: location_platform_interface
 description: A common platform interface for the location plugin.
-version: 3.1.0
+version: 3.1.1
 homepage: https://github.com/Lyokone/flutterlocation
 
 environment: