Revert platform position changes

Baseflow · Apr 11, 2022 · 8a561de · 8a561de
1 parent 0663c6b
commit 8a561de
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 21 deletions.
diff --git a/...ocator_android/android/src/main/java/com/baseflow/geolocator/location/LocationMapper.java b/...ocator_android/android/src/main/java/com/baseflow/geolocator/location/LocationMapper.java
@@ -35,11 +35,7 @@ public static Map<String, Object> toHashMap(Location location) {
     }
 
     if(location.getExtras() != null) {
-        String nmeaMessage = location.getExtras().getString(NmeaClient.NMEA_MESSAGE_EXTRA);
 
-        if(nmeaMessage != null) {
-            position.put("nmeaMessage", nmeaMessage);
-        }
         if(location.getExtras().containsKey(NmeaClient.NMEA_ALTITUDE_EXTRA)) {
             Double mslAltitude = location.getExtras().getDouble(NmeaClient.NMEA_ALTITUDE_EXTRA);
             position.put("altitude", mslAltitude);

diff --git a/geolocator_android/pubspec.yaml b/geolocator_android/pubspec.yaml
@@ -18,7 +18,7 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  geolocator_platform_interface: ^4.1.0
+  geolocator_platform_interface: ^4.0.3
 
 dev_dependencies:
   flutter_test:

diff --git a/geolocator_platform_interface/CHANGELOG.md b/geolocator_platform_interface/CHANGELOG.md
@@ -1,7 +1,3 @@
-## 4.1.0
-
-- Adds 'nmeaMessage' to the position model.
-
 ## 4.0.4
 
 - Fixes a bug where listening to the position stream immediately after an error, results in listening to a dead stream. 

diff --git a/geolocator_platform_interface/lib/src/models/position.dart b/geolocator_platform_interface/lib/src/models/position.dart
@@ -17,7 +17,6 @@ class Position {
     required this.speedAccuracy,
     this.floor,
     this.isMocked = false,
-    this.nmeaMessage,
   });
 
   /// The latitude of this position in degrees normalized to the interval -90.0
@@ -75,10 +74,6 @@ class Position {
   /// On iOS this value will always be false.
   final bool isMocked;
 
-  /// Provides the latest nmeaMessage received from the platform if requested
-  /// and the platform is capable of providing nmeaMessages.
-  final String? nmeaMessage;
-
   @override
   bool operator ==(Object other) {
     var areEqual = other is Position &&
@@ -91,8 +86,7 @@ class Position {
         other.speed == speed &&
         other.speedAccuracy == speedAccuracy &&
         other.timestamp == timestamp &&
-        other.isMocked == isMocked &&
-        other.nmeaMessage == nmeaMessage;
+        other.isMocked == isMocked;
 
     return areEqual;
   }
@@ -108,8 +102,7 @@ class Position {
       speed.hashCode ^
       speedAccuracy.hashCode ^
       timestamp.hashCode ^
-      isMocked.hashCode ^
-      nmeaMessage.hashCode;
+      isMocked.hashCode;
 
   @override
   String toString() {
@@ -146,7 +139,6 @@ class Position {
       speed: positionMap['speed'] ?? 0.0,
       speedAccuracy: positionMap['speed_accuracy'] ?? 0.0,
       isMocked: positionMap['is_mocked'] ?? false,
-      nmeaMessage: positionMap['nmeaMessage'],
     );
   }
 
@@ -163,6 +155,5 @@ class Position {
         'speed': speed,
         'speed_accuracy': speedAccuracy,
         'is_mocked': isMocked,
-        'nmeaMessage': nmeaMessage,
       };
 }
diff --git a/geolocator_platform_interface/pubspec.yaml b/geolocator_platform_interface/pubspec.yaml
@@ -3,7 +3,7 @@ description: A common platform interface for the geolocator plugin.
 homepage: https://github.com/baseflow/flutter-geolocator
 # NOTE: We strongly prefer non-breaking changes, even at the expense of a
 # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
-version: 4.1.0
+version: 4.0.4
 
 dependencies:
   flutter: