@sentiance-react-native/core 6.2.3 → 6.3.0-rc.2

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:
@@ -299,40 +317,18 @@
             return @"ANTICIPATIVE_DRIVER";
         case SENTSegmentTypeBarGoer:
             return @"BAR_GOER";
-        case SENTSegmentTypeBeautyQueen:
-            return @"BEAUTY_QUEEN";
-        case SENTSegmentTypeBrandLoyalBar:
-            return @"BRAND_LOYAL__BAR";
-        case SENTSegmentTypeBrandLoyalCafe:
-            return @"BRAND_LOYAL__CAFE";
-        case SENTSegmentTypeBrandLoyalRestaurant:
-            return @"BRAND_LOYAL__RESTAURANT";
-        case SENTSegmentTypeBrandLoyalRetail:
-            return @"BRAND_LOYAL__RETAIL";
-        case SENTSegmentTypeBrandLoyalty:
-            return @"BRAND_LOYALTY";
-        case SENTSegmentTypeBrandLoyaltyGasStations:
-            return @"BRAND_LOYALTY__GAS_STATIONS";
-        case SENTSegmentTypeBrandLoyaltyRestaurantBar:
-            return @"BRAND_LOYALTY__RESTAURANT_BAR";
-        case SENTSegmentTypeBrandLoyaltySupermarket:
-            return @"BRAND_LOYALTY__SUPERMARKET";
         case SENTSegmentTypeCityDriver:
             return @"CITY_DRIVER";
         case SENTSegmentTypeCityHome:
             return @"CITY_HOME";
         case SENTSegmentTypeCityWorker:
             return @"CITY_WORKER";
-        case SENTSegmentTypeClubber:
-            return @"CLUBBER";
         case SENTSegmentTypeCultureBuff:
             return @"CULTURE_BUFF";
         case SENTSegmentTypeDieHardDriver:
             return @"DIE_HARD_DRIVER";
         case SENTSegmentTypeDistractedDriver:
             return @"DISTRACTED_DRIVER";
-        case SENTSegmentTypeDoItYourselver:
-            return @"DO_IT_YOURSELVER";
         case SENTSegmentTypeDogWalker:
             return @"DOG_WALKER";
         case SENTSegmentTypeEarlyBird:
@@ -341,16 +337,12 @@
             return @"EASY_COMMUTER";
         case SENTSegmentTypeEfficientDriver:
             return @"EFFICIENT_DRIVER";
-        case SENTSegmentTypeFashionista:
-            return @"FASHIONISTA";
         case SENTSegmentTypeFoodie:
             return @"FOODIE";
         case SENTSegmentTypeFrequentFlyer:
             return @"FREQUENT_FLYER";
         case SENTSegmentTypeFulltimeWorker:
             return @"FULLTIME_WORKER";
-        case SENTSegmentTypeGamer:
-            return @"GAMER";
         case SENTSegmentTypeGreenCommuter:
             return @"GREEN_COMMUTER";
         case SENTSegmentTypeHealthyBiker:
@@ -413,34 +405,6 @@
             return @"RECENTLY_MOVED_HOME";
         case SENTSegmentTypeRestoLover:
             return @"RESTO_LOVER";
-        case SENTSegmentTypeRestoLoverAmerican:
-            return @"RESTO_LOVER__AMERICAN";
-        case SENTSegmentTypeRestoLoverAsian:
-            return @"RESTO_LOVER__ASIAN";
-        case SENTSegmentTypeRestoLoverBarbecue:
-            return @"RESTO_LOVER__BARBECUE";
-        case SENTSegmentTypeRestoLoverFastfood:
-            return @"RESTO_LOVER__FASTFOOD";
-        case SENTSegmentTypeRestoLoverFrench:
-            return @"RESTO_LOVER__FRENCH";
-        case SENTSegmentTypeRestoLoverGerman:
-            return @"RESTO_LOVER__GERMAN";
-        case SENTSegmentTypeRestoLoverGreek:
-            return @"RESTO_LOVER__GREEK";
-        case SENTSegmentTypeRestoLoverGrill:
-            return @"RESTO_LOVER__GRILL";
-        case SENTSegmentTypeRestoLoverInternational:
-            return @"RESTO_LOVER__INTERNATIONAL";
-        case SENTSegmentTypeRestoLoverItalian:
-            return @"RESTO_LOVER__ITALIAN";
-        case SENTSegmentTypeRestoLoverMediterranean:
-            return @"RESTO_LOVER__MEDITERRANEAN";
-        case SENTSegmentTypeRestoLoverMexican:
-            return @"RESTO_LOVER__MEXICAN";
-        case SENTSegmentTypeRestoLoverSeafood:
-            return @"RESTO_LOVER__SEAFOOD";
-        case SENTSegmentTypeRestoLoverSnack:
-            return @"RESTO_LOVER__SNACK";
         case SENTSegmentTypeRuralHome:
             return @"RURAL_HOME";
         case SENTSegmentTypeRuralWorker:
@@ -756,6 +720,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.3.0-rc.2"
   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.3",
+  "version": "6.3.0-rc.2",
   "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.+"
+      "sentiance": "6.3.0-rc1"
     },
     "ios": {
-      "sentiance": "~> 6.2.0"
+      "sentiance": "~> 6.3.0-rc2"
     }
   }
 }