Merge pull request #253 from mapbox/rl/puck_pulsing_ios

Add support for 2d puck pulsing on iOS

Author: evil159

example/integration_test/location_test.dart

@@ -54,11 +54,10 @@ void main() {
 
     final updatedSettings = await location.getSettings();
     expect(updatedSettings.enabled, settings.enabled);
+    expect(updatedSettings.pulsingEnabled, settings.pulsingEnabled);
+    expect(updatedSettings.pulsingMaxRadius, settings.pulsingMaxRadius);
+    expect(updatedSettings.pulsingColor, settings.pulsingColor);
     if (Platform.isAndroid) {
-      expect(updatedSettings.pulsingEnabled, settings.pulsingEnabled);
-      expect(updatedSettings.pulsingMaxRadius, settings.pulsingMaxRadius);
-      // FIXME colors are parsed incorrectly
-      // expect(updatedSettings.pulsingColor, settings.pulsingColor);
       expect(updatedSettings.layerAbove, settings.layerAbove);
       expect(updatedSettings.layerBelow, settings.layerBelow);
     }

ios/Classes/LocationController.swift

@@ -84,6 +84,18 @@ extension LocationOptions {
                 if let showAccuracyRing = settings.showAccuracyRing {
                     configuration.showsAccuracyRing = showAccuracyRing.boolValue
                 }
+                if settings.pulsingEnabled?.boolValue ?? false {
+                    var pulsing = Puck2DConfiguration.Pulsing()
+
+                    if let radius = settings.pulsingMaxRadius?.intValue {
+                        // -1 indicates "accuracy" mode(from Android)
+                        pulsing.radius = radius == -1 ? .accuracy : .constant(Double(radius))
+                    }
+                    if let color = settings.pulsingColor?.intValue {
+                        pulsing.color = uiColorFromHex(rgbValue: color)
+                    }
+                    configuration.pulsing = pulsing
+                }
 
                 options.puckType = .puck2D(configuration)
             }
@@ -102,6 +114,9 @@ extension LocationOptions {
         var accuracyRingColor: NSNumber?
         var accuracyRingBorderColor: NSNumber?
         var showAccuracyRing: NSNumber?
+        var pulsingEnabled: NSNumber?
+        var pulsingRadius: NSNumber?
+        var pulsingColor: NSNumber?
         let locationPuck2D = FLT_SETTINGSLocationPuck2D.init()
         let locationPuck3D = FLT_SETTINGSLocationPuck3D.init()
         let locationPuck = FLT_SETTINGSLocationPuck.make(with: locationPuck2D, locationPuck3D: locationPuck3D)
@@ -123,6 +138,16 @@ extension LocationOptions {
                 let encoded = try! JSONEncoder().encode(scaleData)
                 locationPuck2D.scaleExpression = String(data: encoded, encoding: .utf8)
             }
+            if let pulsing = oldConfiguration.pulsing {
+                pulsingEnabled = NSNumber(value: true)
+                switch pulsing.radius {
+                case .accuracy:
+                    pulsingRadius = NSNumber(value: -1)
+                case .constant(let radius):
+                    pulsingRadius = NSNumber(value: radius)
+                }
+                pulsingColor = NSNumber(value: pulsing.color.rgb())
+            }
         }
         if case .puck3D(let oldConfiguration) = self.puckType {
             locationPuck3D.modelUri = oldConfiguration.model.uri?.absoluteString
@@ -144,9 +169,9 @@ extension LocationOptions {
 
         return FLT_SETTINGSLocationComponentSettings.make(
             withEnabled: enabled,
-            pulsingEnabled: nil,
-            pulsingColor: nil,
-            pulsingMaxRadius: nil,
+            pulsingEnabled: pulsingEnabled,
+            pulsingColor: pulsingColor,
+            pulsingMaxRadius: pulsingRadius,
             showAccuracyRing: showAccuracyRing,
             accuracyRingColor: accuracyRingColor,
             accuracyRingBorderColor: accuracyRingBorderColor,