Merge pull request #42 from virtualmarc/master

#21 Added Altitude, Course, Speed and Accuracy

Author: vanlooverenkoen

android/src/main/kotlin/com/icapps/background_location_tracker/flutter/FlutterBackgroundManager.kt

@@ -2,6 +2,7 @@ package com.icapps.background_location_tracker.flutter
 
 import android.content.Context
 import android.location.Location
+import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import com.icapps.background_location_tracker.BackgroundLocationTrackerPlugin
@@ -59,7 +60,21 @@ internal object FlutterBackgroundManager {
         val data = mutableMapOf<String, Any>()
         data["lat"] = location.latitude
         data["lon"] = location.longitude
+        data["alt"] = if (location.hasAltitude()) location.altitude else 0.0
+        data["vertical_accuracy"] = -1.0
+        data["horizontal_accuracy"] = if (location.hasAccuracy()) location.accuracy else -1.0
+        data["course"] = if (location.hasBearing()) location.bearing else -1.0
+        data["course_accuracy"] = -1.0
+        data["speed"] = if (location.hasSpeed()) location.speed else -1.0
+        data["speed_accuracy"] = -1.0
         data["logging_enabled"] = SharedPrefsUtil.isLoggingEnabled(ctx)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            data["vertical_accuracy"] = if (location.hasVerticalAccuracy()) location.verticalAccuracyMeters else -1.0
+            data["course_accuracy"] = if (location.hasBearingAccuracy()) location.bearingAccuracyDegrees else -1.0
+            data["speed_accuracy"] = if (location.hasSpeedAccuracy()) location.speedAccuracyMetersPerSecond else -1.0
+        }
+
         channel.invokeMethod("onLocationUpdate", data, object : MethodChannel.Result {
             override fun success(result: Any?) {
                 Logger.debug("BackgroundManager", "Got success, destroy engine!")

ios/Classes/SwiftBackgroundLocationTrackerPlugin.swift

@@ -121,12 +121,23 @@ extension SwiftBackgroundLocationTrackerPlugin: CLLocationManagerDelegate {
 
         CustomLogger.log(message: "NEW LOCATION: \(location.coordinate.latitude): \(location.coordinate.longitude)")
 
-        let locationData: [String: Any] = [
+        var locationData: [String: Any] = [
             "lat": location.coordinate.latitude,
             "lon": location.coordinate.longitude,
+            "alt": location.altitude,
+            "vertical_accuracy": location.verticalAccuracy,
+            "horizontal_accuracy": location.horizontalAccuracy,
+            "course": location.course,
+            "course_accuracy": -1,
+            "speed": location.speed,
+            "speed_accuracy": location.speedAccuracy,
             "logging_enabled": SharedPrefsUtil.isLoggingEnabled(),
         ]
 
+        if #available(iOS 13.4, *) {
+            locationData["course_accuracy"] = location.courseAccuracy
+        }
+        
         if SwiftBackgroundLocationTrackerPlugin.initializedBackgroundCallbacks {
             CustomLogger.log(message: "INITIALIZED, ready to send location updates")
             SwiftBackgroundLocationTrackerPlugin.sendLocationupdate(locationData: locationData)

lib/src/channel/background_channel.dart

@@ -36,7 +36,24 @@ class BackgroundChannel {
     BackgroundLocationTrackerLogger.log('locationUpdate: ${call.arguments}');
     final lat = data['lat'] as double; // ignore: avoid_as
     final lon = data['lon'] as double; // ignore: avoid_as
-    await callback(BackgroundLocationUpdateData(lat: lat, lon: lon));
+    final alt = data['alt'] as double; // ignore: avoid_as
+    final verticalAccuracy = data['vertical_accuracy'] as double; // ignore: avoid_as
+    final horizontalAccuracy = data['horizontal_accuracy'] as double; // ignore: avoid_as
+    final course = data['course'] as double; // ignore: avoid_as
+    final courseAccuracy = data['course_accuracy'] as double; // ignore: avoid_as
+    final speed = data['speed'] as double; // ignore: avoid_as
+    final speedAccuracy = data['speed_accuracy'] as double; // ignore: avoid_as
+    await callback(BackgroundLocationUpdateData(
+        lat: lat,
+        lon: lon,
+        horizontalAccuracy: horizontalAccuracy,
+        alt: alt,
+        verticalAccuracy: verticalAccuracy,
+        course: course,
+        courseAccuracy: courseAccuracy,
+        speed: speed,
+        speedAccuracy: speedAccuracy
+    ));
     return true;
   }
 }

lib/src/model/background_location_update_data.dart

@@ -2,11 +2,42 @@
 ///
 /// latitude & longitude
 class BackgroundLocationUpdateData {
+  /// Latitude
   final double lat;
+
+  /// Longitude
   final double lon;
 
+  /// The radius of uncertainty for the location, measured in meters. Negative value if not available.
+  final double horizontalAccuracy;
+
+  /// Altitude
+  final double alt;
+
+  /// The validity of the altitude values, and their estimated uncertainty, measured in meters. Negative value if not available.
+  final double verticalAccuracy;
+
+  /// Direction in which the device is traveling, measured in degrees and relative to due north. Negative value if not available.
+  final double course;
+
+  /// The accuracy of the course value, measured in degrees. Negative value if not available.
+  final double courseAccuracy;
+
+  /// Instantaneous speed of the device, measured in meters per second. Negative value if not available.
+  final double speed;
+
+  /// The accuracy of the speed value, measured in meters per second. Negative value if not available.
+  final double speedAccuracy;
+
   const BackgroundLocationUpdateData({
     required this.lat,
     required this.lon,
+    required this.horizontalAccuracy,
+    required this.alt,
+    required this.verticalAccuracy,
+    required this.course,
+    required this.courseAccuracy,
+    required this.speed,
+    required this.speedAccuracy,
   });
 }

test/src/model/background_location_update_data_test.dart

@@ -3,14 +3,48 @@ import 'package:flutter_test/flutter_test.dart';
 
 void main() {
   test('Background location update data', () async {
-    const data = BackgroundLocationUpdateData(lat: 51.45, lon: 4.5);
+    const data = BackgroundLocationUpdateData(
+      lat: 51.45,
+      lon: 4.5,
+      horizontalAccuracy: 1.2,
+      alt: 42.3,
+      verticalAccuracy: 0.3,
+      course: 128.3,
+      courseAccuracy: 14.3,
+      speed: 12.2,
+      speedAccuracy: 0.9,
+    );
     expect(data.lat, 51.45);
     expect(data.lon, 4.5);
+    expect(data.horizontalAccuracy, 1.2);
+    expect(data.alt, 42.3);
+    expect(data.verticalAccuracy, 0.3);
+    expect(data.course, 128.3);
+    expect(data.courseAccuracy, 14.3);
+    expect(data.speed, 12.2);
+    expect(data.speedAccuracy, 0.9);
   });
 
   test('Background location update data', () async {
-    const data = BackgroundLocationUpdateData(lat: 51.45, lon: 4.5);
+    const data = BackgroundLocationUpdateData(
+      lat: 51.45,
+      lon: 4.5,
+      horizontalAccuracy: 1.2,
+      alt: 42.3,
+      verticalAccuracy: 0.3,
+      course: 128.3,
+      courseAccuracy: 14.3,
+      speed: 12.2,
+      speedAccuracy: 0.9,
+    );
     expect(data.lat, 51.45);
     expect(data.lon, 4.5);
+    expect(data.horizontalAccuracy, 1.2);
+    expect(data.alt, 42.3);
+    expect(data.verticalAccuracy, 0.3);
+    expect(data.course, 128.3);
+    expect(data.courseAccuracy, 14.3);
+    expect(data.speed, 12.2);
+    expect(data.speedAccuracy, 0.9);
   });
 }