Merge pull request #218 from Unity-Technologies/ios-location-improvements

iOS Location improvements and fixes

Author: aurimasc

TestProjects/Main/Assets/Resources/iOSNotifications/LocationTrigger/Location Triggered.asset

@@ -13,18 +13,19 @@ MonoBehaviour:
   m_Name: Location Triggered
   m_EditorClassIdentifier: 
   ButtonName: Send A Notification (Location Trigger)
-  Identifier: 
+  Identifier: loc_not
   CategoryIdentifier: category_indentifier
   ThreadIdentifier: thread_identifier
   Title: Location Notification Title
   Subtitle: This is a subtitle
   Body: And this is the body of this notification
-  ShowInForeground: 0
+  ShowInForeground: 1
   PresentationOptions: 6
   Badge: -1
   Data: This notification also includes some data
-  CenterX: 22.2847
-  CenterY: 114.1582
+  Latitude: 22.2847
+  Longitude: 114.1582
   Radius: 5000
   NotifyOnEntry: 1
   NotifyOnExit: 1
+  Repeats: 1

TestProjects/Main/Assets/Scripts/ScriptableObjects/iOSNotificationTemplateLocationTrigger.cs

@@ -34,11 +34,12 @@ public class iOSNotificationTemplateLocationTrigger : ScriptableObject
 
         [Space(10)]
         [Header("Location Trigger")]
-        public float CenterX = 0f;
-        public float CenterY = 0f;
+        public double Latitude = 0f;
+        public double Longitude = 0f;
         public float Radius = 2f;
         public bool NotifyOnEntry = true;
         public bool NotifyOnExit = false;
+        public bool Repeats = false;
 #endif
     }
 }

TestProjects/Main/Assets/Scripts/iOSTest.cs

@@ -321,10 +321,12 @@ private void InstantiateAllTestButtons()
                             Data = template.Data,
                             Trigger = new iOSNotificationLocationTrigger()
                             {
-                                Center = new Vector2(template.CenterX, template.CenterY),
+                                Latitude = template.Latitude,
+                                Longitude = template.Longitude,
                                 Radius = template.Radius,
                                 NotifyOnEntry = template.NotifyOnEntry,
-                                NotifyOnExit = template.NotifyOnExit
+                                NotifyOnExit = template.NotifyOnExit,
+                                Repeats = template.Repeats,
                             }
                         }
                     );
@@ -344,13 +346,13 @@ private void InstantiateAllTestButtons()
                 Transform buttonGroup =
                     GameObject.Instantiate(m_gameObjectReferences.ButtonGroupTemplate, m_gameObjectReferences.ButtonScrollViewContent);
                 Transform buttonGroupName = buttonGroup.GetChild(0).transform;
-                Transform buttonGameObject = buttonGroup.GetChild(1).transform;
+                Transform buttonGameObject = buttonGroup.GetChild(1).GetChild(0).transform;
                 // Set group name
                 buttonGroupName.GetComponentInChildren<Text>().text = group.Key.ToString();
                 // Instantiate buttons
                 foreach (DictionaryEntry test in group.Value)
                 {
-                    Transform button = GameObject.Instantiate(buttonGameObject, buttonGroup);
+                    Transform button = GameObject.Instantiate(buttonGameObject, buttonGroup.GetChild(1));
                     button.gameObject.GetComponentInChildren<Text>().text = test.Key.ToString();
                     button.GetComponent<Button>().onClick.AddListener(delegate
                     {

TestProjects/Main/SimulateLocation.gpx

@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<gpx version="1.1" creator="Xcode">
+    <!-- A location used by location trigger button -->
+    <wpt lat="22.2847" lon="114.1582">
+        <name>Somewhere</name>
+    </wpt>
+</gpx>

com.unity.mobile.notifications/Documentation~/iOS.md

@@ -123,7 +123,8 @@ In the example below, the center coordinate is defined using the WGS 84 system.
 ```c#
 var locationTrigger = new iOSNotificationLocationTrigger()
 {
-    Center = new Vector2(2.294498f, 48.858263f),
+    Latitude = 48.858263,
+    Longitude = 2.294498,
     Radius = 250f,
     NotifyOnEntry = true,
     NotifyOnExit = false,

com.unity.mobile.notifications/Runtime/iOS/Plugins/UnityNotificationData.h

@@ -64,11 +64,12 @@ typedef struct iOSNotificationData
 
         struct
         {
-            float centerX;
-            float centerY;
+            double latitude;
+            double longitude;
             float radius;
             unsigned char notifyOnEntry;
             unsigned char notifyOnExit;
+            unsigned char repeats;
         } location;
     } trigger;
 } iOSNotificationData;

com.unity.mobile.notifications/Runtime/iOS/Plugins/UnityNotificationData.m

@@ -164,11 +164,12 @@ iOSNotificationData UNNotificationRequestToiOSNotificationData(UNNotificationReq
         UNLocationNotificationTrigger* locationTrigger = (UNLocationNotificationTrigger*)request.trigger;
         CLCircularRegion *region = (CLCircularRegion*)locationTrigger.region;
 
-        notificationData.trigger.location.centerX = region.center.latitude;
-        notificationData.trigger.location.centerY = region.center.longitude;
+        notificationData.trigger.location.latitude = region.center.latitude;
+        notificationData.trigger.location.longitude = region.center.longitude;
         notificationData.trigger.location.radius = region.radius;
         notificationData.trigger.location.notifyOnExit = region.notifyOnEntry;
         notificationData.trigger.location.notifyOnEntry = region.notifyOnExit;
+        notificationData.trigger.location.repeats = locationTrigger.repeats;
 #endif
     }
     else if ([request.trigger isKindOfClass: [UNPushNotificationTrigger class]])

com.unity.mobile.notifications/Runtime/iOS/Plugins/UnityNotificationManager.m

@@ -335,14 +335,14 @@ - (void)scheduleLocalNotification:(iOSNotificationData*)data
     else if (data->triggerType == LOCATION_TRIGGER)
     {
 #if UNITY_USES_LOCATION
-        CLLocationCoordinate2D center = CLLocationCoordinate2DMake(data->trigger.location.centerX, data->trigger.location.centerY);
+        CLLocationCoordinate2D center = CLLocationCoordinate2DMake(data->trigger.location.latitude, data->trigger.location.longitude);
 
         CLCircularRegion* region = [[CLCircularRegion alloc] initWithCenter: center
                                     radius: data->trigger.location.radius identifier: identifier];
         region.notifyOnEntry = data->trigger.location.notifyOnEntry;
         region.notifyOnExit = data->trigger.location.notifyOnExit;
 
-        trigger = [UNLocationNotificationTrigger triggerWithRegion: region repeats: NO];
+        trigger = [UNLocationNotificationTrigger triggerWithRegion: region repeats: data->trigger.location.repeats];
 #else
         return;
 #endif

com.unity.mobile.notifications/Runtime/iOS/iOSNotification.cs

@@ -82,11 +82,12 @@ internal struct CalendarTriggerData
     [StructLayout(LayoutKind.Sequential)]
     internal struct LocationTriggerData
     {
-        public float centerX;
-        public float centerY;
+        public double latitude;
+        public double longitude;
         public float radius;
         public Byte notifyOnEntry;
         public Byte notifyOnExit;
+        public Byte repeats;
     }
 
     [StructLayout(LayoutKind.Explicit)]
@@ -348,11 +349,12 @@ public iOSNotificationTrigger Trigger
                     case iOSNotificationTriggerType.Location:
                         {
                             var trigger = (iOSNotificationLocationTrigger)value;
-                            data.trigger.location.centerX = trigger.Center.x;
-                            data.trigger.location.centerY = trigger.Center.y;
+                            data.trigger.location.latitude = trigger.Latitude;
+                            data.trigger.location.longitude = trigger.Longitude;
                             data.trigger.location.notifyOnEntry = (byte)(trigger.NotifyOnEntry ? 1 : 0);
                             data.trigger.location.notifyOnExit = (byte)(trigger.NotifyOnExit ? 1 : 0);
                             data.trigger.location.radius = trigger.Radius;
+                            data.trigger.location.repeats = (byte)(trigger.Repeats ? 1 : 0);
                             break;
                         }
                     case iOSNotificationTriggerType.Push:
@@ -394,10 +396,12 @@ public iOSNotificationTrigger Trigger
                     case iOSNotificationTriggerType.Location:
                         return new iOSNotificationLocationTrigger()
                         {
-                            Center = new Vector2(data.trigger.location.centerX, data.trigger.location.centerY),
+                            Latitude = data.trigger.location.latitude,
+                            Longitude = data.trigger.location.longitude,
                             Radius = data.trigger.location.radius,
                             NotifyOnEntry = data.trigger.location.notifyOnEntry != 0,
-                            NotifyOnExit = data.trigger.location.notifyOnExit != 0
+                            NotifyOnExit = data.trigger.location.notifyOnExit != 0,
+                            Repeats = data.trigger.location.repeats != 0,
                         };
                     case iOSNotificationTriggerType.Push:
                         return new iOSNotificationPushTrigger();

com.unity.mobile.notifications/Runtime/iOS/iOSNotificationTriggers.cs

@@ -62,7 +62,29 @@ public struct iOSNotificationLocationTrigger : iOSNotificationTrigger
         /// <summary>
         /// The center point of the geographic area.
         /// </summary>
-        public Vector2 Center { get; set; }
+        [Obsolete("Use Latitude and Longitude", false)]
+        public Vector2 Center
+        {
+            get
+            {
+                return new Vector2((float)Latitude, (float)Longitude);
+            }
+            set
+            {
+                Latitude = value.x;
+                Longitude = value.y;
+            }
+        }
+
+        /// <summary>
+        /// The latitude of the center point of the geographic area.
+        /// </summary>
+        public double Latitude { get; set; }
+
+        /// <summary>
+        /// The longitude of the center point of the geographic area.
+        /// </summary>
+        public double Longitude { get; set; }
 
         /// <summary>
         /// The radius (measured in meters) that defines the geographic area’s outer boundary.
@@ -78,6 +100,11 @@ public struct iOSNotificationLocationTrigger : iOSNotificationTrigger
         /// When this property is enabled, a device crossing from inside the region to outside the region triggers the delivery of a notification
         /// </summary>
         public bool NotifyOnExit { get; set; }
+
+        /// <summary>
+        /// Whether the notification should repeat.
+        /// </summary>
+        public bool Repeats { get; set; }
     }
 
     /// <summary>