react-native-pointr 9.1.0 → 9.2.0

package/android/build.gradle

@@ -13,18 +13,6 @@ buildscript {
   }
 }
 
-allprojects {
-    repositories {
-        maven {
-            url "https://android.pointr.dev/artifactory/gradle-release-local"
-            credentials {
-                username 'consumer'
-                password 'AKCp5dKiUPiSx94yLYgSsu6WzM4MaMAohkrpPyDydQgnNsUajTmhBXLzqLVkwJPNFNZzzv5Rt'
-            }
-        }
-    }
-}
-
 def reactNativeArchitectures() {
   def value = rootProject.getProperties().get("reactNativeArchitectures")
   return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
@@ -106,7 +94,7 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation("com.pointrlabs:pointr:9.1.0")
+  implementation("com.pointrlabs:pointr:9.2.0")
   implementation ("org.jetbrains.kotlin:kotlin-reflect:$kotlin_version")
   implementation 'com.google.android.material:material:1.12.0'
   implementation 'androidx.constraintlayout:constraintlayout:2.2.1'

package/android/src/main/java/com/pointr/PTRMapWidgetCommandType.kt

@@ -2,7 +2,7 @@ package com.pointr
 
 import androidx.annotation.StringDef
 
-@StringDef(value = [PTRMapWidgetCommandType.SITE, PTRMapWidgetCommandType.BUILDING, PTRMapWidgetCommandType.LEVEL, PTRMapWidgetCommandType.POI, PTRMapWidgetCommandType.PATH, PTRMapWidgetCommandType.STATIC_PATH])
+@StringDef(value = [PTRMapWidgetCommandType.SITE, PTRMapWidgetCommandType.BUILDING, PTRMapWidgetCommandType.LEVEL, PTRMapWidgetCommandType.POI, PTRMapWidgetCommandType.PATH, PTRMapWidgetCommandType.STATIC_PATH, PTRMapWidgetCommandType.START_AND_FOCUS])
 annotation class PTRMapWidgetCommandType {
     companion object {
         const val SITE = "site"
@@ -14,5 +14,6 @@ annotation class PTRMapWidgetCommandType {
         const val MARK_MY_CAR_LEVEL = "markMyCarForLevel"
         const val MARK_MY_CAR_SITE = "markMyCarForSite"
         const val SHOW_MY_CAR_SITE = "showMyCarForSite"
+        const val START_AND_FOCUS = "startAndFocus"
     }
 }

package/android/src/main/java/com/pointr/PTRMapWidgetManager.kt

@@ -17,6 +17,7 @@ import com.pointrlabs.core.management.DataManager
 import com.pointrlabs.core.management.Pointr
 import com.pointrlabs.core.management.interfaces.PointrListener
 import com.pointrlabs.core.management.models.ErrorMessage
+import com.pointrlabs.core.management.models.PTRParams
 import com.pointrlabs.core.management.models.Site
 import com.pointrlabs.core.management.models.deeplink.PTRMapWidgetAction
 import com.pointrlabs.core.management.models.deeplink.PTRMapWidgetBuildingLocation
@@ -179,6 +180,55 @@ class PTRMapWidgetManager(private val reactContext: ReactApplicationContext) :
                 PTRMapWidgetShowMyCarAction(location, shouldShowPopup = args.getBoolean(1))
             }
 
+            PTRMapWidgetCommandType.START_AND_FOCUS -> {
+                // First 4 parameters are initialization parameters
+                val clientId = args.getString(0).orEmpty()
+                val licenceKey = args.getString(1).orEmpty()
+                val baseUrl = args.getString(2).orEmpty()
+                val logLevel = args.getInt(3)
+
+                val ptrParams = PTRParams(clientId, licenceKey, baseUrl)
+                ptrParams.logLevel = try {
+                    Plog.LogLevel.entries[logLevel]
+                } catch (_: IllegalArgumentException) {
+                    Plog.LogLevel.ERROR
+                }
+                PointrModule.mapWidgetConfiguration.sdkParams = ptrParams
+
+                // Next parameter is focus type (site, building, level, poi)
+                val focusType = args.getString(4).orEmpty()
+
+                // Create focus action based on type
+                val location = when (focusType) {
+                    PTRMapWidgetCommandType.SITE -> {
+                        val siteId = args.getString(5).orEmpty()
+                        PTRMapWidgetSiteLocation(siteId, isExternalIdentifier = true)
+                    }
+                    PTRMapWidgetCommandType.BUILDING -> {
+                        val siteId = args.getString(5).orEmpty()
+                        val buildingId = args.getString(6).orEmpty()
+                        PTRMapWidgetBuildingLocation(siteId, buildingId, isExternalIdentifier = true)
+                    }
+                    PTRMapWidgetCommandType.LEVEL -> {
+                        val siteId = args.getString(5).orEmpty()
+                        val buildingId = args.getString(6).orEmpty()
+                        val levelIndex = args.getInt(7)
+                        PTRMapWidgetLevelLocation(siteId, buildingId, levelIndex, isExternalIdentifier = true)
+                    }
+                    PTRMapWidgetCommandType.POI -> {
+                        val siteId = args.getString(5).orEmpty()
+                        val poiId = args.getString(6).orEmpty()
+                        PTRMapWidgetPoiLocation(siteId, poiId, isExternalIdentifier = true)
+                    }
+                    else -> {
+                        // Default to site if invalid focus type
+                        val siteId = args.getString(5).orEmpty()
+                        PTRMapWidgetSiteLocation(siteId, isExternalIdentifier = true)
+                    }
+                }
+                PTRMapWidgetFocusAction(location)
+            }
+
             else -> return
         }
         action.onComplete = { error ->
@@ -260,6 +310,43 @@ class PTRMapWidgetManager(private val reactContext: ReactApplicationContext) :
                 event.putString("error", args[3] as String)
             }
 
+            PTRMapWidgetCommandType.START_AND_FOCUS -> {
+                event.putString("clientId", args[0] as String)
+                event.putString("licenceKey", args[1] as String)
+                event.putString("baseUrl", args[2] as String)
+                event.putInt("logLevel", (args[3] as Number).toInt())
+                event.putString("focusType", args[4] as String)
+
+                // Add focus-specific parameters based on focus type
+                val focusType = args[4] as String
+                when (focusType) {
+                    PTRMapWidgetCommandType.SITE -> {
+                        event.putString("siteExternalIdentifier", args[5] as String)
+                        event.putString("error", args.last().toString())
+                    }
+                    PTRMapWidgetCommandType.BUILDING -> {
+                        event.putString("siteExternalIdentifier", args[5] as String)
+                        event.putString("buildingExternalIdentifier", args[6] as String)
+                        event.putString("error", args.last().toString())
+                    }
+                    PTRMapWidgetCommandType.LEVEL -> {
+                        event.putString("siteExternalIdentifier", args[5] as String)
+                        event.putString("buildingExternalIdentifier", args[6] as String)
+                        event.putInt("levelIndex", (args[7] as Number).toInt())
+                        event.putString("error", args.last().toString())
+                    }
+                    PTRMapWidgetCommandType.POI -> {
+                        event.putString("siteExternalIdentifier", args[5] as String)
+                        event.putString("poiExternalIdentifier", args[6] as String)
+                        event.putString("error", args.last().toString())
+                    }
+                    else -> {
+                        event.putString("siteExternalIdentifier", args[5] as String)
+                        event.putString("error", args.last().toString())
+                    }
+                }
+            }
+
             else -> {
                 return
             }

package/ios/PTRMapWidgetContainerView.swift

@@ -16,10 +16,11 @@ import PointrKit
     }
     
     @objc func getMapWidget(_ action: PTRMapWidgetAction) -> PTRMapWidgetViewController {
-        if waitForPointrState() != .running {
-            print("Pointr is not running")
+        if PTRNativeLibrary.mapWidgetConfiguration.sdkParams == nil {
+            if waitForPointrState() != .running {
+                print("Pointr is not running")
+            }
         }
-        
         print("initializing map widget")
         mapWidget = PTRMapWidgetViewController(action: action, configuration: PTRNativeLibrary.mapWidgetConfiguration)
         return mapWidget!

package/ios/PTRMapWidgetManager-Bridging.m

@@ -4,7 +4,7 @@
 #import <React/RCTLog.h>
 //
 //  PTRMapWidgetManager-Bridging.m
-//  
+//
 //  This file provides Objective-C bridge methods for PTRMapWidgetManager
 //
 
@@ -54,6 +54,63 @@ RCT_EXTERN_METHOD(markMyCarForSite:(nonnull NSNumber *)reactTag
 RCT_EXTERN_METHOD(myCarForSite:(nonnull NSNumber *)reactTag
                     siteExternalIdentifier:(NSString *)siteExternalIdentifier
                   animationType:(NSInteger)animationType)
+
+RCT_EXTERN_METHOD(startAndFocus:(nonnull NSNumber *)reactTag
+                  clientId:(NSString *)clientId
+                  licenseKey:(NSString *)licenseKey
+                  baseUrl:(NSString *)baseUrl
+                  logLevel:(NSInteger)logLevel
+                  focusType:(nonnull NSString *)focusType
+                  siteExternalIdentifier:(NSString *)siteExternalIdentifier
+                  )
+
+RCT_EXTERN_METHOD(startAndFocus:(nonnull NSNumber *)reactTag
+                  clientId:(NSString *)clientId
+                  licenseKey:(NSString *)licenseKey
+                  baseUrl:(NSString *)baseUrl
+                  focusType:(nonnull NSString *)focusType
+                  siteExternalIdentifier:(NSString *)siteExternalIdentifier
+                  )
+
+RCT_EXTERN_METHOD(startAndFocus:(nonnull NSNumber *)reactTag
+                  clientId:(NSString *)clientId
+                  licenseKey:(NSString *)licenseKey
+                  baseUrl:(NSString *)baseUrl
+                  focusType:(nonnull NSString *)focusType
+                  siteExternalIdentifier:(NSString *)siteExternalIdentifier
+                  param1:(NSString *)param1
+                  )
+
+RCT_EXTERN_METHOD(startAndFocus:(nonnull NSNumber *)reactTag
+                  clientId:(NSString *)clientId
+                  licenseKey:(NSString *)licenseKey
+                  baseUrl:(NSString *)baseUrl
+                  focusType:(nonnull NSString *)focusType
+                  siteExternalIdentifier:(NSString *)siteExternalIdentifier
+                  param1:(NSString *)param1
+                  levelIndex:(NSInteger)levelIndex
+                  )
+
+RCT_EXTERN_METHOD(startAndFocus:(nonnull NSNumber *)reactTag
+                  clientId:(NSString *)clientId
+                  licenseKey:(NSString *)licenseKey
+                  baseUrl:(NSString *)baseUrl
+                  logLevel:(NSInteger)logLevel
+                  focusType:(nonnull NSString *)focusType
+                  siteExternalIdentifier:(NSString *)siteExternalIdentifier
+                  param1:(NSString *)param1
+                  )
+
+RCT_EXTERN_METHOD(startAndFocus:(nonnull NSNumber *)reactTag
+                  clientId:(NSString *)clientId
+                  licenseKey:(NSString *)licenseKey
+                  baseUrl:(NSString *)baseUrl
+                  logLevel:(NSInteger)logLevel
+                  focusType:(nonnull NSString *)focusType
+                  siteExternalIdentifier:(NSString *)siteExternalIdentifier
+                  param1:(NSString *)param1
+                  levelIndex:(NSInteger)levelIndex
+                  )
 @end
 
 // No additional methods are needed here as the PTRMapWidgetManager is implemented in Objective-C

package/ios/PTRMapWidgetManager.swift

@@ -17,107 +17,64 @@ public class PTRMapWidgetManager: RCTViewManager {
         return "PTRMapWidget"
     }
     
-    
-    @objc func site(_ reactTag: NSNumber, siteExternalIdentifier: String) {
+    private func focus(_ reactTag: NSNumber, location: PTRMapWidgetLocation, commandParameters: [String: Any]) {
         self.bridge.uiManager.addUIBlock { (uiManager, viewRegistry) in
             guard let ptrMapWidgetContainerView = uiManager?.view(forReactTag: reactTag) as? PTRMapWidgetContainerView else {
                 print("Cannot find PTRMapWidgetContainerView with tag #\(reactTag)")
                 return
             }
             
-            DispatchQueue.main.async {
-                
-                let siteLocation = PTRMapWidgetSiteLocation(siteIdentifier: siteExternalIdentifier, isExternalIdentifiers: true)
-                let action = PTRMapWidgetMapFocusAction(location: siteLocation)
-                action.completion = { error in
-                    let ptrCommand: [String: Any] = [
-                        "command": "site",
-                        "siteExternalIdentifier": siteExternalIdentifier,
-                        "error": error?.errorCode ?? ""
-                    ]
-                    ptrMapWidgetContainerView.ptrMapWidgetDidEndLoading(withParameters: ptrCommand)
-                }
-                let mapWidget = ptrMapWidgetContainerView.getMapWidget(action)
-                print("calling show site method of mapWidget")
-                ptrMapWidgetContainerView.present(mapWidget)
-            }
+            let action = PTRMapWidgetMapFocusAction(location: location, completion: { error in
+                var ptrCommand = commandParameters
+                ptrCommand["error"] = error?.errorCode ?? ""
+                print("calling ptrMapWidgetDidEndLoading with parameters: \(ptrCommand)")
+                ptrMapWidgetContainerView.ptrMapWidgetDidEndLoading(withParameters: ptrCommand)
+            })
+            
+            let mapWidget = ptrMapWidgetContainerView.getMapWidget(action)
+            print("calling show \(commandParameters["command"] ?? "unknown") method of mapWidget")
+            ptrMapWidgetContainerView.present(mapWidget)
         }
     }
     
+    @objc func site(_ reactTag: NSNumber, siteExternalIdentifier: String) {
+        let siteLocation = PTRMapWidgetSiteLocation(siteIdentifier: siteExternalIdentifier, isExternalIdentifiers: true)
+        let commandParameters: [String: Any] = [
+            "command": "site",
+            "siteExternalIdentifier": siteExternalIdentifier
+        ]
+        focus(reactTag, location: siteLocation, commandParameters: commandParameters)
+    }
+    
     @objc func building(_ reactTag: NSNumber, siteExternalIdentifier: String, buildingExternalIdentifier: String) {
-        self.bridge.uiManager.addUIBlock { (uiManager, viewRegistry) in
-            guard let ptrMapWidgetContainerView = uiManager?.view(forReactTag: reactTag) as? PTRMapWidgetContainerView else {
-                print("Cannot find PTRMapWidgetContainerView with tag #\(reactTag)")
-                return
-            }
-            
-            DispatchQueue.main.async {
-                let action = PTRMapWidgetMapFocusAction(location: PTRMapWidgetBuildingLocation(siteIdentifier: siteExternalIdentifier, buildingIdentifier: buildingExternalIdentifier, isExternalIdentifiers: true))
-                action.completion = { error in
-                    let ptrCommand: [String: Any] = [
-                        "command": "building",
-                        "siteExternalIdentifier": siteExternalIdentifier,
-                        "buildingExternalIdentifier": buildingExternalIdentifier,
-                        "error": error?.errorCode ?? ""
-                    ]
-                    ptrMapWidgetContainerView.ptrMapWidgetDidEndLoading(withParameters: ptrCommand)
-                }
-                let mapWidget = ptrMapWidgetContainerView.getMapWidget(action)
-                print("calling show building method of mapWidget")
-                ptrMapWidgetContainerView.present(mapWidget)
-            }
-        }
+        let buildingLocation = PTRMapWidgetBuildingLocation(siteIdentifier: siteExternalIdentifier, buildingIdentifier: buildingExternalIdentifier, isExternalIdentifiers: true)
+        let commandParameters: [String: Any] = [
+            "command": "building",
+            "siteExternalIdentifier": siteExternalIdentifier,
+            "buildingExternalIdentifier": buildingExternalIdentifier
+        ]
+        focus(reactTag, location: buildingLocation, commandParameters: commandParameters)
     }
     
     @objc func level(_ reactTag: NSNumber, siteExternalIdentifier: String, buildingExternalIdentifier: String, levelIndex: Int) {
-        self.bridge.uiManager.addUIBlock { (uiManager, viewRegistry) in
-            guard let ptrMapWidgetContainerView = uiManager?.view(forReactTag: reactTag) as? PTRMapWidgetContainerView else {
-                print("Cannot find PTRMapWidgetContainerView with tag #\(reactTag)")
-                return
-            }
-            
-            DispatchQueue.main.async {
-                let action = PTRMapWidgetMapFocusAction(location: PTRMapWidgetLevelLocation(siteIdentifier: siteExternalIdentifier, buildingIdentifier: buildingExternalIdentifier, levelIndex: levelIndex, isExternalIdentifiers: true))
-                action.completion = { error in
-                    let ptrCommand: [String: Any] = [
-                        "command": "level",
-                        "siteExternalIdentifier": siteExternalIdentifier,
-                        "buildingExternalIdentifier": buildingExternalIdentifier,
-                        "levelIndex": levelIndex,
-                        "error": error?.errorCode ?? ""
-                    ]
-                    ptrMapWidgetContainerView.ptrMapWidgetDidEndLoading(withParameters: ptrCommand)
-                }
-                let mapWidget = ptrMapWidgetContainerView.getMapWidget(action)
-                print("calling show level method of mapWidget")
-                ptrMapWidgetContainerView.present(mapWidget)
-            }
-        }
+        let levelLocation = PTRMapWidgetLevelLocation(siteIdentifier: siteExternalIdentifier, buildingIdentifier: buildingExternalIdentifier, levelIndex: levelIndex, isExternalIdentifiers: true)
+        let commandParameters: [String: Any] = [
+            "command": "level",
+            "siteExternalIdentifier": siteExternalIdentifier,
+            "buildingExternalIdentifier": buildingExternalIdentifier,
+            "levelIndex": levelIndex
+        ]
+        focus(reactTag, location: levelLocation, commandParameters: commandParameters)
     }
     
     @objc func poi(_ reactTag: NSNumber, siteExternalIdentifier: String, poiExternalIdentifier: String) {
-        self.bridge.uiManager.addUIBlock { (uiManager, viewRegistry) in
-            guard let ptrMapWidgetContainerView = uiManager?.view(forReactTag: reactTag) as? PTRMapWidgetContainerView else {
-                print("Cannot find PTRMapWidgetContainerView with tag #\(reactTag)")
-                return
-            }
-            
-            DispatchQueue.main.async {
-                let action = PTRMapWidgetMapFocusAction(location: PTRMapWidgetPoiLocation(siteIdentifier: siteExternalIdentifier, poiIdentifier: poiExternalIdentifier, isExternalIdentifiers: true))
-                action.completion = { error in
-                    let ptrCommand: [String: Any] = [
-                        "command": "poi",
-                        "siteExternalIdentifier": siteExternalIdentifier,
-                        "poiExternalIdentifier": poiExternalIdentifier,
-                        "error": error?.errorCode ?? ""
-                    ]
-                    ptrMapWidgetContainerView.ptrMapWidgetDidEndLoading(withParameters: ptrCommand)
-                }
-                let mapWidget = ptrMapWidgetContainerView.getMapWidget(action)
-                print("calling show poi method of mapWidget")
-                ptrMapWidgetContainerView.present(mapWidget)
-            }
-        }
+        let poiLocation = PTRMapWidgetPoiLocation(siteIdentifier: siteExternalIdentifier, poiIdentifier: poiExternalIdentifier, isExternalIdentifiers: true)
+        let commandParameters: [String: Any] = [
+            "command": "poi",
+            "siteExternalIdentifier": siteExternalIdentifier,
+            "poiExternalIdentifier": poiExternalIdentifier
+        ]
+        focus(reactTag, location: poiLocation, commandParameters: commandParameters)
     }
     
     @objc func path(_ reactTag: NSNumber, siteExternalIdentifier: String, toPoiExternalIdentifier: String) {
@@ -127,21 +84,20 @@ public class PTRMapWidgetManager: RCTViewManager {
                 return
             }
             
-            DispatchQueue.main.async {
-                let action = PTRMapWidgetWayfindingAction(poiDestination: PTRMapWidgetPoiLocation(siteIdentifier: siteExternalIdentifier, poiIdentifier: toPoiExternalIdentifier, isExternalIdentifiers: true))
-                action.completion = { error in
-                    let ptrCommand: [String: Any] = [
-                        "command": "path",
-                        "siteExternalIdentifier": siteExternalIdentifier,
-                        "poiExternalIdentifier": toPoiExternalIdentifier,
-                        "error": error?.errorCode ?? ""
-                    ]
-                    ptrMapWidgetContainerView.ptrMapWidgetDidEndLoading(withParameters: ptrCommand)
-                }
-                let mapWidget = ptrMapWidgetContainerView.getMapWidget(action)
-                print("calling show path method of mapWidget")
-                ptrMapWidgetContainerView.present(mapWidget)
-            }
+            
+            let action = PTRMapWidgetWayfindingAction(poiDestination: PTRMapWidgetPoiLocation(siteIdentifier: siteExternalIdentifier, poiIdentifier: toPoiExternalIdentifier, isExternalIdentifiers: true))
+            action.completion = { error in
+                let ptrCommand: [String: Any] = [
+                    "command": "path",
+                    "siteExternalIdentifier": siteExternalIdentifier,
+                    "poiExternalIdentifier": toPoiExternalIdentifier,
+                    "error": error?.errorCode ?? ""
+                ]
+                ptrMapWidgetContainerView.ptrMapWidgetDidEndLoading(withParameters: ptrCommand)
+            }
+            let mapWidget = ptrMapWidgetContainerView.getMapWidget(action)
+            print("calling show path method of mapWidget")
+            ptrMapWidgetContainerView.present(mapWidget)
         }
     }
     
@@ -154,8 +110,8 @@ public class PTRMapWidgetManager: RCTViewManager {
             
             DispatchQueue.global(qos: .default).async {
                 ptrMapWidgetContainerView.showStaticPath(siteExternalIdentifier,
-                                                       fromPoiExternalIdentifier: fromPoiExternalIdentifier,
-                                                       toPoiExternalIdentifier: toPoiExternalIdentifier)
+                                                         fromPoiExternalIdentifier: fromPoiExternalIdentifier,
+                                                         toPoiExternalIdentifier: toPoiExternalIdentifier)
             }
         }
     }
@@ -167,24 +123,22 @@ public class PTRMapWidgetManager: RCTViewManager {
                 return
             }
             
-            DispatchQueue.main.async {
-                let action = PTRMapWidgetMarkMyCarAction(levelLocation: PTRMapWidgetLevelLocation(siteIdentifier: siteExternalIdentifier, buildingIdentifier: buildingExternalIdentifier, levelIndex: levelIndex, isExternalIdentifiers: true), shouldShowPopup: shouldShowPopup)
-                action.completion = { error in
-                    let ptrCommand: [String: Any] = [
-                        "command": "markMyCarForLevel",
-                        "siteExternalIdentifier": siteExternalIdentifier,
-                        "buildingExternalIdentifier": buildingExternalIdentifier,
-                        "levelIndex": levelIndex,
-                        "shouldShowPopup": shouldShowPopup,
-                        "animationType": animationType,
-                        "error": error?.errorCode ?? ""
-                    ]
-                    ptrMapWidgetContainerView.ptrMapWidgetDidEndLoading(withParameters: ptrCommand)
-                }
-                let mapWidget = ptrMapWidgetContainerView.getMapWidget(action)
-                print("calling show mark my car method of mapWidget")
-                ptrMapWidgetContainerView.present(mapWidget)
-            }
+            let action = PTRMapWidgetMarkMyCarAction(levelLocation: PTRMapWidgetLevelLocation(siteIdentifier: siteExternalIdentifier, buildingIdentifier: buildingExternalIdentifier, levelIndex: levelIndex, isExternalIdentifiers: true), shouldShowPopup: shouldShowPopup)
+            action.completion = { error in
+                let ptrCommand: [String: Any] = [
+                    "command": "markMyCarForLevel",
+                    "siteExternalIdentifier": siteExternalIdentifier,
+                    "buildingExternalIdentifier": buildingExternalIdentifier,
+                    "levelIndex": levelIndex,
+                    "shouldShowPopup": shouldShowPopup,
+                    "animationType": animationType,
+                    "error": error?.errorCode ?? ""
+                ]
+                ptrMapWidgetContainerView.ptrMapWidgetDidEndLoading(withParameters: ptrCommand)
+            }
+            let mapWidget = ptrMapWidgetContainerView.getMapWidget(action)
+            print("calling show mark my car method of mapWidget")
+            ptrMapWidgetContainerView.present(mapWidget)
         }
     }
     
@@ -195,22 +149,20 @@ public class PTRMapWidgetManager: RCTViewManager {
                 return
             }
             
-            DispatchQueue.main.async {
-                let action = PTRMapWidgetMarkMyCarAction(siteLocation: PTRMapWidgetSiteLocation(siteIdentifier: siteExternalIdentifier, isExternalIdentifiers: true), shouldShowPopup: shouldShowPopup)
-                action.completion = { error in
-                    let ptrCommand: [String: Any] = [
-                        "command": "markMyCarForSite",
-                        "siteExternalIdentifier": siteExternalIdentifier,
-                        "shouldShowPopup": shouldShowPopup,
-                        "animationType": animationType,
-                        "error": error?.errorCode ?? ""
-                    ]
-                    ptrMapWidgetContainerView.ptrMapWidgetDidEndLoading(withParameters: ptrCommand)
-                }
-                let mapWidget = ptrMapWidgetContainerView.getMapWidget(action)
-                print("calling show mark my car method of mapWidget")
-                ptrMapWidgetContainerView.present(mapWidget)
-            }
+            let action = PTRMapWidgetMarkMyCarAction(siteLocation: PTRMapWidgetSiteLocation(siteIdentifier: siteExternalIdentifier, isExternalIdentifiers: true), shouldShowPopup: shouldShowPopup)
+            action.completion = { error in
+                let ptrCommand: [String: Any] = [
+                    "command": "markMyCarForSite",
+                    "siteExternalIdentifier": siteExternalIdentifier,
+                    "shouldShowPopup": shouldShowPopup,
+                    "animationType": animationType,
+                    "error": error?.errorCode ?? ""
+                ]
+                ptrMapWidgetContainerView.ptrMapWidgetDidEndLoading(withParameters: ptrCommand)
+            }
+            let mapWidget = ptrMapWidgetContainerView.getMapWidget(action)
+            print("calling show mark my car method of mapWidget")
+            ptrMapWidgetContainerView.present(mapWidget)
         }
     }
     
@@ -221,22 +173,83 @@ public class PTRMapWidgetManager: RCTViewManager {
                 return
             }
             
-            DispatchQueue.main.async {
-                let action = PTRMapWidgetShowMyCarAction(location: PTRMapWidgetSiteLocation(siteIdentifier: siteExternalIdentifier, isExternalIdentifiers: true))
-                action.completion = { error in
-                    let ptrCommand: [String: Any] = [
-                        "command": "myCarForSite",
-                        "siteExternalIdentifier": siteExternalIdentifier,
-                        "animationType": animationType,
-                        "error": error?.errorCode ?? ""
-                    ]
-                    ptrMapWidgetContainerView.ptrMapWidgetDidEndLoading(withParameters: ptrCommand)
-                }
-                let mapWidget = ptrMapWidgetContainerView.getMapWidget(action)
-                print("calling show mark my car method of mapWidget")
-                ptrMapWidgetContainerView.present(mapWidget)
+            let action = PTRMapWidgetShowMyCarAction(location: PTRMapWidgetSiteLocation(siteIdentifier: siteExternalIdentifier, isExternalIdentifiers: true))
+            action.completion = { error in
+                let ptrCommand: [String: Any] = [
+                    "command": "myCarForSite",
+                    "siteExternalIdentifier": siteExternalIdentifier,
+                    "animationType": animationType,
+                    "error": error?.errorCode ?? ""
+                ]
+                ptrMapWidgetContainerView.ptrMapWidgetDidEndLoading(withParameters: ptrCommand)
+            }
+            let mapWidget = ptrMapWidgetContainerView.getMapWidget(action)
+            print("calling show mark my car method of mapWidget")
+            ptrMapWidgetContainerView.present(mapWidget)
+        }
+    }
+    @objc func startAndFocus(_ reactTag: NSNumber, clientId: String, licenseKey: String, baseUrl: String, focusType: String, siteExternalIdentifier: String) {
+        startAndFocus(reactTag, clientId: clientId, licenseKey: licenseKey, baseUrl: baseUrl, logLevel: 4, focusType: focusType, siteExternalIdentifier: siteExternalIdentifier, param1: "", levelIndex: 0)
+    }
+    
+    @objc func startAndFocus(_ reactTag: NSNumber, clientId: String, licenseKey: String, baseUrl: String, focusType: String, siteExternalIdentifier: String, param1: String) {
+        startAndFocus(reactTag, clientId: clientId, licenseKey: licenseKey, baseUrl: baseUrl, logLevel: 4, focusType: focusType, siteExternalIdentifier: siteExternalIdentifier, param1: param1, levelIndex: 0)
+    }
+    
+    @objc func startAndFocus(_ reactTag: NSNumber, clientId: String, licenseKey: String, baseUrl: String, focusType: String, siteExternalIdentifier: String, param1: String, levelIndex: Int) {
+        startAndFocus(reactTag, clientId: clientId, licenseKey: licenseKey, baseUrl: baseUrl, logLevel: 4, focusType: focusType, siteExternalIdentifier: siteExternalIdentifier, param1: param1, levelIndex: levelIndex)
+    }
+    
+    @objc func startAndFocus(_ reactTag: NSNumber, clientId: String, licenseKey: String, baseUrl: String, logLevel: Int, focusType: String, siteExternalIdentifier: String) {
+        startAndFocus(reactTag, clientId: clientId, licenseKey: licenseKey, baseUrl: baseUrl, logLevel: logLevel, focusType: focusType, siteExternalIdentifier: siteExternalIdentifier, param1: "", levelIndex: 0)
+    }
+    
+    @objc func startAndFocus(_ reactTag: NSNumber, clientId: String, licenseKey: String, baseUrl: String, logLevel: Int, focusType: String, siteExternalIdentifier: String, param1: String) {
+        startAndFocus(reactTag, clientId: clientId, licenseKey: licenseKey, baseUrl: baseUrl, logLevel: logLevel, focusType: focusType, siteExternalIdentifier: siteExternalIdentifier, param1: param1, levelIndex: 0)
+    }
+    
+    @objc func startAndFocus(_ reactTag: NSNumber, clientId: String, licenseKey: String, baseUrl: String, logLevel: Int, focusType: String, siteExternalIdentifier: String, param1: String, levelIndex: Int) {
+        
+        // Initialize PTRParams
+        PTRNativeLibrary.params.clientIdentifier = clientId
+        PTRNativeLibrary.params.licenseKey = licenseKey
+        PTRNativeLibrary.params.baseUrl = baseUrl
+        PTRNativeLibrary.params.loggerLevel = PTRLoggerLevel(rawValue: Int32(logLevel)) ?? .error
+        PTRNativeLibrary.params.mode = PointrDebugMode()
+        
+        // Set SDK params in map widget configuration
+        PTRNativeLibrary.mapWidgetConfiguration.sdkParams = PTRNativeLibrary.params
+        
+        // Call appropriate focus method based on command type
+        switch focusType.lowercased() {
+        case "poi":
+            if !param1.isEmpty {
+                poi(reactTag, siteExternalIdentifier: siteExternalIdentifier, poiExternalIdentifier: param1)
+            } else {
+                print("Error: POI ID is required for POI focus")
             }
+            
+        case "level":
+            if !param1.isEmpty {
+                level(reactTag, siteExternalIdentifier: siteExternalIdentifier, buildingExternalIdentifier: param1, levelIndex: levelIndex)
+            } else {
+                print("Error: Building ID is required for level focus")
+            }
+            
+        case "building":
+            if !param1.isEmpty {
+                building(reactTag, siteExternalIdentifier: siteExternalIdentifier, buildingExternalIdentifier: param1)
+            } else {
+                print("Error: Building ID is required for building focus")
+            }
+            
+        case "site":
+            site(reactTag, siteExternalIdentifier: siteExternalIdentifier)
+            
+        default:
+            print("Error: Unknown command type '\(focusType)'. Supported types: site, building, level, poi")
+            // Default to site focus if command type is unknown
+            site(reactTag, siteExternalIdentifier: siteExternalIdentifier)
         }
     }
 }
-

package/ios/PTRNativeLibrary.swift

@@ -22,25 +22,28 @@ class PTRNativeLibrary: RCTEventEmitter, PTREventManagerDelegate {
     var ptrMapWidget: PTRMapWidgetViewController? = nil
     
     
-    static var configuration: Dictionary<String,Any>? = nil
-    static var mapWidgetConfiguration: PTRMapWidgetConfiguration {
-        let mapWidgetConfiguration = PTRMapWidgetConfiguration.defaultConfiguration()
-        guard let configuration else {
-            return mapWidgetConfiguration
-        }
-        let mirror = Mirror(reflecting: mapWidgetConfiguration)
-        for attr in mirror.children {
-            guard let key = attr.label else {
-                continue
+    static var configuration: Dictionary<String,Any>? = nil {
+        didSet {
+            guard let configuration else {
+                return
             }
-            // only set boolean values
-            guard let value = configuration[key] as? Bool, attr.value is Bool else {
-                continue
+            let mirror = Mirror(reflecting: mapWidgetConfiguration)
+            for attr in mirror.children {
+                guard let key = attr.label else {
+                    continue
+                }
+                // only set boolean values
+                guard let value = configuration[key] as? Bool, attr.value is Bool else {
+                    continue
+                }
+                mapWidgetConfiguration.setValue(value, forKey: key)
             }
-            mapWidgetConfiguration.setValue(value, forKey: key)
         }
-        return mapWidgetConfiguration
     }
+    
+    @objc public
+    static var mapWidgetConfiguration: PTRMapWidgetConfiguration = PTRMapWidgetConfiguration.defaultConfiguration()
+    
     private var dispatchGroupSiteManager = [DispatchGroup]()
     var rootViewController: UIViewController? = nil
     var isRouteFooterViewEnabled = true
@@ -48,6 +51,11 @@ class PTRNativeLibrary: RCTEventEmitter, PTREventManagerDelegate {
     override init() {
         super.init()
         self.eventManagerDelegate = self
+        guard let permissionManager = Pointr.shared.permissionManager else {
+            print("EDIP - Pointr permission manager not available")
+            return
+        }
+        permissionManager.delegate = self
     }
     
     override static func requiresMainQueueSetup() -> Bool {
@@ -146,7 +154,6 @@ class PTRNativeLibrary: RCTEventEmitter, PTREventManagerDelegate {
                           baseUrl: String,
                          logLevel: Int) {
         guard let presentedViewController = RCTPresentedViewController() else { return }
-        Pointr.shared.permissionManager?.delegate = self
         self.rootViewController = presentedViewController
         PTRNativeLibrary.params.mode = PointrDebugMode()
         PTRNativeLibrary.params.loggerLevel = PTRLoggerLevel.init(rawValue: Int32(logLevel)) ?? .error
@@ -324,14 +331,27 @@ extension PTRNativeLibrary: PTRSiteManagerDelegate {
 // MARK: - PTRPermissionManagerDelegate
 extension PTRNativeLibrary: PTRPermissionManagerDelegate {
     public func permissionManagerShouldRequestLocationAuthorizationPermission() -> Bool {
+        Plogv("Should request location permission: \(PTRNativeLibrary.shouldRequestPermissionsAtStartup)")
         return PTRNativeLibrary.shouldRequestPermissionsAtStartup
     }
     
     public func permissionManagerShouldRequestBluetoothServicesPermission() -> Bool {
+        Plogv("Should request bluetooth permission: \(PTRNativeLibrary.shouldRequestPermissionsAtStartup)")
         return PTRNativeLibrary.shouldRequestPermissionsAtStartup
     }
     
     public func permissionManagerShouldRequestUserNotificationAuthorizationPermission() -> Bool {
+        Plogv("Should request notification permission: \(PTRNativeLibrary.shouldRequestPermissionsAtStartup)")
+        return PTRNativeLibrary.shouldRequestPermissionsAtStartup
+    }
+    
+    public func permissionManagerShouldRequestCoreMotionAuthorizationPermission(_ permissionManager: any PTRPermissionManagerInterface) -> Bool {
+        Plogv("Should request core motion permission: \(PTRNativeLibrary.shouldRequestPermissionsAtStartup)")
+        return PTRNativeLibrary.shouldRequestPermissionsAtStartup
+    }
+    
+    func permissionManagerShouldRequestLocationAuthorizationPermissionForWhenInUse(_ permissionManager: any PTRPermissionManagerInterface) -> Bool {
+        Plogv("Should request location when in use permission: \(PTRNativeLibrary.shouldRequestPermissionsAtStartup)")
         return PTRNativeLibrary.shouldRequestPermissionsAtStartup
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-pointr",
-  "version": "9.1.0",
+  "version": "9.2.0",
   "description": "Pointr React-Native Module",
   "main": "src/index",
   "author": " <> ()",

package/react-native-pointr.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
-  s.dependency 'PointrKit', '9.1.0'
+  s.dependency 'PointrKit', '9.2.0'
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.

package/src/PTRCommand.ts

@@ -10,7 +10,8 @@ export enum PTRCommandType {
     STATIC_PATH = "staticPath",
     MARK_MY_CAR_LEVEL = "markMyCarForLevel",
     MARK_MY_CAR_SITE = "markMyCarForSite",
-    SHOW_MY_CAR_SITE = "showMyCarForSite"
+    SHOW_MY_CAR_SITE = "showMyCarForSite",
+    START_AND_FOCUS = "startAndFocus"
 }
 /**
  * Base class for all Pointr SDK commands
@@ -117,4 +118,23 @@ export class PTRShowMyCarSiteCommand extends PTRCommand {
     constructor(public site: string, public shouldShowPopup: boolean = true, public animationType: number = 1) {
         super(PTRCommandType.SHOW_MY_CAR_SITE);
     }
+}
+
+/**
+ * Command to start the SDK and focus on a location using an existing PTR command
+ * This command is not a PTRCommand itself, but wraps SDK initialization with a focus command
+ * @param clientId - the client ID for SDK initialization
+ * @param licenseKey - the license key for SDK initialization  
+ * @param baseUrl - the base URL for SDK initialization
+ * @param logLevel - the log level for SDK initialization
+ * @param command - the PTR command to execute after SDK initialization (PTRSiteCommand, PTRBuildingCommand, PTRLevelCommand, or PTRPoiCommand)
+ */
+export class PTRStartAndFocusCommand {
+    constructor(
+        public clientId: string,
+        public licenseKey: string,
+        public baseUrl: string,
+        public logLevel: number = 4,
+        public command: PTRSiteCommand | PTRBuildingCommand | PTRLevelCommand | PTRPoiCommand
+    ) {}
 }

package/src/PTRMapWidgetUtils.ts

@@ -1,13 +1,104 @@
 import { UIManager } from 'react-native';
-import { PTRSiteCommand, PTRBuildingCommand, PTRLevelCommand, PTRPoiCommand, PTRPathCommand, PTRStaticPathCommand, PTRCommand, PTRCommandType, PTRMarkMyCarLevelCommand, PTRMarkMyCarSiteCommand, PTRShowMyCarSiteCommand } from 'react-native-pointr/src/PTRCommand';
+import { PTRSiteCommand, PTRBuildingCommand, PTRLevelCommand, PTRPoiCommand, PTRPathCommand, PTRStaticPathCommand, PTRCommand, PTRCommandType, PTRMarkMyCarLevelCommand, PTRMarkMyCarSiteCommand, PTRShowMyCarSiteCommand, PTRStartAndFocusCommand } from 'react-native-pointr/src/PTRCommand';
+/**
+ * Handle PTRStartAndFocusCommand specifically
+ * @param reactTag view tag of the map widget
+ * @param startAndFocusCommand the start and focus command
+ */
+const handleStartAndFocusCommand = (reactTag: number, startAndFocusCommand: PTRStartAndFocusCommand) => {
+  const innerCommand = startAndFocusCommand.command;
+  console.info('Handling PTRStartAndFocusCommand with type:', innerCommand.type);
+  // Build arguments based on the inner command type
+  let args: any[];
+  console.info('Inner command details:', innerCommand);
+  
+  switch (innerCommand.type) {
+    case PTRCommandType.SITE: {
+      const siteCommand = innerCommand as PTRSiteCommand;
+      args = [
+        startAndFocusCommand.clientId,
+        startAndFocusCommand.licenseKey,
+        startAndFocusCommand.baseUrl,
+        startAndFocusCommand.logLevel,
+        innerCommand.type,
+        siteCommand.site,
+        "",
+        0
+      ];
+      break;
+    }
+    case PTRCommandType.BUILDING: {
+      const buildingCommand = innerCommand as PTRBuildingCommand;
+      args = [
+        startAndFocusCommand.clientId,
+        startAndFocusCommand.licenseKey,
+        startAndFocusCommand.baseUrl,
+        startAndFocusCommand.logLevel,
+        innerCommand.type,
+        buildingCommand.site,
+        buildingCommand.building,
+        0
+      ];
+      break;
+    }
+    case PTRCommandType.LEVEL: {
+      const levelCommand = innerCommand as PTRLevelCommand;
+      args = [
+        startAndFocusCommand.clientId,
+        startAndFocusCommand.licenseKey,
+        startAndFocusCommand.baseUrl,
+        startAndFocusCommand.logLevel,
+        innerCommand.type,
+        levelCommand.site,
+        levelCommand.building,
+        levelCommand.level
+      ];
+      break;
+    }
+    case PTRCommandType.POI: {
+      const poiCommand = innerCommand as PTRPoiCommand;
+      args = [
+        startAndFocusCommand.clientId,
+        startAndFocusCommand.licenseKey,
+        startAndFocusCommand.baseUrl,
+        startAndFocusCommand.logLevel,
+        innerCommand.type,
+        poiCommand.site,
+        poiCommand.poi,
+        0
+      ];
+      break;
+    }
+    default:
+      console.error('Unsupported command type in PTRStartAndFocusCommand:', innerCommand.type);
+      return;
+  }
+  console.info('Dispatching startAndFocus with args:', args);
+  UIManager.dispatchViewManagerCommand(
+    reactTag,
+    'startAndFocus',
+    args,
+  );
+};
+
 /**
  * Show the map widget with the given command
  * @param reactTag view tag of the map widget
- * @param ptrCommand command to show the map widget
+ * @param ptrCommand command to show the map widget (PTRCommand or PTRStartAndFocusCommand)
  */
-export const showMapWidget = (reactTag: number, ptrCommand: PTRCommand) => {
-  console.log(`Showing map widget with command: ${ptrCommand.type} and reactTag: ${reactTag}`);
-  switch (ptrCommand.type) {
+export const showMapWidget = (reactTag: number, ptrCommand: PTRCommand | PTRStartAndFocusCommand) => {
+  // Check if it's a PTRStartAndFocusCommand (which doesn't have a 'type' property)
+  if ('command' in ptrCommand) {
+    const startAndFocusCommand = ptrCommand as PTRStartAndFocusCommand;
+    console.log(`Showing map widget with start and focus command: ${startAndFocusCommand.command.type} and reactTag: ${reactTag}`);
+    handleStartAndFocusCommand(reactTag, startAndFocusCommand);
+    return;
+  }
+
+  // Handle regular PTRCommand
+  const command = ptrCommand as PTRCommand;
+  console.log(`Showing map widget with command: ${command.type} and reactTag: ${reactTag}`);
+  switch (command.type) {
     case PTRCommandType.SITE: {
       const siteCommand = ptrCommand as PTRSiteCommand;
       UIManager.dispatchViewManagerCommand(