Merge pull request #576 from Baseflow/issue/562

Return the floor if available on iOS

Author: mvanbeusekom

README.md

@@ -23,7 +23,7 @@ To use this plugin, add `geolocator` as a [dependency in your pubspec.yaml file]
 
 ```yaml
 dependencies:
-  geolocator: ^6.1.2
+  geolocator: ^6.1.4
 ```
 
 <details>

geolocator/CHANGELOG.md

@@ -1,6 +1,11 @@
+## 6.1.4
+
+- When available return the floor on which the devices is located (see [#562](https://github.com/Baseflow/flutter-geolocator/issues/562));
+- When on iOS 10+ return information regarding the speed accuracy.
+
 ## 6.1.3
 
-- Solves a bug causing less accurate location fixes (see [#531]((https://github.com/Baseflow/flutter-geolocator/issues/531))).
+- Solves a bug causing less accurate location fixes (see [#531](https://github.com/Baseflow/flutter-geolocator/issues/531)).
 
 ## 6.1.2
 

geolocator/README.md

@@ -23,7 +23,7 @@ To use this plugin, add `geolocator` as a [dependency in your pubspec.yaml file]
 
 ```yaml
 dependencies:
-  geolocator: ^6.1.2
+  geolocator: ^6.1.4
 ```
 
 <details>

geolocator/example/ios/Flutter/.last_build_id

@@ -1 +1 @@
-bc4128512a11f51e4d58af6ebd998d83
+da0244c85ad60d0a306fb416a443d50a

geolocator/ios/Classes/Utils/LocationMapper.m

@@ -13,16 +13,28 @@ + (NSDictionary *) toDictionary:(CLLocation *)location {
         return nil;
     }
 
-    return @{
-        @"latitude": @(location.coordinate.latitude),
-        @"longitude": @(location.coordinate.longitude),
-        @"timestamp": @([LocationMapper currentTimeInMilliSeconds:location.timestamp]),
-        @"altitude": @(location.altitude),
-        @"accuracy": @(location.horizontalAccuracy),
-        @"speed": @(location.speed),
-        @"speed_accuracy": @0.0,
-        @"heading": @(location.course),
-    };
+    double timestamp = [LocationMapper currentTimeInMilliSeconds:location.timestamp];
+    double speedAccuracy = 0.0;
+    
+    if (@available(iOS 10.0, *)) {
+        speedAccuracy = location.speedAccuracy;
+    }
+    
+    NSMutableDictionary *locationMap = [[NSMutableDictionary alloc]initWithCapacity:9];
+    [locationMap setObject:@(location.coordinate.latitude) forKey: @"latitude"];
+    [locationMap setObject:@(location.coordinate.longitude) forKey: @"longitude"];
+    [locationMap setObject:@(timestamp) forKey: @"timestamp"];
+    [locationMap setObject:@(location.altitude) forKey: @"altitude"];
+    [locationMap setObject:@(location.horizontalAccuracy) forKey: @"accuracy"];
+    [locationMap setObject:@(location.speed) forKey: @"speed"];
+    [locationMap setObject:@(speedAccuracy) forKey: @"speed_accuracy"];
+    [locationMap setObject:@(location.course) forKey: @"heading"];
+    
+    if(location.floor && location.floor.level) {
+        [locationMap setObject:@(location.floor.level) forKey:@"floor"];
+    }
+    
+    return locationMap;
 }
 
 + (double)currentTimeInMilliSeconds:(NSDate *)dateToConvert {

geolocator/pubspec.yaml

@@ -1,7 +1,7 @@
 name: geolocator
 description: Geolocation plugin for Flutter. This plugin provides a cross-platform (iOS, Android) API for generic location (GPS etc.) functions.
-version: 6.1.3
-homepage: https://github.com/baseflow/flutter-geolocator
+version: 6.1.4
+homepage: https://github.com/Baseflow/flutter-geolocator/tree/master/geolocator
 
 environment:
   sdk: ">=2.7.0 <3.0.0"
@@ -11,7 +11,7 @@ dependencies:
   flutter:
     sdk: flutter
 
-  geolocator_platform_interface: ^1.0.7
+  geolocator_platform_interface: ^1.0.8
 
 dev_dependencies:
   flutter_test:

geolocator_platform_interface/README.md

@@ -23,7 +23,7 @@ To use this plugin, add `geolocator` as a [dependency in your pubspec.yaml file]
 
 ```yaml
 dependencies:
-  geolocator: ^6.1.2
+  geolocator: ^6.1.4
 ```
 
 <details>