Adding some changes

GroundSdk.podspec

@@ -1,17 +1,17 @@
 
 Pod::Spec.new do |s|
     s.name                  = "GroundSdk"
-    s.version               = "1.8.0"
+    s.version               = "1.8.1"
     s.summary               = "Parrot Drone SDK"
     s.homepage              = "https://developer.parrot.com"
     s.license               = "{ :type => 'BSD 3-Clause License', :file => 'LICENSE' }"
     s.author                = 'Parrot Drone SAS'
-    s.source                = { :git => 'https://github.com/Parrot-Developers/pod_groundsdk.git', :tag => "1.8.0" }
+    s.source                = { :git => 'https://github.com/Parrot-Developers/pod_groundsdk.git', :tag => "1.8.1" }
     s.platform              = :ios
     s.ios.deployment_target = '10.0'
     s.source_files          = 'GroundSdk/**/*.{swift,h,m}'
     s.resources             = 'GroundSdk/**/*.{vsh,fsh,txt,png}'
-    s.dependency            'SdkCore', '1.8.0'
+    s.dependency            'SdkCore', '1.8.1'
     s.public_header_files   = ["GroundSdk/GroundSdk.h"]
     s.swift_version         = '4.2'
     s.pod_target_xcconfig   = {'SWIFT_VERSION' => '4.2'}

GroundSdk/Device/DeviceConnector.swift

@@ -62,12 +62,12 @@ extension DeviceConnectorType {
 @objc(GSDeviceConnectorTechnology)
 public enum DeviceConnectorTechnology: Int, CustomStringConvertible {
 
+    /// Connect using Bluetooth Low Energy.
+    case ble
     /// Connect using Wifi.
     case wifi
     /// Connect using USB.
     case usb
-    /// Connect using Bluetooth Low Energy.
-    case ble
 
     /// Debug description.
     public var description: String {

GroundSdk/Device/DeviceModel.swift

@@ -100,11 +100,10 @@ public enum DeviceModel: CustomStringConvertible {
     }
 
     /// List of devices that can be connectable through usb.
-    private static var usbDevices: Set<DeviceModel> = [.rc(.skyCtrl3), .rc(.skyCtrlUA)]
+    private static var usbDevices: Set<DeviceModel> = Set(RemoteControl.Model.allCases.map(DeviceModel.rc))
 
     /// List of devices that can be connectable through wifi.
-    private static var wifiDevices: Set<DeviceModel> = [.drone(.anafi4k), .drone(.anafiThermal), .drone(.anafiUa),
-                                                        .drone(.anafiUsa)]
+    private static var wifiDevices: Set<DeviceModel> = Set(Drone.Model.allCases.map(DeviceModel.drone))
 
     /// List of devices that can be connectable through BLE.
     private static var bleDevices: Set<DeviceModel> = []
@@ -251,7 +250,7 @@ public class GSDeviceModel: NSObject {
 
     /// All known device models.
     public static var allDevices: Set<GSDeviceModel> {
-        return Set(DeviceModel.allDevices.map { GSDeviceModel(deviceModel: $0) })
+        return Set(DeviceModel.allDevices.map(GSDeviceModel.init))
     }
 
     /// Filters device models that support a given technology.
@@ -265,7 +264,7 @@ public class GSDeviceModel: NSObject {
 
         let extractedModels = Set(models.map { $0.deviceModel })
         let supporting = DeviceModel.supportingTechnology(models: extractedModels, technology: technology)
-        return Set(supporting.map { GSDeviceModel(deviceModel: $0) })
+        return Set(supporting.map(GSDeviceModel.init))
     }
 
     /// Retrieves a device model by its name.

GroundSdk/Device/Peripheral/SkyCtrl3Gamepad/SkyCtrl3MappingEntry.swift

@@ -127,7 +127,7 @@ public class SkyCtrl3ButtonsMappingEntry: SkyCtrl3MappingEntry {
     ///     Swift must use the function
     ///     `init(droneModel: Drone.Model, action: ButtonsMappableAction, buttonEvents: Set<SkyCtrl3ButtonEvent>)`
     public convenience init(droneModel: Drone.Model, action: ButtonsMappableAction, buttonEventsAsInt: Set<Int>) {
-        let buttonEvents = Set(buttonEventsAsInt.map({ SkyCtrl3ButtonEvent(rawValue: $0)! }))
+        let buttonEvents = Set(buttonEventsAsInt.compactMap(SkyCtrl3ButtonEvent.init))
         self.init(droneModel: droneModel, action: action, buttonEvents: buttonEvents)
     }
 
@@ -196,7 +196,7 @@ public class SkyCtrl3AxisMappingEntry: SkyCtrl3MappingEntry {
     public convenience init(
         droneModel: Drone.Model, action: AxisMappableAction, axisEvent: SkyCtrl3AxisEvent,
         buttonEventsAsInt: Set<Int>) {
-        let buttonEvents = Set(buttonEventsAsInt.map({ SkyCtrl3ButtonEvent(rawValue: $0)! }))
+        let buttonEvents = Set(buttonEventsAsInt.compactMap(SkyCtrl3ButtonEvent.init))
         self.init(droneModel: droneModel, action: action, axisEvent: axisEvent, buttonEvents: buttonEvents)
     }
 

GroundSdk/GroundSdk.swift

@@ -377,7 +377,7 @@ public extension GroundSdk {
     func replayRef(source: FileReplaySource,
                    observer: @escaping (_ stream: FileReplay?) -> Void) -> GSFileReplayRef? {
         let ref: Ref<FileReplay>? = session.newFileReplay(source: source, observer: observer)
-        return ref != nil ? GSFileReplayRef(ref: ref!) : nil
+        return ref.map(GSFileReplayRef.init)
     }
 }
 

GroundSdk/GroundSdkConfig.swift

@@ -297,7 +297,7 @@ public class GroundSdkConfig: NSObject {
     @objc(supportedDevices)
     public var gsSupportedDevices: Set<GSDeviceModel> {
         get {
-            return Set(supportedDevices.map { GSDeviceModel(deviceModel: $0) })
+            return Set(supportedDevices.map(GSDeviceModel.init))
         }
         set(newGsSupportedDevices) {
             supportedDevices = Set(newGsSupportedDevices.map { $0.deviceModel })

GroundSdk/Internal/Device/DeviceConnectorCore.swift

@@ -139,10 +139,6 @@ extension DeviceConnectorTechnology {
     /// - Parameter technology: the technology to compare to
     /// - Returns: `true` if the technology is strictly better
     func betterThan(_ technology: DeviceConnectorTechnology) -> Bool {
-        let ranks: [DeviceConnectorTechnology: Int] = [
-            .ble: 0,
-            .wifi: 1,
-            .usb: 2]
-        return ranks[self]! > ranks[technology]!
+        return self.rawValue > technology.rawValue
     }
 }

GroundSdk/Internal/Device/Peripheral/CameraCore/CameraPhotoCore.swift

@@ -336,11 +336,9 @@ class CameraPhotoSettingsCore: CameraPhotoSettings, CustomDebugStringConvertible
             return
         }
 
-        let gpslapseCaptureIntervalValueClamped = gpslapseCaptureIntervalValue != nil ?
-            supportedGpslapseIntervals.clamp(gpslapseCaptureIntervalValue!) : nil
+        let gpslapseCaptureIntervalValueClamped = gpslapseCaptureIntervalValue.map(supportedGpslapseIntervals.clamp)
 
-        let timelapseCaptureIntervalValueClamped = timelapseCaptureIntervalValue != nil ?
-            supportedTimelapseIntervals.clamp(timelapseCaptureIntervalValue!) : nil
+        let timelapseCaptureIntervalValueClamped = timelapseCaptureIntervalValue.map(supportedTimelapseIntervals.clamp)
 
         if backend(mode, format, fileFormat, burstValue, bracketingValue, gpslapseCaptureIntervalValueClamped,
                    timelapseCaptureIntervalValueClamped) {

GroundSdk/Internal/Device/Peripheral/CameraCore/CameraStylesSettingsCore.swift

@@ -213,20 +213,22 @@ class CameraStyleSettingsCore: CameraStyleSettings, CustomDebugStringConvertible
     ///   - sharpness: requested sharpness
     /// - Returns: true if settings have been changed, false else
     private func set(saturation: Int? = nil, contrast: Int? = nil, sharpness: Int? = nil) -> Bool {
-        let oldContrast: (min: Int, value: Int, max: Int)? = contrast != nil ?
-            (min: _contrast.min, value: _contrast.value, max: _contrast.max) : nil
-        let oldSharpness: (min: Int, value: Int, max: Int)? = sharpness != nil ?
-            (min: _sharpness.min, value: _sharpness.value, max: _sharpness.max) : nil
-        let oldSaturation: (min: Int, value: Int, max: Int)? = saturation != nil ?
-            (min: _saturation.min, value: _saturation.value, max: _saturation.max) : nil
+
+        let oldContrast: (min: Int, value: Int, max: Int)? = contrast
+            .map { _ in (min: _contrast.min, value: _contrast.value, max: _contrast.max) }
+        let oldSharpness: (min: Int, value: Int, max: Int)? = sharpness
+            .map { _ in (min: _sharpness.min, value: _sharpness.value, max: _sharpness.max) }
+        let oldSaturation: (min: Int, value: Int, max: Int)? = saturation
+            .map { _ in (min: _saturation.min, value: _saturation.value, max: _saturation.max) }
+
         if changeConfigBackend(saturation ?? _saturation.value, contrast ?? _contrast.value,
                                sharpness ?? _sharpness.value) {
             timeout.schedule { [weak self] in
 
                 if let `self` = self {
-                    let saturationUpdated = oldSaturation != nil ? self.update(saturation: oldSaturation!) : false
-                    let contrastUpdated = oldContrast != nil ? self.update(contrast: oldContrast!) : false
-                    let sharpnessUpdated = oldSharpness != nil ? self.update(sharpness: oldSharpness!) : false
+                    let saturationUpdated = oldSaturation.map(self.update(saturation:)) ?? false
+                    let contrastUpdated = oldContrast.map(self.update(contrast:)) ?? false
+                    let sharpnessUpdated = oldSharpness.map(self.update(sharpness:)) ?? false
                     if saturationUpdated || contrastUpdated || sharpnessUpdated {
                         self.didChangeDelegate.userDidChangeSetting()
                     }

GroundSdk/Internal/Device/Peripheral/MediaStoreCore/MediaListRefCore.swift

@@ -72,15 +72,15 @@ class MediaListRefCore: Ref<[MediaItem]> {
 
                     // weak self in case backend call callback after cancelling request
                     if let `self` = self {
-                        `self`.request = nil
+                        self.request = nil
                         // copy user data into the new items
                         if let currentList = self.value as? [MediaItemCore] {
                             for media in medias {
                                 media.userData = currentList.first(where: {return $0.uid == media.uid})?.userData
                             }
                         }
                         // update the ref with the new list
-                        `self`.update(newValue: medias)
+                        self.update(newValue: medias)
                     }
                 }
             }

GroundSdk/Internal/Device/Peripheral/StreamCore/StreamServerCore.swift

@@ -201,6 +201,6 @@ extension StreamServerCore: GSStreamServer {
 
     public func replay(source: MediaReplaySource, observer: @escaping (MediaReplay?) -> Void) -> GSMediaReplayRef? {
         let ref: Ref<MediaReplay>? = replay(source: source, observer: observer)
-        return ref != nil ? GSMediaReplayRef(ref: ref!) : nil
+        return ref.map(GSMediaReplayRef.init)
     }
 }

GroundSdk/Internal/Engine/ActivationEngine.swift

@@ -174,9 +174,13 @@ class ActivationEngine: EngineBaseCore {
     /// - Returns: a list of all devices that needs to be registered.
     private func getDevicesToRegister() -> [DeviceRegisterer.Info] {
         var devices = [DeviceRegisterer.Info]()
-        let dronesToBeRegistered = droneStore.getDevices().filter({ deviceNeedToBeRegistered($0) })
+        let dronesToBeRegistered = droneStore
+            .getDevices()
+            .filter(deviceNeedToBeRegistered)
             .map { DeviceRegisterer.Info(uid: $0.uid, firmware: $0.firmwareVersionHolder.version.description) }
-        let rcsToBeRegistered = rcStore.getDevices().filter({ deviceNeedToBeRegistered($0) })
+        let rcsToBeRegistered = rcStore
+            .getDevices()
+            .filter(deviceNeedToBeRegistered)
             .map { DeviceRegisterer.Info(uid: $0.uid, firmware: $0.firmwareVersionHolder.version.description) }
         devices.append(contentsOf: dronesToBeRegistered)
         devices.append(contentsOf: rcsToBeRegistered)

GroundSdk/Internal/Engine/Firmware/UpdateRestApi.swift

@@ -91,8 +91,9 @@ class UpdateRestApi {
                     do {
                         let requestResult = try decoder.decode(ListRequestResponse.self, from: data)
                         // transform the json object into a `FirmwareStoreEntry` dict indexed by `FirmwareIdentifier`
-                        let firmwares = requestResult.firmwares.map { FirmwareStoreEntry.from(httpFirmware: $0) }
-                            .compactMap { $0 }.reduce([FirmwareIdentifier: FirmwareStoreEntry]()) { dict, value in
+                        let firmwares = requestResult.firmwares
+                            .compactMap(FirmwareStoreEntry.from)
+                            .reduce([FirmwareIdentifier: FirmwareStoreEntry]()) { dict, value in
                                 var dict = dict
                                 dict[value.firmware.firmwareIdentifier] = value
                                 return dict
@@ -103,7 +104,7 @@ class UpdateRestApi {
                             if let model = DeviceModel.from(internalIdHexStr: httpBlacklistedVersions.product) {
 
                                 let blacklistedVersionsForThisModel = httpBlacklistedVersions.versions
-                                    .map { FirmwareVersion.parse(versionStr: $0) }.compactMap { $0 }
+                                    .compactMap(FirmwareVersion.parse)
                                 blacklistedVersions[model] = Set(blacklistedVersionsForThisModel)
                             }
                         }
@@ -216,7 +217,7 @@ fileprivate extension FirmwareStoreEntry {
     /// - Returns: a firmware store entry if the http firmware info are parsable.
     static func from(httpFirmware: UpdateRestApi.HttpFirmwareInfo) -> FirmwareStoreEntry? {
         // for now we simply skip unknown flags, as we do not handle all of them
-        let attributes = httpFirmware.flags?.map { FirmwareAttribute.from(httpAttribute: $0) }.compactMap { $0 } ?? []
+        let attributes = httpFirmware.flags?.compactMap(FirmwareAttribute.from) ?? []
 
         if let model = DeviceModel.from(internalIdHexStr: httpFirmware.product),
             let version = FirmwareVersion.parse(versionStr: httpFirmware.version),

GroundSdk/Internal/Stream/GlRenderSinkCore.swift

@@ -167,15 +167,17 @@ public class GlRenderSinkCore: SinkCore, GlRenderSink {
             return false
         }
         let fillMode = fillModeFrom(scaleType: scaleType, paddingFill: paddingFill)
-        let textureWidth = textureLoader != nil ? textureLoader!.textureSpec.width : 0
-        let textureDarWidth = textureLoader != nil ? textureLoader!.textureSpec.ratioNumerator : 0
-        let textureDarHeight = textureLoader != nil ? textureLoader!.textureSpec.ratioDenominator : 0
+
+        let textureWidth =  textureLoader.map { $0.textureSpec.width } ?? 0
+        let textureDarWidth = textureLoader.map { $0.textureSpec.ratioNumerator } ?? 0
+        let textureDarHeight = textureLoader.map { $0.textureSpec.ratioDenominator } ?? 0
+
         sdkCoreRenderer = stream.startRenderer(renderZone: renderZone, fillMode: fillMode,
                                                zebrasEnabled: zebrasEnabled, zebrasThreshold: Float(zebrasThreshold),
                                                textureWidth: Int32(textureWidth),
                                                textureDarWidth: Int32(textureDarWidth),
                                                textureDarHeight: Int32(textureDarHeight),
-                                               textureLoaderlistener: textureLoader != nil ? self : nil,
+                                               textureLoaderlistener: textureLoader.map { _ in self },
                                                histogramsEnabled: histogramsEnabled, overlayListener: self,
                                                listener: self )
         return sdkCoreRenderer != nil