react-native-pointr 9.1.0 → 9.3.1

package/ios/PTRMapWidgetManager.swift

@@ -17,146 +17,130 @@ 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) {
+        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) {
         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 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)
         }
     }
     
-    @objc func path(_ reactTag: NSNumber, siteExternalIdentifier: String, toPoiExternalIdentifier: String) {
+    @objc func staticPath(_ reactTag: NSNumber, siteExternalIdentifier: String, fromPoiExternalIdentifier: String, toPoiExternalIdentifier: 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 = 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)
+            DispatchQueue.global(qos: .default).async {
+                ptrMapWidgetContainerView.showStaticPath(siteExternalIdentifier,
+                                                         fromPoiExternalIdentifier: fromPoiExternalIdentifier,
+                                                         toPoiExternalIdentifier: toPoiExternalIdentifier)
             }
         }
     }
     
-    @objc func staticPath(_ reactTag: NSNumber, siteExternalIdentifier: String, fromPoiExternalIdentifier: String, toPoiExternalIdentifier: String) {
+    @objc func staticWayfinding(_ reactTag: NSNumber, siteExternalIdentifier: String, sourcePoiExternalIdentifier: String, destinationPoiExternalIdentifier: 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.global(qos: .default).async {
-                ptrMapWidgetContainerView.showStaticPath(siteExternalIdentifier,
-                                                       fromPoiExternalIdentifier: fromPoiExternalIdentifier,
-                                                       toPoiExternalIdentifier: toPoiExternalIdentifier)
+            let sourcePoiLocation = PTRMapWidgetPoiLocation(siteIdentifier: siteExternalIdentifier, poiIdentifier: sourcePoiExternalIdentifier, isExternalIdentifiers: true)
+            let destinationPoiLocation = PTRMapWidgetPoiLocation(siteIdentifier: siteExternalIdentifier, poiIdentifier: destinationPoiExternalIdentifier, isExternalIdentifiers: true)
+            
+            let action = PTRMapWidgetStaticWayfindingAction(poiSource: sourcePoiLocation, poiDestination: destinationPoiLocation)
+            action.completion = { error in
+                let ptrCommand: [String: Any] = [
+                    "command": "staticWayfinding",
+                    "siteExternalIdentifier": siteExternalIdentifier,
+                    "sourcePoiExternalIdentifier": sourcePoiExternalIdentifier,
+                    "destinationPoiExternalIdentifier": destinationPoiExternalIdentifier,
+                    "error": error?.localizedDescription ?? ""
+                ]
+                ptrMapWidgetContainerView.ptrMapWidgetDidEndLoading(withParameters: ptrCommand)
             }
+            
+            let mapWidget = ptrMapWidgetContainerView.getMapWidget(action)
+            print("calling show static wayfinding method of mapWidget")
+            ptrMapWidgetContainerView.present(mapWidget)
         }
     }
     
@@ -167,24 +151,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 +177,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 +201,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-Bridging.m

@@ -31,4 +31,8 @@ RCT_EXTERN_METHOD(requestPermissions)
 
 RCT_EXTERN_METHOD(isMyCarMarked:(RCTResponseSenderBlock)callback)
 
+RCT_EXTERN_METHOD(getPois:(NSString *)siteId
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
 @end