react-native-steerpath-smart-map 1.23.2 → 1.24.0

package/CHANGELOG.md

@@ -15,6 +15,10 @@ This package is built on top of Steerpath's Smart SDK, and most of releases are
 - [iOS](https://s3-eu-west-1.amazonaws.com/steerpath/ios/releases/smart-sdk-changelog/index.html)
 - [Web](https://s3-eu-west-1.amazonaws.com/steerpath-web-sdk/documentation/smart/latest/index.html)
 
+## [1.24.0] - 2023-06-29
+
+- Added SmartLocationManager to listen for user location updates
+
 ## [1.23.2] - 2023-06-26
 
 - Bump iOS Smart SDK version to 1.17.2

package/android/src/main/java/com/steerpath/rnsmartmap/RNEventKeys.java

@@ -24,4 +24,6 @@ public class RNEventKeys {
     public static final String NAVIGATION_PREVIEW_APPEARED = "onNavigationPreviewAppeared";
     public static final String NAVIGATION_DESTINATION_REACHED = "onNavigationDestinationReached";
     public static final String ON_BACK_PRESSED = "onBackPressed";
+
+    public static final String ON_LOCATION_CHANGED = "locationChanged";
 }

package/android/src/main/java/com/steerpath/rnsmartmap/RNSmartLocationManager.java

@@ -0,0 +1,77 @@
+package com.steerpath.rnsmartmap;
+
+import static com.steerpath.rnsmartmap.RNEventKeys.ON_LOCATION_CHANGED;
+
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.WritableNativeMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+import com.steerpath.smart.SmartLocationManager;
+import com.steerpath.smart.listeners.SmartLocationListener;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class RNSmartLocationManager extends ReactContextBaseJavaModule implements SmartLocationListener{
+
+    private final ReactApplicationContext appContext;
+    private int listenerCount = 0;
+
+    public RNSmartLocationManager(@Nonnull ReactApplicationContext reactContext) {
+        super(reactContext);
+        this.appContext = reactContext;
+    }
+
+    @NonNull
+    @Override
+    public String getName() {
+        return "RNSmartLocationManager";
+    }
+
+    @ReactMethod
+    public void addListener(String eventName) {
+        Log.d("LocationManager", "add listener");
+        if (listenerCount == 0) {
+            SmartLocationManager.addLocationListener(this);
+        }
+        listenerCount++;
+    }
+
+    @ReactMethod
+    public void removeListeners(Integer count) {
+        Log.d("LocationManager", "remove listener");
+        listenerCount -= count;
+        if (listenerCount == 0) {
+            SmartLocationManager.removeLocationListener(this);
+        }
+    }
+
+    @Override
+    public void onLocationChanged(double latitude, double longitude, @Nullable String buildingRef, int floorIndex) {
+        WritableNativeMap map = new WritableNativeMap();
+        map.putDouble("latitude", latitude);
+        map.putDouble("longitude", longitude);
+        if (buildingRef == null) {
+            map.putNull("buildingRef");
+        } else {
+            map.putString("buildingRef", buildingRef);
+        }
+        map.putInt("floorIndex", floorIndex);
+        sendEvent(appContext, ON_LOCATION_CHANGED, map);
+    }
+
+    private void sendEvent(ReactContext reactContext,
+                           String eventName,
+                           @Nullable WritableMap params) {
+        reactContext
+                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                .emit(eventName, params);
+    }
+}

package/android/src/main/java/com/steerpath/rnsmartmap/RNSmartMapPackage.java

@@ -32,6 +32,7 @@ public class RNSmartMapPackage implements ReactPackage {
         modules.add(new RNSmartMapManager(reactContext));
         modules.add(new RNSmartGeofenceManager(reactContext));
         modules.add(new RNSmartMapModule(reactContext));
+        modules.add(new RNSmartLocationManager(reactContext));
         return modules;
     }
 }

package/dist/index.d.ts

@@ -2,3 +2,4 @@ export * from './SmartGeofenceManager';
 export * from './SmartMapManager';
 export * from './SmartMapView';
 export * from './SmartMapViewProps';
+export * from './SmartLocationManager';

package/dist/index.js

@@ -2,3 +2,4 @@ export * from './SmartGeofenceManager';
 export * from './SmartMapManager';
 export * from './SmartMapView';
 export * from './SmartMapViewProps';
+export * from './SmartLocationManager';

package/ios/RNSmartLocationManager.h

@@ -0,0 +1,22 @@
+//
+//  RNSmartLocationManager.h
+//  SteerpathSmartMapSdk
+//
+//  Created by Roope Vilo on 24.5.2023.
+//  Copyright © 2023 Facebook. All rights reserved.
+//
+
+#ifndef RNSmartLocationManager_h
+#define RNSmartLocationManager_h
+
+#import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
+
+@import SteerpathSmartSDK;
+
+@interface RNSmartLocationManager : RCTEventEmitter<RCTBridgeModule, SPSmartLocationManagerDelegate>
+
+@end
+
+
+#endif /* RNSmartLocationManager_h */

package/ios/RNSmartLocationManager.m

@@ -0,0 +1,39 @@
+//
+//  RNSmartLocationManager.m
+//  SteerpathSmartMapSdk
+//
+//  Created by Roope Vilo on 24.5.2023.
+//  Copyright © 2023 Facebook. All rights reserved.
+//
+
+#import "RNSmartLocationManager.h"
+
+@implementation RNSmartLocationManager {
+    bool hasListeners;
+}
+
+RCT_EXPORT_MODULE(RNSmartLocationManager);
+
+- (NSArray<NSString *> *)supportedEvents
+{
+  return @[@"locationChanged"];
+}
+
+// Start listening location updates. Starts positioning unless map has started it already.
+-(void)startObserving {
+    hasListeners = YES;
+    [[SPSmartLocationManager sharedInstance] addDelegate:self];
+}
+
+-(void)stopObserving {
+    hasListeners = NO;
+    [[SPSmartLocationManager sharedInstance] removeDelegate:self];
+}
+
+-(void)spSmartLocationManager:(SPSmartLocationManager *)manager onLocationChanged:(double)latitude longitude:(double)longitude buildingRef:(nullable NSString *)buildingRef floorIndex:(NSInteger)floorIndex {
+    if (hasListeners) {
+        [self sendEventWithName:@"locationChanged" body:@{@"latitude": [NSNumber numberWithDouble:latitude], @"longitude": [NSNumber numberWithDouble:longitude], @"buildingRef": buildingRef ?: [NSNull null], @"floorIndex": [NSNumber numberWithInteger:floorIndex]}];
+    }
+}
+
+@end

package/ios/SteerpathSmartMapSdk.xcodeproj/project.pbxproj

@@ -7,9 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		5171A8442A1E2F1C0027411B /* RNSmartLocationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5171A8432A1E2F1C0027411B /* RNSmartLocationManager.m */; };
 		54311E118E4B5D3209B3CD9A /* libPods-SteerpathSmartMapSdk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B9B946A14D696A939BC22047 /* libPods-SteerpathSmartMapSdk.a */; };
 		B66B217922FAFF6B00E05A0B /* RNSmartMapView.m in Sources */ = {isa = PBXBuildFile; fileRef = B66B217822FAFF6B00E05A0B /* RNSmartMapView.m */; };
-		B66B217C22FB07F400E05A0B /* RNSmartMapEventManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B66B217B22FB07F400E05A0B /* RNSmartMapEventManager.m */; };
 		B66F820D22F4358C00B6516F /* RNSmartMapManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B66F820322F4358C00B6516F /* RNSmartMapManager.m */; };
 		B66F820E22F4358C00B6516F /* RNSmartMapViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B66F820622F4358C00B6516F /* RNSmartMapViewManager.m */; };
 		B66F820F22F4358C00B6516F /* RCTConvert+SmartMapView.m in Sources */ = {isa = PBXBuildFile; fileRef = B66F820822F4358C00B6516F /* RCTConvert+SmartMapView.m */; };
@@ -31,11 +31,11 @@
 /* Begin PBXFileReference section */
 		134814201AA4EA6300B7C361 /* libSteerpathSmartMapSdk.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSteerpathSmartMapSdk.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		34CDFE83ADF1872D87ECE4E0 /* Pods-SteerpathSmartMapSdk.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SteerpathSmartMapSdk.release.xcconfig"; path = "Target Support Files/Pods-SteerpathSmartMapSdk/Pods-SteerpathSmartMapSdk.release.xcconfig"; sourceTree = "<group>"; };
+		5171A8432A1E2F1C0027411B /* RNSmartLocationManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNSmartLocationManager.m; sourceTree = "<group>"; };
+		5171A8452A1E2F440027411B /* RNSmartLocationManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNSmartLocationManager.h; sourceTree = "<group>"; };
 		9B3178C37E533A845BD4D634 /* Pods-SteerpathSmartMapSdk.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SteerpathSmartMapSdk.debug.xcconfig"; path = "Target Support Files/Pods-SteerpathSmartMapSdk/Pods-SteerpathSmartMapSdk.debug.xcconfig"; sourceTree = "<group>"; };
 		B66B217722FAFF6B00E05A0B /* RNSmartMapView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNSmartMapView.h; sourceTree = "<group>"; };
 		B66B217822FAFF6B00E05A0B /* RNSmartMapView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNSmartMapView.m; sourceTree = "<group>"; };
-		B66B217A22FB07F400E05A0B /* RNSmartMapEventManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNSmartMapEventManager.h; sourceTree = "<group>"; };
-		B66B217B22FB07F400E05A0B /* RNSmartMapEventManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNSmartMapEventManager.m; sourceTree = "<group>"; };
 		B66F820322F4358C00B6516F /* RNSmartMapManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNSmartMapManager.m; sourceTree = "<group>"; };
 		B66F820422F4358C00B6516F /* RCTConvert+SmartMapView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RCTConvert+SmartMapView.h"; sourceTree = "<group>"; };
 		B66F820522F4358C00B6516F /* RNSmartMapViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNSmartMapViewManager.h; sourceTree = "<group>"; };
@@ -70,8 +70,8 @@
 		58B511D21A9E6C8500147676 = {
 			isa = PBXGroup;
 			children = (
-				B66B217A22FB07F400E05A0B /* RNSmartMapEventManager.h */,
-				B66B217B22FB07F400E05A0B /* RNSmartMapEventManager.m */,
+				5171A8452A1E2F440027411B /* RNSmartLocationManager.h */,
+				5171A8432A1E2F1C0027411B /* RNSmartLocationManager.m */,
 				B66B217722FAFF6B00E05A0B /* RNSmartMapView.h */,
 				B66B217822FAFF6B00E05A0B /* RNSmartMapView.m */,
 				B66F820422F4358C00B6516F /* RCTConvert+SmartMapView.h */,
@@ -193,7 +193,7 @@
 				B66F820D22F4358C00B6516F /* RNSmartMapManager.m in Sources */,
 				B66F821022F4358C00B6516F /* RNSmartGeofenceManager.m in Sources */,
 				B66B217922FAFF6B00E05A0B /* RNSmartMapView.m in Sources */,
-				B66B217C22FB07F400E05A0B /* RNSmartMapEventManager.m in Sources */,
+				5171A8442A1E2F1C0027411B /* RNSmartLocationManager.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-steerpath-smart-map",
   "title": "React Native Steerpath Smart Map",
-  "version": "1.23.2",
+  "version": "1.24.0",
   "description": "Steerpath SmartMapView for React Native",
   "main": "dist/index.js",
   "scripts": {

package/src/SmartLocationManager.ts

@@ -0,0 +1,34 @@
+import { NativeModules, NativeEventEmitter, EmitterSubscription } from "react-native";
+
+const RNSmartLocationManager = NativeModules.RNSmartLocationManager;
+
+const smartLocationManagerEmitter = new NativeEventEmitter(
+  RNSmartLocationManager
+);
+
+function createSmartLocationManager() {
+  let eventListenerRegistered = false;
+  let eventListener: EmitterSubscription;
+
+  return {
+    addLocationChangedListener(
+      listener: (
+        data: { latitude: number, longitude: number, buildingRef: string | null, floorIndex: number }
+      ) => void
+    ) {
+      if (!eventListenerRegistered) {
+        eventListenerRegistered = true;        
+        eventListener = smartLocationManagerEmitter.addListener('locationChanged', (payload) => {
+          listener(payload);
+        })
+      }
+    },
+    removeLocationChangedListener() {
+      eventListenerRegistered = false;
+      eventListener.remove();
+    }
+  };
+}
+
+export const SmartLocationManager = createSmartLocationManager();
+

package/src/SmartLocationManager.web.ts

@@ -0,0 +1,4 @@
+export const SmartLocationManager = {
+  addListener(){},
+  removeListener(){},
+}

package/src/index.ts

@@ -1,4 +1,5 @@
 export * from './SmartGeofenceManager'
 export * from './SmartMapManager'
 export * from './SmartMapView'
-export * from './SmartMapViewProps'
+export * from './SmartMapViewProps'
+export * from './SmartLocationManager'