react-native-radar 3.11.0 → 3.12.0

package/android/build.gradle

@@ -18,7 +18,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 31
         versionCode 1
-        versionName '3.11.0'
+        versionName '3.12.0'
     }
     lintOptions {
         abortOnError false
@@ -45,6 +45,6 @@ repositories {
 
 dependencies {
     api 'com.facebook.react:react-native:+'
-    api 'io.radar:sdk:3.11.0'
+    api 'io.radar:sdk:3.13.0'
 }
 

package/android/src/main/java/io/radar/react/RNRadarModule.java

@@ -32,11 +32,13 @@ import io.radar.sdk.model.RadarAddress;
 import io.radar.sdk.model.RadarContext;
 import io.radar.sdk.model.RadarEvent;
 import io.radar.sdk.model.RadarGeofence;
+import io.radar.sdk.model.RadarLocationPermissionStatus;
 import io.radar.sdk.model.RadarPlace;
 import io.radar.sdk.model.RadarRouteMatrix;
 import io.radar.sdk.model.RadarRoutes;
 import io.radar.sdk.model.RadarTrip;
 import io.radar.sdk.model.RadarUser;
+import io.radar.sdk.model.RadarVerifiedLocationToken;
 import io.radar.sdk.RadarNotificationOptions;
 
 import org.json.JSONException;
@@ -95,7 +97,7 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         this.fraud = fraud;
         SharedPreferences.Editor editor = getReactApplicationContext().getSharedPreferences("RadarSDK", Context.MODE_PRIVATE).edit();
         editor.putString("x_platform_sdk_type", "ReactNative");
-        editor.putString("x_platform_sdk_version", "3.11.0");
+        editor.putString("x_platform_sdk_version", "3.12.0");
         editor.apply();
         if (fraud) {
             Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud);
@@ -387,27 +389,16 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
             }
         }
 
-        Radar.RadarTrackCallback trackCallback = new Radar.RadarTrackCallback() {
+        Radar.RadarTrackVerifiedCallback trackCallback = new Radar.RadarTrackVerifiedCallback() {
             @Override
-            public void onComplete(@NonNull Radar.RadarStatus status, @Nullable Location location, @Nullable RadarEvent[] events, @Nullable RadarUser user) {
+            public void onComplete(@NonNull Radar.RadarStatus status, @Nullable RadarVerifiedLocationToken token) {
                 if (promise == null) {
                     return;
                 }
 
                 try {
                     if (status == Radar.RadarStatus.SUCCESS) {
-                        WritableMap map = Arguments.createMap();
-                        map.putString("status", status.toString());
-                        if (location != null) {
-                            map.putMap("location", RNRadarUtils.mapForJson(Radar.jsonForLocation(location)));
-                        }
-                        if (events != null) {
-                            map.putArray("events", RNRadarUtils.arrayForJson(RadarEvent.toJson(events)));
-                        }
-                        if (user != null) {
-                            map.putMap("user", RNRadarUtils.mapForJson(user.toJson()));
-                        }
-                        promise.resolve(map);
+                        promise.resolve(token != null ? RNRadarUtils.mapForJson(token.toJson()) : null);
                     } else {
                         promise.reject(status.toString(), status.toString());
                     }
@@ -422,42 +413,28 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
     }
 
     @ReactMethod
-    public void trackVerifiedToken(ReadableMap optionsMap, final Promise promise) {
-
-        boolean beaconsTrackingOption = false;
-
-        if (optionsMap != null) {
-            if (optionsMap.hasKey("beacons")) {
-                beaconsTrackingOption = optionsMap.getBoolean("beacons");
-            }
-        }
-
-        Radar.RadarTrackTokenCallback trackTokenCallback = new Radar.RadarTrackTokenCallback() {
+    public void getVerifiedLocationToken(final Promise promise) {
+        Radar.RadarTrackVerifiedCallback trackCallback = new Radar.RadarTrackVerifiedCallback() {
             @Override
-            public void onComplete(@NonNull Radar.RadarStatus status, @Nullable String token) {
+            public void onComplete(@NonNull Radar.RadarStatus status, @Nullable RadarVerifiedLocationToken token) {
                 if (promise == null) {
                     return;
                 }
 
                 try {
                     if (status == Radar.RadarStatus.SUCCESS) {
-                        WritableMap map = Arguments.createMap();
-                        map.putString("status", status.toString());
-                        if (token != null) {
-                            map.putString("token", token);
-                        }
-                        promise.resolve(map);
+                        promise.resolve(token != null ? RNRadarUtils.mapForJson(token.toJson()) : null);
                     } else {
                         promise.reject(status.toString(), status.toString());
                     }
-                } catch (Exception e) {
-                    Log.e(TAG, "Exception", e);
+                } catch (JSONException e) {
+                    Log.e(TAG, "JSONException", e);
                     promise.reject(Radar.RadarStatus.ERROR_SERVER.toString(), Radar.RadarStatus.ERROR_SERVER.toString());
                 }
             }
         };
 
-        Radar.trackVerifiedToken(beaconsTrackingOption, trackTokenCallback);
+        Radar.getVerifiedLocationToken(trackCallback);
     }
 
     @ReactMethod
@@ -488,17 +465,15 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
 
     @ReactMethod
     public void startTrackingVerified(ReadableMap optionsMap) {
-        boolean token = false;
         boolean beacons = false;
         int interval = 1;
 
         if (optionsMap != null) {
-            token = optionsMap.hasKey("token") ? optionsMap.getBoolean("token") : token;
             beacons = optionsMap.hasKey("beacons") ? optionsMap.getBoolean("beacons") : beacons;
             interval = optionsMap.hasKey("interval") ? optionsMap.getInt("interval") : interval;
         }
 
-        Radar.startTrackingVerified(token, interval, beacons);
+        Radar.startTrackingVerified(interval, beacons);
     }
 
     @ReactMethod
@@ -1022,40 +997,22 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
     }
 
     @ReactMethod
-    public void geocode(String query, final Promise promise) {
+    public void geocode(ReadableMap optionsMap, final Promise promise) {
         if (promise == null) {
             return;
         }
 
-        Radar.geocode(query, new Radar.RadarGeocodeCallback() {
-            @Override
-            public void onComplete(@NonNull Radar.RadarStatus status, @Nullable RadarAddress[] addresses) {
-                if (status == Radar.RadarStatus.SUCCESS) {
-                    try {
-                        WritableMap map = Arguments.createMap();
-                        map.putString("status", status.toString());
-                        if (addresses != null) {
-                            map.putArray("addresses", RNRadarUtils.arrayForJson(RadarAddress.toJson(addresses)));
-                        }
-                        promise.resolve(map);
-                    } catch (JSONException e) {
-                        Log.e(TAG, "JSONException", e);
-                        promise.reject(Radar.RadarStatus.ERROR_SERVER.toString(), Radar.RadarStatus.ERROR_SERVER.toString());
-                    }
-                } else {
-                    promise.reject(status.toString(), status.toString());
-                }
-            }
-        });
-    }
+        if (!optionsMap.hasKey("address")) {
+            promise.reject(Radar.RadarStatus.ERROR_BAD_REQUEST.toString(), Radar.RadarStatus.ERROR_BAD_REQUEST.toString());
 
-    @ReactMethod
-    public void reverseGeocode(final Promise promise) {
-        if (promise == null) {
             return;
         }
 
-        Radar.reverseGeocode(new Radar.RadarGeocodeCallback() {
+        String address = optionsMap.getString("address");
+        String[] layers = optionsMap.hasKey("layers") ? RNRadarUtils.stringArrayForArray(optionsMap.getArray("layers")) : null;
+        String[] countries = optionsMap.hasKey("countries") ? RNRadarUtils.stringArrayForArray(optionsMap.getArray("countries")) : null;
+
+        Radar.geocode(address, layers, countries, new Radar.RadarGeocodeCallback() {
             @Override
             public void onComplete(@NonNull Radar.RadarStatus status, @Nullable RadarAddress[] addresses) {
                 if (status == Radar.RadarStatus.SUCCESS) {
@@ -1078,24 +1035,20 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
     }
 
     @ReactMethod
-    public void reverseGeocode(ReadableMap locationMap, final Promise promise) {
+    public void reverseGeocode(ReadableMap optionsMap, final Promise promise) {
         if (promise == null) {
             return;
         }
 
-        if (locationMap == null) {
-            this.reverseGeocode(promise);
+        ReadableMap locationMap = null;
+        String[] layers = null;
 
-            return;
+        if (optionsMap != null) {
+            locationMap = optionsMap.getMap("location");
+            layers = optionsMap.hasKey("layers") ? RNRadarUtils.stringArrayForArray(optionsMap.getArray("layers")) : null;
         }
 
-        double latitude = locationMap.getDouble("latitude");
-        double longitude = locationMap.getDouble("longitude");
-        Location location = new Location("RNRadarModule");
-        location.setLatitude(latitude);
-        location.setLongitude(longitude);
-
-        Radar.reverseGeocode(location, new Radar.RadarGeocodeCallback() {
+        Radar.RadarGeocodeCallback callback = new Radar.RadarGeocodeCallback() {
             @Override
             public void onComplete(@NonNull Radar.RadarStatus status, @Nullable RadarAddress[] addresses) {
                 if (status == Radar.RadarStatus.SUCCESS) {
@@ -1114,7 +1067,19 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
                     promise.reject(status.toString(), status.toString());
                 }
             }
-        });
+        };
+
+        if (locationMap != null) {
+            double latitude = locationMap.getDouble("latitude");
+            double longitude = locationMap.getDouble("longitude");
+            Location location = new Location("RNRadarModule");
+            location.setLatitude(latitude);
+            location.setLongitude(longitude);
+
+            Radar.reverseGeocode(location, layers, callback);
+        } else {
+            Radar.reverseGeocode(layers, callback);
+        }
     }
 
     @ReactMethod
@@ -1330,4 +1295,32 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         }
     }
 
+    @ReactMethod
+    public void requestForegroundLocationPermission() {
+        Radar.requestForegroundLocationPermission();
+    }
+
+    @ReactMethod
+    public void requestBackgroundLocationPermission() {
+        Radar.requestBackgroundLocationPermission();
+    }
+
+    @ReactMethod
+    public void getLocationPermissionStatus(final Promise promise) {
+        if (promise == null) {
+            return;
+        }
+        try {
+            RadarLocationPermissionStatus options = Radar.getLocationPermissionStatus();
+            promise.resolve(RNRadarUtils.mapForJson(options.toJson()));
+        } catch(JSONException e) {
+            Log.e(TAG, "JSONException", e);
+            promise.reject(Radar.RadarStatus.ERROR_SERVER.toString(), Radar.RadarStatus.ERROR_SERVER.toString());
+        }
+    }
+
+    @ReactMethod
+    public void openAppSettings() {
+        Radar.openAppSettings();
+    }
 }

package/android/src/main/java/io/radar/react/RNRadarReceiver.java

@@ -20,6 +20,7 @@ import io.radar.sdk.Radar;
 import io.radar.sdk.RadarReceiver;
 import io.radar.sdk.model.RadarEvent;
 import io.radar.sdk.model.RadarUser;
+import io.radar.sdk.model.RadarLocationPermissionStatus;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class RNRadarReceiver extends RadarReceiver {
@@ -111,4 +112,16 @@ public class RNRadarReceiver extends RadarReceiver {
         }
     }
 
+    @Override
+    public void onLocationPermissionStatusUpdated(@NonNull Context context, @NonNull RadarLocationPermissionStatus status) {
+        try {
+            ReactApplication reactApplication = ((ReactApplication)context.getApplicationContext());
+            reactNativeHost = reactApplication.getReactNativeHost();
+
+            sendEvent("locationPermissionStatus", RNRadarUtils.mapForJson(status.toJson()));
+        } catch (Exception e) {
+            Log.e(TAG, "Exception", e);
+        }
+    }
+
 }

package/android/src/main/java/io/radar/react/RNRadarVerifiedReceiver.java

@@ -16,6 +16,7 @@ import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 import io.radar.sdk.Radar;
 import io.radar.sdk.RadarVerifiedReceiver;
+import io.radar.sdk.model.RadarVerifiedLocationToken;
 
 public class RNRadarVerifiedReceiver extends RadarVerifiedReceiver {
 
@@ -32,12 +33,12 @@ public class RNRadarVerifiedReceiver extends RadarVerifiedReceiver {
     }
 
     @Override
-    public void onTokenUpdated(@NonNull Context context, @NonNull String token) {
+    public void onTokenUpdated(@NonNull Context context, @NonNull RadarVerifiedLocationToken token) {
         try {
             ReactApplication reactApplication = ((ReactApplication)context.getApplicationContext());
             reactNativeHost = reactApplication.getReactNativeHost();
 
-            sendEvent("token", token);
+            sendEvent("token", RNRadarUtils.mapForJson(token.toJson()));
         } catch (Exception e) {
             Log.e(TAG, "Exception", e);
         }

package/dist/package.json

@@ -3,7 +3,7 @@
     "description": "React Native module for Radar, the leading geofencing and location tracking platform",
     "homepage": "https://radar.com",
     "license": "Apache-2.0",
-    "version": "3.11.0",
+    "version": "3.12.0",
     "main": "dist/src/index.js",
     "files": [
         "android",
@@ -27,6 +27,10 @@
         "reporters": [
             "default",
             "jest-junit"
+        ],
+        "modulePathIgnorePatterns": [
+            "example",
+            "example2"
         ]
     },
     "peerDependencies": {

package/dist/src/@types/RadarNativeInterface.d.ts

@@ -1,4 +1,4 @@
-import { Location, RadarAutocompleteOptions, RadarContextCallback, RadarAddressCallback, RadarEventChannel, RadarGetDistanceOptions, RadarLocationCallback, RadarLogConversionCallback, RadarLogConversionOptions, RadarLogLevel, RadarMockTrackingOptions, RadarNotificationOptions, RadarPermissionsStatus, RadarRouteCallback, RadarRouteMatrix, RadarSearchGeofencesCallback, RadarSearchGeofencesOptions, RadarSearchPlacesCallback, RadarSearchPlacesOptions, RadarStartTripOptions, RadarTrackCallback, RadarTrackOnceOptions, RadarTrackTokenCallback, RadarTrackingOptions, RadarTrackingOptionsDesiredAccuracy, RadarTrackingOptionsForegroundService, RadarTrackVerifiedOptions, RadarTripCallback, RadarTripOptions, RadarUpdateTripOptions, RadarVerifiedTrackingOptions, RadarListenerCallback, RadarGetMatrixOptions, RadarMetadata, RadarIPGeocodeCallback } from "./types";
+import { Location, RadarAutocompleteOptions, RadarContextCallback, RadarAddressCallback, RadarEventChannel, RadarGeocodeOptions, RadarGetDistanceOptions, RadarLocationCallback, RadarLogConversionCallback, RadarLogConversionOptions, RadarLogLevel, RadarMockTrackingOptions, RadarNotificationOptions, RadarPermissionsStatus, RadarReverseGeocodeOptions, RadarRouteCallback, RadarRouteMatrix, RadarSearchGeofencesCallback, RadarSearchGeofencesOptions, RadarSearchPlacesCallback, RadarSearchPlacesOptions, RadarStartTripOptions, RadarTrackCallback, RadarTrackOnceOptions, RadarTrackVerifiedCallback, RadarTrackingOptions, RadarTrackingOptionsDesiredAccuracy, RadarTrackingOptionsForegroundService, RadarTrackVerifiedOptions, RadarTripCallback, RadarTripOptions, RadarUpdateTripOptions, RadarVerifiedTrackingOptions, RadarListenerCallback, RadarGetMatrixOptions, RadarMetadata, RadarIPGeocodeCallback } from "./types";
 export interface RadarNativeInterface {
     initialize: (publishableKey: string, fraud?: boolean) => void;
     setLogLevel: (level: RadarLogLevel) => void;
@@ -13,8 +13,8 @@ export interface RadarNativeInterface {
     requestPermissions: (background: boolean) => Promise<RadarPermissionsStatus>;
     getLocation: (desiredAccuracy?: RadarTrackingOptionsDesiredAccuracy) => Promise<RadarLocationCallback>;
     trackOnce: (options?: RadarTrackOnceOptions | Location) => Promise<RadarTrackCallback>;
-    trackVerifiedToken: (options?: RadarTrackVerifiedOptions) => Promise<RadarTrackTokenCallback>;
-    trackVerified: (options?: RadarTrackVerifiedOptions) => Promise<RadarTrackCallback>;
+    trackVerified: (options?: RadarTrackVerifiedOptions) => Promise<RadarTrackVerifiedCallback>;
+    getVerifiedLocationToken: () => Promise<RadarTrackVerifiedCallback>;
     startTrackingEfficient: () => void;
     startTrackingResponsive: () => void;
     startTrackingContinuous: () => void;
@@ -38,8 +38,8 @@ export interface RadarNativeInterface {
     searchPlaces: (options: RadarSearchPlacesOptions) => Promise<RadarSearchPlacesCallback>;
     searchGeofences: (options: RadarSearchGeofencesOptions) => Promise<RadarSearchGeofencesCallback>;
     autocomplete: (options: RadarAutocompleteOptions) => Promise<RadarAddressCallback>;
-    geocode: (address: string) => Promise<RadarAddressCallback>;
-    reverseGeocode: (location: any) => Promise<RadarAddressCallback>;
+    geocode: (options: RadarGeocodeOptions) => Promise<RadarAddressCallback>;
+    reverseGeocode: (options?: RadarReverseGeocodeOptions) => Promise<RadarAddressCallback>;
     ipGeocode: () => Promise<RadarIPGeocodeCallback>;
     getDistance: (option: RadarGetDistanceOptions) => Promise<RadarRouteCallback>;
     getMatrix: (option: RadarGetMatrixOptions) => Promise<RadarRouteMatrix>;

package/dist/src/@types/types.d.ts

@@ -53,10 +53,17 @@ export interface RadarMockTrackingOptions {
     interval: number;
 }
 export interface RadarVerifiedTrackingOptions {
-    token?: boolean;
     interval?: number;
     beacons?: boolean;
 }
+export interface RadarVerifiedLocationToken {
+    user: RadarUser;
+    events: RadarEvent[];
+    token: string;
+    expiresAt: Date;
+    expiresIn: number;
+    passed: boolean;
+}
 export interface RadarGetDistanceOptions {
     origin?: Location;
     destination?: Location;
@@ -115,6 +122,15 @@ export interface RadarAutocompleteOptions {
     expandUnits?: boolean;
     mailable?: boolean;
 }
+export interface RadarGeocodeOptions {
+    address: string;
+    layers?: string[];
+    countries?: string[];
+}
+export interface RadarReverseGeocodeOptions {
+    location?: Location;
+    layers?: string[];
+}
 export interface RadarNotificationOptions {
     iconString?: string;
     iconColor?: string;
@@ -195,9 +211,9 @@ export interface RadarLogConversionCallback {
     status: string;
     event?: RadarEvent;
 }
-export interface RadarTrackTokenCallback {
+export interface RadarTrackVerifiedCallback {
     status: string;
-    token?: string;
+    token?: RadarVerifiedLocationToken;
 }
 export interface RadarEventUpdate {
     user?: RadarUser;
@@ -227,10 +243,13 @@ export interface RadarErrorCallback {
 export interface RadarLogUpdateCallback {
     (status: string): void;
 }
-export type RadarListenerCallback = RadarEventUpdateCallback | RadarLocationUpdateCallback | RadarClientLocationUpdateCallback | RadarErrorCallback | RadarLogUpdateCallback;
+export interface RadarLocationPermissionStatusCallback {
+    (status: RadarLocationPermissionStatus): void;
+}
+export type RadarListenerCallback = RadarEventUpdateCallback | RadarLocationUpdateCallback | RadarClientLocationUpdateCallback | RadarErrorCallback | RadarLogUpdateCallback | RadarLocationPermissionStatusCallback;
 export type RadarPermissionsStatus = "GRANTED_FOREGROUND" | "GRANTED_BACKGROUND" | "DENIED" | "NOT_DETERMINED" | "UNKNOWN";
 export type RadarLocationSource = "FOREGROUND_LOCATION" | "BACKGROUND_LOCATION" | "MANUAL_LOCATION" | "VISIT_ARRIVAL" | "VISIT_DEPARTURE" | "GEOFENCE_ENTER" | "GEOFENCE_DWELL" | "GEOFENCE_EXIT" | "MOCK_LOCATION" | "BEACON_ENTER" | "BEACON_EXIT" | "UNKNOWN";
-export type RadarEventChannel = "clientLocation" | "location" | "error" | "events" | "log" | "token";
+export type RadarEventChannel = "clientLocation" | "location" | "error" | "events" | "log" | "token" | "locationPermissionStatus";
 export type RadarLogLevel = "info" | "debug" | "warning" | "error" | "none";
 export interface RadarRouteMatrix {
     status: string;
@@ -472,3 +491,24 @@ export interface RadarTrackingOptionsForegroundService {
     iconColor?: string;
 }
 export type RadarTripStatus = "unknown" | "started" | "approaching" | "arrived" | "expired" | "completed" | "canceled";
+export interface RadarLocationPermissionStatusAndroid {
+    status: LocationPermissionState;
+    foregroundPermissionResult: boolean;
+    backgroundPermissionResult: boolean;
+    shouldShowRequestPermissionRationaleFG: boolean;
+    shouldShowRequestPermissionRationaleBG: boolean;
+    previouslyDeniedForeground: boolean;
+    inLocationPopup: boolean;
+    approximatePermissionResult: boolean;
+    previouslyDeniedBackground: boolean;
+}
+export interface RadarLocationPermissionStatusIOS {
+    status: LocationPermissionState;
+    locationManagerStatus: LocationManagerStatus;
+    backgroundPopupAvailable: boolean;
+    inForegroundPopup: boolean;
+    userRejectedBackgroundPermission: boolean;
+}
+export type RadarLocationPermissionStatus = RadarLocationPermissionStatusAndroid | RadarLocationPermissionStatusIOS;
+export type LocationPermissionState = "NO_PERMISSION_GRANTED" | "FOREGROUND_PERMISSION_GRANTED" | "APPROXIMATE_PERMISSION_GRANTED" | "FOREGROUND_PERMISSION_REJECTED_ONCE" | "FOREGROUND_PERMISSION_REJECTED" | "FOREGROUND_PERMISSION_PENDING" | "BACKGROUND_PERMISSION_GRANTED" | "BACKGROUND_PERMISSION_REJECTED" | "BACKGROUND_PERMISSION_REJECTED_ONCE" | "PERMISSION_RESTRICTED" | "UNKNOWN";
+export type LocationManagerStatus = "NotDetermined" | "Restricted" | "Denied" | "AuthorizedAlways" | "AuthorizedWhenInUse" | "Unknown";

package/dist/src/index.native.js

@@ -39,7 +39,7 @@ const trackOnce = (options) => {
     return react_native_1.NativeModules.RNRadar.trackOnce(backCompatibleOptions);
 };
 const trackVerified = (options) => react_native_1.NativeModules.RNRadar.trackVerified(options);
-const trackVerifiedToken = (options) => react_native_1.NativeModules.RNRadar.trackVerifiedToken(options);
+const getVerifiedLocationToken = () => react_native_1.NativeModules.RNRadar.getVerifiedLocationToken();
 const startTrackingEfficient = () => react_native_1.NativeModules.RNRadar.startTrackingEfficient();
 const startTrackingResponsive = () => react_native_1.NativeModules.RNRadar.startTrackingResponsive();
 const startTrackingContinuous = () => react_native_1.NativeModules.RNRadar.startTrackingContinuous();
@@ -63,8 +63,8 @@ const getContext = (location) => react_native_1.NativeModules.RNRadar.getContext
 const searchPlaces = (options) => react_native_1.NativeModules.RNRadar.searchPlaces(options);
 const searchGeofences = (options) => react_native_1.NativeModules.RNRadar.searchGeofences(options);
 const autocomplete = (options) => react_native_1.NativeModules.RNRadar.autocomplete(options);
-const geocode = (address) => react_native_1.NativeModules.RNRadar.geocode(address);
-const reverseGeocode = (location) => react_native_1.NativeModules.RNRadar.reverseGeocode(location);
+const geocode = (options) => react_native_1.NativeModules.RNRadar.geocode(options);
+const reverseGeocode = (options) => react_native_1.NativeModules.RNRadar.reverseGeocode(options);
 const ipGeocode = () => react_native_1.NativeModules.RNRadar.ipGeocode();
 const getDistance = (options) => react_native_1.NativeModules.RNRadar.getDistance(options);
 const getMatrix = (options) => react_native_1.NativeModules.RNRadar.getMatrix(options);
@@ -98,7 +98,7 @@ const Radar = {
     getLocation,
     trackOnce,
     trackVerified,
-    trackVerifiedToken,
+    getVerifiedLocationToken,
     startTrackingEfficient,
     startTrackingResponsive,
     startTrackingContinuous,

package/ios/Cartfile.resolved

@@ -1 +1 @@
-github "radarlabs/radar-sdk-ios" "3.11.0"
+github "radarlabs/radar-sdk-ios" "3.13.1"

package/ios/RNRadar.m

@@ -1,4 +1,5 @@
 #import "RNRadar.h"
+#include <Foundation/Foundation.h>
 
 #import <CoreLocation/CoreLocation.h>
 #import <React/RCTConvert.h>
@@ -23,6 +24,36 @@ RCT_EXPORT_MODULE();
     return self;
 }
 
++ (NSDictionary *)mapLocationPermissionStatus:(NSDictionary *)status {
+    NSString *statusString = status[@"locationPermissionState"];
+    NSString *newStatusString;
+
+    if ([statusString isEqualToString:@"NoPermissionGranted"]) {
+        newStatusString = @"NO_PERMISSION_GRANTED";
+    } else if ([statusString isEqualToString:@"ForegroundPermissionGranted"]) {
+        newStatusString = @"FOREGROUND_PERMISSION_GRANTED";
+    } else if ([statusString isEqualToString:@"ForegroundPermissionRejected"]) {
+        newStatusString = @"FOREGROUND_PERMISSION_REJECTED";
+    } else if ([statusString isEqualToString:@"ForegroundPermissionPending"]) {
+        newStatusString = @"FOREGROUND_PERMISSION_PENDING";
+    } else if ([statusString isEqualToString:@"BackgroundPermissionGranted"]) {
+        newStatusString = @"BACKGROUND_PERMISSION_GRANTED";
+    } else if ([statusString isEqualToString:@"BackgroundPermissionRejected"]) {
+        newStatusString = @"BACKGROUND_PERMISSION_REJECTED";
+    } else if ([statusString isEqualToString:@"BackgroundPermissionPending"]) {
+        newStatusString = @"FOREGROUND_PERMISSION_PENDING";
+    } else if ([statusString isEqualToString:@"PermissionRestricted"]) {
+        newStatusString = @"PERMISSION_RESTRICTED";
+    } else {
+        newStatusString = @"UNKNOWN";
+    }
+
+    NSMutableDictionary *newStatus = [status mutableCopy];
+    [newStatus removeObjectForKey:@"locationPermissionState"];
+    [newStatus setValue:newStatusString forKey:@"status"];
+    return newStatus;
+}
+
 - (void)locationManager:(CLLocationManager *)manager didChangeAuthorizationStatus:(CLAuthorizationStatus)status {
     if (permissionsRequestResolver) {
         [self getPermissionsStatusWithResolver:permissionsRequestResolver rejecter:nil];
@@ -92,15 +123,21 @@ RCT_EXPORT_MODULE();
     }
 }
 
-- (void)didUpdateToken:(NSString *)token {
+- (void)didUpdateToken:(RadarVerifiedLocationToken *)token  {
+    if (hasListeners) {
+        [self sendEventWithName:@"token" body:[token dictionaryValue]];
+    }
+}
+
+- (void)didUpdateLocationPermissionStatus:(RadarLocationPermissionStatus *)status {
     if (hasListeners) {
-        [self sendEventWithName:@"token" body:token];
+        [self sendEventWithName:@"locationPermissionStatus" body:[RNRadar mapLocationPermissionStatus:[status dictionaryValue]]];
     }
 }
 
 RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey fraud:(BOOL)fraud) {
     [[NSUserDefaults standardUserDefaults] setObject:@"ReactNative" forKey:@"radar-xPlatformSDKType"];
-    [[NSUserDefaults standardUserDefaults] setObject:@"3.11.0" forKey:@"radar-xPlatformSDKVersion"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"3.12.0" forKey:@"radar-xPlatformSDKVersion"];
     [Radar initializeWithPublishableKey:publishableKey];
 }
 
@@ -315,20 +352,13 @@ RCT_EXPORT_METHOD(trackVerified:(NSDictionary *)optionsDict resolve:(RCTPromiseR
     __block RCTPromiseResolveBlock resolver = resolve;
     __block RCTPromiseRejectBlock rejecter = reject;
 
-    RadarTrackCompletionHandler completionHandler = ^(RadarStatus status, CLLocation * _Nullable location, NSArray<RadarEvent *> * _Nullable events, RadarUser * _Nullable user) {
+    RadarTrackVerifiedCompletionHandler completionHandler = ^(RadarStatus status, RadarVerifiedLocationToken * _Nullable token) {
         if (status == RadarStatusSuccess && resolver) {
-            NSMutableDictionary *dict = [NSMutableDictionary new];
-            [dict setObject:[Radar stringForStatus:status] forKey:@"status"];
-            if (location) {
-                [dict setObject:[Radar dictionaryForLocation:location] forKey:@"location"];
-            }
-            if (events) {
-                [dict setObject:[RadarEvent arrayForEvents:events] forKey:@"events"];
+            if (token != nil) {
+                resolver([token dictionaryValue]);
+            } else {
+                resolver(nil);
             }
-            if (user) {
-                [dict setObject:[user dictionaryValue] forKey:@"user"];
-            }
-            resolver(dict);
         } else if (rejecter) {
             rejecter([Radar stringForStatus:status], [Radar stringForStatus:status], nil);
         }
@@ -339,26 +369,17 @@ RCT_EXPORT_METHOD(trackVerified:(NSDictionary *)optionsDict resolve:(RCTPromiseR
     [Radar trackVerifiedWithBeacons:beacons completionHandler:completionHandler];
 }
 
-RCT_EXPORT_METHOD(trackVerifiedToken:(NSDictionary *)optionsDict resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
-    BOOL beacons = NO;
-    if (optionsDict != nil) {
-        NSNumber *beaconsNumber = optionsDict[@"beacons"];
-        if (beaconsNumber != nil && [beaconsNumber isKindOfClass:[NSNumber class]]) {
-            beacons = [beaconsNumber boolValue]; 
-        }
-    }
-
+RCT_EXPORT_METHOD(getVerifiedLocationToken:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     __block RCTPromiseResolveBlock resolver = resolve;
     __block RCTPromiseRejectBlock rejecter = reject;
 
-    RadarTrackTokenCompletionHandler completionHandler = ^(RadarStatus status, NSString * _Nullable token) {
+    RadarTrackVerifiedCompletionHandler completionHandler = ^(RadarStatus status, RadarVerifiedLocationToken * _Nullable token) {
         if (status == RadarStatusSuccess && resolver) {
-            NSMutableDictionary *dict = [NSMutableDictionary new];
-            [dict setObject:[Radar stringForStatus:status] forKey:@"status"];
-            if (token) {
-                [dict setObject:token forKey:@"token"];
+            if (token != nil) {
+                resolver([token dictionaryValue]);
+            } else {
+                resolver(nil);
             }
-            resolver(dict);
         } else if (rejecter) {
             rejecter([Radar stringForStatus:status], [Radar stringForStatus:status], nil);
         }
@@ -366,7 +387,7 @@ RCT_EXPORT_METHOD(trackVerifiedToken:(NSDictionary *)optionsDict resolve:(RCTPro
         rejecter = nil;
     };
 
-    [Radar trackVerifiedTokenWithBeacons:beacons completionHandler:completionHandler];
+    [Radar getVerifiedLocationToken:completionHandler];
 }
 
 RCT_EXPORT_METHOD(startTrackingEfficient) {
@@ -406,7 +427,7 @@ RCT_EXPORT_METHOD(startTrackingVerified:(NSDictionary *)optionsDict) {
         }
     }
 
-    [Radar startTrackingVerified:token interval:interval beacons:beacons];
+    [Radar startTrackingVerifiedWithInterval:interval beacons:beacons];
 }
 
 RCT_EXPORT_METHOD(mockTracking:(NSDictionary *)optionsDict) {
@@ -494,7 +515,11 @@ RCT_EXPORT_METHOD(getTripOptions:(RCTPromiseResolveBlock)resolve reject:(RCTProm
     }
     
     RadarTripOptions* options = [Radar getTripOptions];
-    resolve([options dictionaryValue]);
+    if (options != nil) {
+        resolve([options dictionaryValue]);
+    } else {
+        resolve(nil);
+    }
 }
 
 RCT_EXPORT_METHOD(startTrip:(NSDictionary *)optionsDict resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
@@ -873,11 +898,23 @@ RCT_EXPORT_METHOD(autocomplete:(NSDictionary *)optionsDict resolve:(RCTPromiseRe
     }];
 }
 
-RCT_EXPORT_METHOD(geocode:(NSString *)query resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(geocode:(NSDictionary *)optionsDict resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    if (optionsDict[@"address"] == nil) {
+        if (reject) {
+            reject([Radar stringForStatus:RadarStatusErrorBadRequest], [Radar stringForStatus:RadarStatusErrorBadRequest], nil);
+        }
+
+        return;
+    }
+    
+    NSString *query = optionsDict[@"address"];
+    NSArray *layers = optionsDict[@"layers"];
+    NSArray *countries = optionsDict[@"countries"];
+    
     __block RCTPromiseResolveBlock resolver = resolve;
     __block RCTPromiseRejectBlock rejecter = reject;
 
-    [Radar geocodeAddress:query completionHandler:^(RadarStatus status, NSArray<RadarAddress *> * _Nullable addresses) {
+    [Radar geocodeAddress:query layers:layers countries:countries completionHandler:^(RadarStatus status, NSArray<RadarAddress *> * _Nullable addresses) {
         if (status == RadarStatusSuccess && resolver) {
             NSMutableDictionary *dict = [NSMutableDictionary new];
             [dict setObject:[Radar stringForStatus:status] forKey:@"status"];
@@ -893,13 +930,13 @@ RCT_EXPORT_METHOD(geocode:(NSString *)query resolve:(RCTPromiseResolveBlock)reso
     }];
 }
 
-RCT_EXPORT_METHOD(reverseGeocode:(NSDictionary *)locationDict resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
-    CLLocation *location;
-    if (locationDict != nil && [locationDict isKindOfClass:[NSDictionary class]]) {
-        double latitude = [RCTConvert double:locationDict[@"latitude"]];
-        double longitude = [RCTConvert double:locationDict[@"longitude"]];
-        NSDate *timestamp = [NSDate new];
-        location = [[CLLocation alloc] initWithCoordinate:CLLocationCoordinate2DMake(latitude, longitude) altitude:-1 horizontalAccuracy:5 verticalAccuracy:-1 timestamp:timestamp];
+RCT_EXPORT_METHOD(reverseGeocode:(NSDictionary *)optionsDict resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    NSDictionary *locationDict = nil;
+    NSArray *layers = nil;
+
+    if (optionsDict != nil) {
+        locationDict = optionsDict[@"location"];
+        layers = optionsDict[@"layers"];
     }
 
     __block RCTPromiseResolveBlock resolver = resolve;
@@ -920,10 +957,18 @@ RCT_EXPORT_METHOD(reverseGeocode:(NSDictionary *)locationDict resolve:(RCTPromis
         rejecter = nil;
     };
 
-    if (location) {
-        [Radar reverseGeocodeLocation:location completionHandler:completionHandler];
+    if (locationDict != nil && [locationDict isKindOfClass:[NSDictionary class]]) {
+        double latitude = [RCTConvert double:locationDict[@"latitude"]];
+        double longitude = [RCTConvert double:locationDict[@"longitude"]];
+        NSDate *timestamp = [NSDate new];
+        CLLocation *location = [[CLLocation alloc] initWithCoordinate:CLLocationCoordinate2DMake(latitude, longitude) 
+                                                             altitude:-1 
+                                                   horizontalAccuracy:5
+                                                     verticalAccuracy:-1 
+                                                            timestamp:timestamp];
+        [Radar reverseGeocodeLocation:location layers:layers completionHandler:completionHandler];
     } else {
-        [Radar reverseGeocodeWithCompletionHandler:completionHandler];
+        [Radar reverseGeocodeWithLayers:layers completionHandler:completionHandler];
     }
 }
 
@@ -1137,4 +1182,22 @@ RCT_EXPORT_METHOD(logConversion:(NSDictionary *)optionsDict resolve:(RCTPromiseR
         [Radar logConversionWithName:name revenue:revenue metadata:metadata completionHandler:completionHandler];
     }
 }
+
+RCT_EXPORT_METHOD(requestForegroundLocationPermission) {
+    [Radar requestForegroundLocationPermission];
+}
+
+RCT_EXPORT_METHOD(requestBackgroundLocationPermission) {
+    [Radar requestBackgroundLocationPermission];
+}
+
+RCT_EXPORT_METHOD(getLocationPermissionStatus:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    RadarLocationPermissionStatus* status = [Radar getLocationPermissionStatus];
+    resolve([RNRadar mapLocationPermissionStatus:[status dictionaryValue]]);
+}
+
+RCT_EXPORT_METHOD(openAppSettings) {
+    [Radar openAppSettings];
+}
+
 @end

package/package.json

@@ -3,7 +3,7 @@
   "description": "React Native module for Radar, the leading geofencing and location tracking platform",
   "homepage": "https://radar.com",
   "license": "Apache-2.0",
-  "version": "3.11.0",
+  "version": "3.12.0",
   "main": "dist/src/index.js",
   "files": [
     "android",
@@ -27,6 +27,10 @@
     "reporters": [
       "default",
       "jest-junit"
+    ],
+    "modulePathIgnorePatterns": [
+      "example",
+      "example2"
     ]
   },
   "peerDependencies": {

package/react-native-radar.podspec

@@ -15,5 +15,5 @@ Pod::Spec.new do |s|
   s.platform = :ios, "10.0"
 
   s.dependency "React"
-  s.dependency "RadarSDK", "~> 3.11.0"
+  s.dependency "RadarSDK", "~> 3.13.1"
 end

package/src/@types/RadarNativeInterface.ts

@@ -4,6 +4,7 @@ import {
   RadarContextCallback,
   RadarAddressCallback,
   RadarEventChannel,
+  RadarGeocodeOptions,
   RadarGetDistanceOptions,
   RadarLocationCallback,
   RadarLogConversionCallback,
@@ -12,6 +13,7 @@ import {
   RadarMockTrackingOptions,
   RadarNotificationOptions,
   RadarPermissionsStatus,
+  RadarReverseGeocodeOptions,
   RadarRouteCallback,
   RadarRouteMatrix,
   RadarSearchGeofencesCallback,
@@ -21,7 +23,7 @@ import {
   RadarStartTripOptions,
   RadarTrackCallback,
   RadarTrackOnceOptions,
-  RadarTrackTokenCallback,
+  RadarTrackVerifiedCallback,
   RadarTrackingOptions,
   RadarTrackingOptionsDesiredAccuracy,
   RadarTrackingOptionsForegroundService,
@@ -34,6 +36,7 @@ import {
   RadarGetMatrixOptions,
   RadarMetadata,
   RadarIPGeocodeCallback,
+  RadarLocationPermissionStatus,
 } from "./types";
 
 export interface RadarNativeInterface {
@@ -54,8 +57,8 @@ export interface RadarNativeInterface {
   trackOnce: (
     options?: RadarTrackOnceOptions | Location
   ) => Promise<RadarTrackCallback>;
-  trackVerifiedToken: (options?: RadarTrackVerifiedOptions) => Promise<RadarTrackTokenCallback>;
-  trackVerified: (options?: RadarTrackVerifiedOptions) => Promise<RadarTrackCallback>;
+  trackVerified: (options?: RadarTrackVerifiedOptions) => Promise<RadarTrackVerifiedCallback>;
+  getVerifiedLocationToken: () => Promise<RadarTrackVerifiedCallback>;
   startTrackingEfficient: () => void;
   startTrackingResponsive: () => void;
   startTrackingContinuous: () => void;
@@ -87,8 +90,8 @@ export interface RadarNativeInterface {
   autocomplete: (
     options: RadarAutocompleteOptions
   ) => Promise<RadarAddressCallback>;
-  geocode: (address: string) => Promise<RadarAddressCallback>;
-  reverseGeocode: (location: any) => Promise<RadarAddressCallback>;
+  geocode: (options: RadarGeocodeOptions) => Promise<RadarAddressCallback>;
+  reverseGeocode: (options?: RadarReverseGeocodeOptions) => Promise<RadarAddressCallback>;
   ipGeocode: () => Promise<RadarIPGeocodeCallback>;
   getDistance: (option: RadarGetDistanceOptions) => Promise<RadarRouteCallback>;
   getMatrix: (option: RadarGetMatrixOptions) => Promise<RadarRouteMatrix>;

package/src/@types/types.ts

@@ -195,11 +195,19 @@ export interface RadarMockTrackingOptions {
 }
 
 export interface RadarVerifiedTrackingOptions {
-  token?: boolean;
   interval?: number;
   beacons?: boolean;
 }
 
+export interface RadarVerifiedLocationToken {
+  user: RadarUser;
+  events: RadarEvent[];
+  token: string;
+  expiresAt: Date;
+  expiresIn: number;
+  passed: boolean;
+}
+
 export interface RadarGetDistanceOptions {
   origin?: Location;
   destination?: Location;
@@ -266,6 +274,17 @@ export interface RadarAutocompleteOptions {
   mailable?: boolean;
 }
 
+export interface RadarGeocodeOptions {
+  address: string;
+  layers?: string[];
+  countries?: string[];
+}
+
+export interface RadarReverseGeocodeOptions {
+  location?: Location;
+  layers?: string[];
+}
+
 export interface RadarNotificationOptions {
   iconString?: string;
   iconColor?: string;
@@ -361,9 +380,9 @@ export interface RadarLogConversionCallback {
   event?: RadarEvent;
 }
 
-export interface RadarTrackTokenCallback {
+export interface RadarTrackVerifiedCallback {
   status: string;
-  token?: string;
+  token?: RadarVerifiedLocationToken;
 }
 
 export interface RadarEventUpdate {
@@ -402,12 +421,17 @@ export interface RadarLogUpdateCallback {
   (status: string): void;
 }
 
+export interface RadarLocationPermissionStatusCallback {
+  (status: RadarLocationPermissionStatus): void;
+}
+
 export type RadarListenerCallback =
   | RadarEventUpdateCallback
   | RadarLocationUpdateCallback
   | RadarClientLocationUpdateCallback
   | RadarErrorCallback
-  | RadarLogUpdateCallback;
+  | RadarLogUpdateCallback
+  | RadarLocationPermissionStatusCallback;
 
 export type RadarPermissionsStatus =
   | "GRANTED_FOREGROUND"
@@ -430,7 +454,7 @@ export type RadarLocationSource =
   | "BEACON_EXIT"
   | "UNKNOWN";
 
-export type RadarEventChannel = "clientLocation" | "location" | "error" | "events" | "log" | "token";
+export type RadarEventChannel = "clientLocation" | "location" | "error" | "events" | "log" | "token" | "locationPermissionStatus";
 
 export type RadarLogLevel = "info" | "debug" | "warning" | "error" | "none";
 
@@ -759,3 +783,47 @@ export type RadarTripStatus =
   | "expired"
   | "completed"
   | "canceled";
+
+export interface RadarLocationPermissionStatusAndroid {
+  status: LocationPermissionState;
+  foregroundPermissionResult: boolean;
+  backgroundPermissionResult: boolean;
+  shouldShowRequestPermissionRationaleFG: boolean;
+  shouldShowRequestPermissionRationaleBG: boolean;
+  previouslyDeniedForeground: boolean;
+  inLocationPopup: boolean;
+  approximatePermissionResult: boolean;
+  previouslyDeniedBackground: boolean;
+}
+
+export interface RadarLocationPermissionStatusIOS {
+  status: LocationPermissionState;
+  locationManagerStatus: LocationManagerStatus;
+  backgroundPopupAvailable: boolean;
+  inForegroundPopup: boolean;
+  userRejectedBackgroundPermission: boolean;
+}
+
+export type RadarLocationPermissionStatus = 
+  RadarLocationPermissionStatusAndroid | RadarLocationPermissionStatusIOS
+
+export type LocationPermissionState = 
+  | "NO_PERMISSION_GRANTED"
+  | "FOREGROUND_PERMISSION_GRANTED"
+  | "APPROXIMATE_PERMISSION_GRANTED"
+  | "FOREGROUND_PERMISSION_REJECTED_ONCE"
+  | "FOREGROUND_PERMISSION_REJECTED"
+  | "FOREGROUND_PERMISSION_PENDING"
+  | "BACKGROUND_PERMISSION_GRANTED"
+  | "BACKGROUND_PERMISSION_REJECTED"
+  | "BACKGROUND_PERMISSION_REJECTED_ONCE"
+  | "PERMISSION_RESTRICTED"
+  | "UNKNOWN";
+
+export type LocationManagerStatus = 
+  | "NotDetermined"
+  | "Restricted"
+  | "Denied"
+  | "AuthorizedAlways"
+  | "AuthorizedWhenInUse"
+  | "Unknown";

package/src/index.native.ts

@@ -7,6 +7,7 @@ import {
   RadarContextCallback,
   RadarAddressCallback,
   RadarEventChannel,
+  RadarGeocodeOptions,
   RadarGetDistanceOptions,
   RadarLocationCallback,
   RadarLogConversionCallback,
@@ -15,6 +16,7 @@ import {
   RadarMockTrackingOptions,
   RadarNotificationOptions,
   RadarPermissionsStatus,
+  RadarReverseGeocodeOptions,
   RadarRouteCallback,
   RadarRouteMatrix,
   RadarSearchGeofencesCallback,
@@ -24,7 +26,6 @@ import {
   RadarStartTripOptions,
   RadarTrackCallback,
   RadarTrackOnceOptions,
-  RadarTrackTokenCallback,
   RadarTrackingOptions,
   RadarTrackingOptionsDesiredAccuracy,
   RadarTrackingOptionsForegroundService,
@@ -37,6 +38,7 @@ import {
   RadarMetadata,
   RadarIPGeocodeCallback,
   RadarTrackVerifiedOptions,
+  RadarTrackVerifiedCallback,
 } from "./@types/types";
 
 if (
@@ -106,11 +108,11 @@ const trackOnce = (
   return NativeModules.RNRadar.trackOnce(backCompatibleOptions);
 };
 
-const trackVerified = (options?: RadarTrackVerifiedOptions): Promise<RadarTrackCallback> =>
+const trackVerified = (options?: RadarTrackVerifiedOptions): Promise<RadarTrackVerifiedCallback> =>
   NativeModules.RNRadar.trackVerified(options);
 
-const trackVerifiedToken = (options?: RadarTrackVerifiedOptions): Promise<RadarTrackTokenCallback> =>
-  NativeModules.RNRadar.trackVerifiedToken(options);
+const getVerifiedLocationToken = (): Promise<RadarTrackVerifiedCallback> => 
+  NativeModules.RNRadar.getVerifiedLocationToken();
 
 const startTrackingEfficient = (): void =>
   NativeModules.RNRadar.startTrackingEfficient();
@@ -187,11 +189,11 @@ const autocomplete = (
   options: RadarAutocompleteOptions
 ): Promise<RadarAddressCallback> => NativeModules.RNRadar.autocomplete(options);
 
-const geocode = (address: string): Promise<RadarAddressCallback> =>
-  NativeModules.RNRadar.geocode(address);
+const geocode = (options: RadarGeocodeOptions): Promise<RadarAddressCallback> =>
+  NativeModules.RNRadar.geocode(options);
 
-const reverseGeocode = (location: Location): Promise<RadarAddressCallback> =>
-  NativeModules.RNRadar.reverseGeocode(location);
+const reverseGeocode = (options?: RadarReverseGeocodeOptions): Promise<RadarAddressCallback> =>
+  NativeModules.RNRadar.reverseGeocode(options);
 
 const ipGeocode = (): Promise<RadarIPGeocodeCallback> =>
   NativeModules.RNRadar.ipGeocode();
@@ -244,7 +246,7 @@ const Radar: RadarNativeInterface = {
   getLocation,
   trackOnce,
   trackVerified,
-  trackVerifiedToken,
+  getVerifiedLocationToken,
   startTrackingEfficient,
   startTrackingResponsive,
   startTrackingContinuous,