@sentiance-react-native/core 6.2.0-rc.2 → 6.2.1

package/android/src/main/java/com/sentiance/react/bridge/core/SentianceConverter.java

@@ -1,5 +1,7 @@
 package com.sentiance.react.bridge.core;
 
+import static com.sentiance.react.bridge.core.common.SentianceCommonConverter.convertLocation;
+
 import android.location.Location;
 
 import com.facebook.react.bridge.Arguments;
@@ -207,19 +209,6 @@ public class SentianceConverter {
     return map;
   }
 
-  public static WritableMap convertLocation(Location location) {
-    WritableMap locationMap = Arguments.createMap();
-
-    locationMap.putString("latitude", String.valueOf(location.getLatitude()));
-    locationMap.putString("longitude", String.valueOf(location.getLongitude()));
-    locationMap.putString("accuracy", String.valueOf(location.getAccuracy()));
-    locationMap.putString("altitude", String.valueOf(location.getAltitude()));
-    locationMap.putString("provider", location.getProvider());
-
-    return locationMap;
-
-  }
-
   public static String convertTripType(TripType tripType) {
     switch (tripType) {
       case ANY:

package/android/src/main/java/com/sentiance/react/bridge/core/common/SentianceCommonConverter.java

@@ -0,0 +1,24 @@
+package com.sentiance.react.bridge.core.common;
+
+import android.location.Location;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
+
+public class SentianceCommonConverter {
+
+  public static WritableMap convertLocation(Location location) {
+    WritableMap locationMap = Arguments.createMap();
+    locationMap.putDouble("timestamp", location.getTime());
+    locationMap.putDouble("latitude", location.getLatitude());
+    locationMap.putDouble("longitude", location.getLongitude());
+    if (location.hasAccuracy()) {
+      locationMap.putDouble("accuracy", location.getAccuracy());
+    }
+    if (location.hasAltitude()) {
+      locationMap.putDouble("altitude", location.getAltitude());
+    }
+    locationMap.putString("provider", location.getProvider());
+    return locationMap;
+  }
+}

package/ios/RNSentianceCore+Converter.m

@@ -8,11 +8,13 @@
 
 #import "RNSentianceCore+Converter.h"
 @import UIKit.UIApplication;
+@import CoreLocation;
 
 @interface RNSentianceCore (Private)
 
 - (NSString*)convertTimelineEventTypeToString:(SENTTimelineEventType)type;
 - (NSDictionary*)convertGeolocation:(SENTGeolocation*)location;
+- (NSDictionary*)convertCllocation:(CLLocation*)location;
 - (NSString*)convertVenueSignificance:(SENTVenueSignificance)type;
 - (NSDictionary*)convertVenue:(SENTVenue*)venue;
 - (void)addStationaryEventInfoToDict:(NSMutableDictionary*)dict event:(SENTStationaryEvent*)event;
@@ -52,6 +54,22 @@
     };
 }
 
+- (NSDictionary*)convertCllocation:(CLLocation*)location {
+    NSMutableDictionary* dict = [[NSMutableDictionary alloc] init];
+    dict[@"timestamp"] = @((long) ([location.timestamp timeIntervalSince1970] * 1000));
+    dict[@"latitude"] = @(location.coordinate.latitude);
+    dict[@"longitude"] = @(location.coordinate.longitude);
+
+    if (location.horizontalAccuracy >= 0) {
+        dict[@"accuracy"] = @(location.horizontalAccuracy);
+    }
+    if (location.verticalAccuracy > 0) {
+        dict[@"altitude"] = @(location.altitude);
+    }
+
+    return dict;
+}
+
 - (NSString*)convertSemanticTime:(SENTSemanticTime)semanticTime {
     switch (semanticTime) {
         case SENTSemanticTimeMorning:
@@ -756,6 +774,13 @@
     dict[@"speedAtImpact"] = @(crashEvent.speedAtImpact);
     dict[@"deltaV"] = @(crashEvent.deltaV);
     dict[@"confidence"] = @(crashEvent.confidence);
+
+    NSMutableArray *precedingLocations = [[NSMutableArray alloc] init];
+    for (CLLocation* location in crashEvent.precedingLocations) {
+        [precedingLocations addObject:[self convertCllocation:location]];
+    }
+    dict[@"precedingLocations"] = precedingLocations;
+
     return [dict copy];
 }
 

package/ios/RNSentianceCore.podspec

@@ -4,7 +4,7 @@ sentiance_sdk_version = package['sdkVersions']['ios']['sentiance']
 
 Pod::Spec.new do |s|
   s.name         = "RNSentianceCore"
-  s.version      = "6.0.0"
+  s.version      = "6.2.1"
   s.summary      = "RNSentianceCore"
   s.description  = <<-DESC
                    RNSentianceCore

package/lib/index.d.ts

@@ -61,10 +61,10 @@ declare module "@sentiance-react-native/core" {
   }
 
   export interface Location {
-    latitude: string;
-    longitude: string;
-    accuracy?: string; // Android only
-    altitude?: string; // Android only
+    latitude: number;
+    longitude: number;
+    accuracy?: number;
+    altitude?: number;
     provider?: string; // Android only
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentiance-react-native/core",
-  "version": "6.2.0-rc.2",
+  "version": "6.2.1",
   "description": "React Native Sentiance core library",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -29,10 +29,10 @@
       "targetSdk": 31,
       "compileSdk": 31,
       "buildTools": "30.0.3",
-      "sentiance": "6.2.0-rc1"
+      "sentiance": "6.2+"
     },
     "ios": {
-      "sentiance": "~> 6.2.0-rc4"
+      "sentiance": "~> 6.2.0"
     }
   }
 }