react-native-pointr 9.9.0 → 10.0.0

package/ios/PTRNativeLibrary.swift

@@ -8,7 +8,7 @@ import React
     func onGeofenceEvent(_ geofenceEvent: [String: Any])
 }
 
-@objc(PTRNativePointrLibrary)
+@objc(PTRNativeLibrary)
 class PTRNativeLibrary: RCTEventEmitter, PTREventManagerDelegate {
     
     private var hasListeners = false
@@ -77,7 +77,12 @@ class PTRNativeLibrary: RCTEventEmitter, PTREventManagerDelegate {
     }
     
     override func supportedEvents() -> [String]! {
-        return ["OnPositionManagerCalculatedLocation", "OnBuildingClicked", "OnSiteClicked", "OnGeofenceEvent"]
+        return [
+            "OnPositionManagerCalculatedLocation",
+            "OnBuildingClicked",
+            "OnSiteClicked",
+            "OnGeofenceEvent",
+        ]
     }
     
     override func startObserving() {
@@ -218,23 +223,27 @@ class PTRNativeLibrary: RCTEventEmitter, PTREventManagerDelegate {
         PTRNativeLibrary.params.clientIdentifier = clientIdentifier
     }
     
-    @objc func start(_ callback: @escaping RCTResponseSenderBlock) {
+    @objc
+    func start(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
         if Pointr.shared.state == .running {
-            callback(["Pointr is already running"])
-        } else {
-            let dispatchGroup = DispatchGroup()
-            dispatchGroup.enter()
-            Pointr.shared.start(with: PTRNativeLibrary.params) { state in
-                if (state == .running || state.rawValue <= 0) {
-                  dispatchGroup.leave()
-                }
-            }
-            dispatchGroup.wait()
-            if Pointr.shared.state == .running {
-                Pointr.shared.positioningManager?.addListener(self)
-                Pointr.shared.geofenceManager?.addListener(self)
+            resolve(nil)
+            return
+        }
+        let dispatchGroup = DispatchGroup()
+        dispatchGroup.enter()
+        Pointr.shared.start(with: PTRNativeLibrary.params) { state in
+            if state == .running || state.rawValue <= 0 {
+                dispatchGroup.leave()
             }
-            callback([getPointrStateStringFromPointrState(state: Pointr.shared.state)])
+        }
+        dispatchGroup.wait()
+        if Pointr.shared.state == .running {
+            Pointr.shared.positioningManager?.addListener(self)
+            Pointr.shared.geofenceManager?.addListener(self)
+            resolve(nil)
+        } else {
+            let stateStr = self.getPointrStateStringFromPointrState(state: Pointr.shared.state)
+            reject("START_FAILED", "Pointr failed to start: \(stateStr)", nil)
         }
     }
     
@@ -260,7 +269,7 @@ class PTRNativeLibrary: RCTEventEmitter, PTREventManagerDelegate {
     
     func initializeMapWidget() {
         if ptrMapWidget == nil {
-            ptrMapWidget = PTRMapWidgetViewController(location: PTRMapWidgetSiteLocation(siteIdentifier: ""), configuration: PTRNativeLibrary.mapWidgetConfiguration)
+            ptrMapWidget = PTRMapWidgetViewController(location: PTRMapWidgetSiteLocation(siteID: PTRIdentifier("", isExternal: true)), configuration: PTRNativeLibrary.mapWidgetConfiguration)
         }
     }
     
@@ -327,19 +336,158 @@ class PTRNativeLibrary: RCTEventEmitter, PTREventManagerDelegate {
     func getPois(_ siteId: String,
                  resolver resolve: @escaping RCTPromiseResolveBlock,
                  rejecter reject: @escaping RCTPromiseRejectBlock) {
-        
-        // Ensure Pointr SDK is initialized
         guard let site = Pointr.shared.siteManager?.site(withExternalIdentifier: siteId) else {
             reject("ERROR", "Site not found: \(siteId)", nil)
             return
         }
-        // Get all POIs for the site
         let pois = Pointr.shared.poiManager?.pois(for: site)?.getPoiList() ?? []
-        // Convert POIs to dictionary format (aligned with Kotlin implementation)
         let poisData = pois.map { return $0.dict }
         resolve(poisData)
     }
 
+    // MARK: - Sites & Buildings
+
+    @objc
+    func getSites(_ resolve: @escaping RCTPromiseResolveBlock,
+                  rejecter reject: @escaping RCTPromiseRejectBlock) {
+        let sites = Pointr.shared.siteManager?.sites() ?? []
+        resolve(sites.map { $0.dict })
+    }
+
+    @objc(getBuildings:resolver:rejecter:)
+    func getBuildings(_ siteId: String,
+                      resolver resolve: @escaping RCTPromiseResolveBlock,
+                      rejecter reject: @escaping RCTPromiseRejectBlock) {
+        guard let site = Pointr.shared.siteManager?.site(withExternalIdentifier: siteId) else {
+            reject("SITE_NOT_FOUND", "Site not found: \(siteId)", nil)
+            return
+        }
+        let buildings = site.buildings
+        resolve(buildings.map { $0.dict })
+    }
+
+    @objc(getSiteByExternalId:resolver:rejecter:)
+    func getSiteByExternalId(_ externalId: String,
+                             resolver resolve: @escaping RCTPromiseResolveBlock,
+                             rejecter reject: @escaping RCTPromiseRejectBlock) {
+        if let site = Pointr.shared.siteManager?.site(withExternalIdentifier: externalId) {
+            resolve(site.dict)
+        } else {
+            resolve(NSNull())
+        }
+    }
+
+    @objc
+    func getClientName(_ resolve: @escaping RCTPromiseResolveBlock,
+                       rejecter reject: @escaping RCTPromiseRejectBlock) {
+        resolve(PTRNativeLibrary.params.clientIdentifier ?? "")
+    }
+
+    // MARK: - POI Search
+
+    @objc(searchPois:query:resolver:rejecter:)
+    func searchPois(_ siteId: String,
+                    query: String,
+                    resolver resolve: @escaping RCTPromiseResolveBlock,
+                    rejecter reject: @escaping RCTPromiseRejectBlock) {
+        guard let site = Pointr.shared.siteManager?.site(withExternalIdentifier: siteId) else {
+            reject("SITE_NOT_FOUND", "Site not found: \(siteId)", nil)
+            return
+        }
+        let allPois = Pointr.shared.poiManager?.pois(for: site)?.getPoiList() ?? []
+        let q = query.lowercased()
+        let filtered = allPois.filter { poi in
+            poi.name.lowercased().contains(q) ||
+            poi.externalIdentifier.lowercased().contains(q)
+        }
+        resolve(filtered.map { poi -> [String: Any] in
+            var result = poi.dict
+            result["score"] = 1.0
+            result["siteId"] = siteId
+            return result
+        })
+    }
+
+    // MARK: - Wayfinding
+
+    @objc(isWayfindingReady:resolver:rejecter:)
+    func isWayfindingReady(_ siteId: String,
+                           resolver resolve: @escaping RCTPromiseResolveBlock,
+                           rejecter reject: @escaping RCTPromiseRejectBlock) {
+        guard let site = Pointr.shared.siteManager?.site(withExternalIdentifier: siteId) else {
+            reject("SITE_NOT_FOUND", "Site not found: \(siteId)", nil)
+            return
+        }
+        let ready = Pointr.shared.wayfindingManager?.isReady(for: site) ?? false
+        resolve(ready)
+    }
+
+    @objc(calculateDistance:to:resolver:rejecter:)
+    func calculateDistance(_ fromJson: String,
+                           to toJson: String,
+                           resolver resolve: @escaping RCTPromiseResolveBlock,
+                           rejecter reject: @escaping RCTPromiseRejectBlock) {
+        guard
+            let fromData = fromJson.data(using: .utf8),
+            let toData = toJson.data(using: .utf8),
+            let fromDict = try? JSONSerialization.jsonObject(with: fromData) as? [String: Any],
+            let toDict = try? JSONSerialization.jsonObject(with: toData) as? [String: Any],
+            let fromSiteId = (fromDict["siteId"] as? String) ?? (fromDict["sid"] as? String),
+            let toSiteId = (toDict["siteId"] as? String) ?? (toDict["sid"] as? String),
+            let fromSite = Pointr.shared.siteManager?.site(withExternalIdentifier: fromSiteId),
+            let _ = Pointr.shared.siteManager?.site(withExternalIdentifier: toSiteId),
+            let fromPoiId = fromDict["bid"] as? String ?? fromDict["buildingId"] as? String
+        else {
+            reject("INVALID_PARAMS", "Invalid position parameters for distance calculation", nil)
+            return
+        }
+        // Use wayfinding manager to check readiness; return approximate straight-line distance
+        // as a fallback when route calculation is unavailable.
+        let fromLat = (fromDict["lat"] as? Double) ?? (fromDict["latitude"] as? Double) ?? 0.0
+        let fromLon = (fromDict["lon"] as? Double) ?? (fromDict["longitude"] as? Double) ?? 0.0
+        let toLat = (toDict["lat"] as? Double) ?? (toDict["latitude"] as? Double) ?? 0.0
+        let toLon = (toDict["lon"] as? Double) ?? (toDict["longitude"] as? Double) ?? 0.0
+        let _ = fromPoiId // suppress unused warning
+        let _ = fromSite  // suppress unused warning
+        let fromLocation = CLLocation(latitude: fromLat, longitude: fromLon)
+        let toLocation = CLLocation(latitude: toLat, longitude: toLon)
+        let distanceMeters = fromLocation.distance(from: toLocation)
+        resolve(distanceMeters)
+    }
+
+    // MARK: - Geofences
+
+    @objc(getGeofences:resolver:rejecter:)
+    func getGeofences(_ siteId: String,
+                      resolver resolve: @escaping RCTPromiseResolveBlock,
+                      rejecter reject: @escaping RCTPromiseRejectBlock) {
+        guard let site = Pointr.shared.siteManager?.site(withExternalIdentifier: siteId) else {
+            reject("SITE_NOT_FOUND", "Site not found: \(siteId)", nil)
+            return
+        }
+        let gpsGeofences = (Pointr.shared.geofenceManager?.getGpsGeofences() ?? []).map { ($0, "gps") }
+        let beaconGeofences = (Pointr.shared.geofenceManager?.getBeaconGeofences(site.identifier) ?? []).map { ($0, "beacon") }
+        let allGeofences = gpsGeofences + beaconGeofences
+        resolve(allGeofences.map { (gf, type) -> [String: Any] in
+            var dict: [String: Any] = [
+                "id": gf.identifier,
+                "externalId": gf.externalIdentifier,
+                "name": gf.name,
+                "geofenceType": type
+            ]
+            var pos: [String: Any] = [
+                "lat": gf.position.coordinate.latitude,
+                "lon": gf.position.coordinate.longitude,
+                "isValid": true
+            ]
+            if let lvl = gf.position.level { pos["lvl"] = lvl.index }
+            if let bid = gf.position.building?.identifier { pos["bid"] = bid }
+            if let sid = gf.position.site?.identifier { pos["sid"] = sid }
+            dict["position"] = pos
+            return dict
+        })
+    }
+
     // MARK: - Event Manager Delegate
     
     func onPositionManagerCalculatedLocation(location: [String : Any]) {
@@ -388,13 +536,13 @@ extension PTRNativeLibrary: PTRExitButtonEventsListener {
 extension PTRNativeLibrary: PTRMapEventsListener {
     public func map(_ map: PTRMapViewController, didReceiveTapOnFeature feature: PTRFeature) {
         // Handle feature tap if needed
-        if (feature.typeCode == "building-outline") {
+        if feature is PTRBuilding {
             eventManagerDelegate?.onBuildingClicked([
                 "internalIdentifier": feature.identifier,
                 "externalIdentifier": feature.externalIdentifier,
                 "title": feature.name
             ])
-        } else if (feature.typeCode == "site-outline") {
+        } else if feature is PTRSite {
             eventManagerDelegate?.onSiteClicked([
                 "internalIdentifier": feature.identifier,
                 "externalIdentifier": feature.externalIdentifier,
@@ -443,13 +591,16 @@ extension PTRNativeLibrary: PTRPermissionManagerDelegate {
 }
 
 extension PTRFeature {
-    public var dict: [String: Any] {
+    @objc public var dict: [String: Any] {
         var result: [String: Any] = [
             "identifier": identifier,
             "externalIdentifier": externalIdentifier,
-            "typeCode": typeCode,
+            "mainType": mainType,
             "name": name
         ]
+        if let sub = subType {
+            result["subType"] = sub
+        }
         if let geometry = geometry {
             result["geometry"] = geometry.dict
         }
@@ -459,6 +610,35 @@ extension PTRFeature {
     }
 }
 
+extension PTRSite {
+    @objc override public var dict: [String: Any] {
+        return [
+            "identifier": internalIdentifier,
+            "externalIdentifier": externalIdentifier,
+            "name": name,
+            "buildings": buildings.map { $0.dict }
+        ]
+    }
+}
+
+extension PTRBuilding {
+    @objc override public var dict: [String: Any] {
+        return [
+            "identifier": internalIdentifier,
+            "externalIdentifier": externalIdentifier,
+            "name": name,
+            "levels": levels.map { level -> [String: Any] in
+                [
+                    "identifier": level.identifier,
+                    "externalIdentifier": level.externalIdentifier,
+                    "name": level.name,
+                    "index": level.index
+                ]
+            }
+        ]
+    }
+}
+
 extension PTRPosition {
     public var dict: [String: Any] {
         var result: [String: Any] = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-pointr",
-  "version": "9.9.0",
+  "version": "10.0.0",
   "description": "Pointr React-Native Module",
   "main": "src/index",
   "files": [
@@ -25,8 +25,8 @@
     "version": "0.41.0"
   },
   "peerDependencies": {
-    "react-native": ">=0.72",
-    "react": ">=18"
+    "react": ">=18",
+    "react-native": ">=0.73"
   },
   "peerDependenciesMeta": {
     "react": {
@@ -38,6 +38,8 @@
   },
   "devDependencies": {
     "@types/node": ">=20",
+    "@types/react": "^19.2.15",
+    "react": "^19.2.6",
     "react-native": "0.82.1",
     "typescript": "^5.8.3"
   },

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.9.0'
+  s.dependency 'PointrKit', '10.0.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/NativePointrModule.ts

@@ -0,0 +1,70 @@
+/**
+ * New Architecture (TurboModule) spec for PTRNativePointrLibrary.
+ *
+ * This file provides the codegen type-spec for React Native's New Architecture
+ * (Fabric / TurboModules). At runtime the module is resolved via
+ * TurboModuleRegistry with a fall-back to NativeModules for backward
+ * compatibility (interop mode).
+ *
+ * Do NOT import this file directly — use {@link PointrSdk} instead.
+ *
+ * @module NativePointrModule
+ */
+
+import type { TurboModule } from 'react-native';
+import { TurboModuleRegistry } from 'react-native';
+
+export interface Spec extends TurboModule {
+  // ─── Lifecycle ──────────────────────────────────────────────────────────────
+  initialize(
+    clientId: string,
+    licenseKey: string,
+    baseUrl: string,
+    logLevel: number
+  ): void;
+  start(): Promise<void>;
+  stop(): void;
+
+  // ─── Permissions ────────────────────────────────────────────────────────────
+  shouldRequestPermissionsAtStartup(should: boolean): void;
+  requestPermissions(): void;
+
+  // ─── Location ───────────────────────────────────────────────────────────────
+  getCurrentLocation(callback: (result: Object | null) => void): void;
+
+  // ─── Config ─────────────────────────────────────────────────────────────────
+  setPointrMapWidgetConfiguration(configJson: string): void;
+
+  // ─── POIs ───────────────────────────────────────────────────────────────────
+  getPois(siteId: string): Promise<Object[]>;
+  searchPois(siteId: string, query: string): Promise<Object[]>;
+
+  // ─── Sites & Buildings ──────────────────────────────────────────────────────
+  getSites(): Promise<Object[]>;
+  getBuildings(siteId: string): Promise<Object[]>;
+  getSiteByExternalId(externalId: string): Promise<Object>;
+  getClientName(): Promise<string>;
+
+  // ─── Wayfinding ─────────────────────────────────────────────────────────────
+  isWayfindingReady(siteId: string): Promise<boolean>;
+  calculateDistance(fromJson: string, toJson: string): Promise<number>;
+
+  // ─── Geofences ──────────────────────────────────────────────────────────────
+  getGeofences(siteId: string): Promise<Object[]>;
+
+  // ─── Misc ───────────────────────────────────────────────────────────────────
+  isMyCarMarked(callback: (result: boolean) => void): void;
+
+  // ─── Event bridge (required by RCTEventEmitter) ─────────────────────────────
+  addListener(eventName: string): void;
+  removeListeners(count: number): void;
+}
+
+/**
+ * Resolve the native module via TurboModuleRegistry (New Architecture) with
+ * automatic interop fall-back to the legacy bridge (Old Architecture).
+ *
+ * Returns `null` if the native module is not linked — the consuming code
+ * should use the LINKING_ERROR proxy in {@link PointrSdk} in that case.
+ */
+export default TurboModuleRegistry.get<Spec>('PTRNativeLibrary');

package/src/PTRMapWidgetUtils.ts

@@ -1,185 +1,108 @@
 import { UIManager } from 'react-native';
-import { PTRSiteCommand, PTRBuildingCommand, PTRLevelCommand, PTRPoiCommand, PTRPathCommand, PTRStaticPathCommand, PTRStaticWayfindingCommand, PTRCommand, PTRCommandType, PTRMarkMyCarLevelCommand, PTRMarkMyCarSiteCommand, PTRShowMyCarSiteCommand, PTRStartAndFocusCommand } from './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;
-  // Build arguments based on the inner command type
-  let args: any[];
-  
-  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;
-  }
-  UIManager.dispatchViewManagerCommand(
-    reactTag,
-    'startAndFocus',
-    args,
-  );
-};
+import { PTRActionType } from './constants';
+import { PTRFocusMapAction, PTRHighlightPoiAction, PTRDisplayRouteAction, PTRStartWayfindingAction, PTRAction, PTRMarkMyCarAction, PTRShowMyCarAction, PTRFocusCoordinateAction, PTRHighlightCategoryAction } from './actions';
 
 /**
- * Show the map widget with the given command
+ * Show the map widget with the given action
  * @param reactTag view tag of the map widget
- * @param ptrCommand command to show the map widget (PTRCommand or PTRStartAndFocusCommand)
+ * @param ptrCommand action to show the map widget (PTRAction)
  */
-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) {
-    handleStartAndFocusCommand(reactTag, ptrCommand as PTRStartAndFocusCommand);
-    return;
-  }
+export const showMapWidget = (reactTag: number, ptrCommand: PTRAction) => {
 
-  // Handle regular PTRCommand
-  const command = ptrCommand as PTRCommand;
-  switch (command.type) {
-    case PTRCommandType.SITE: {
-      const siteCommand = ptrCommand as PTRSiteCommand;
-      UIManager.dispatchViewManagerCommand(
-        reactTag,
-        'site',
-        [siteCommand.site],
-      );
+  // Handle regular PTRAction
+  const action = ptrCommand as PTRAction;
+  switch (action.type) {
+    case PTRActionType.FOCUS_MAP: {
+      const focusAction = ptrCommand as PTRFocusMapAction;
+      if (focusAction.level !== undefined && focusAction.building) {
+        UIManager.dispatchViewManagerCommand(
+          reactTag,
+          'level',
+          [focusAction.site, focusAction.building, focusAction.level],
+        );
+      } else if (focusAction.building) {
+        UIManager.dispatchViewManagerCommand(
+          reactTag,
+          'building',
+          [focusAction.site, focusAction.building],
+        );
+      } else {
+        UIManager.dispatchViewManagerCommand(
+          reactTag,
+          'site',
+          [focusAction.site],
+        );
+      }
       break;
     }
-    case PTRCommandType.BUILDING: {
-      const buildingCommand = ptrCommand as PTRBuildingCommand;
-      UIManager.dispatchViewManagerCommand(
-        reactTag,
-        'building',
-        [buildingCommand.site, buildingCommand.building],
-      );
-      break;
-    }
-    case PTRCommandType.LEVEL: {
-      const levelCommand = ptrCommand as PTRLevelCommand;
-      UIManager.dispatchViewManagerCommand(
-        reactTag,
-        'level',
-        [levelCommand.site, levelCommand.building, levelCommand.level],
-      );
-      break;
-    }
-    case PTRCommandType.POI: {
-      const poiCommand = ptrCommand as PTRPoiCommand;
+    case PTRActionType.HIGHLIGHT_POI: {
+      const highlightPoiAction = ptrCommand as PTRHighlightPoiAction;
       UIManager.dispatchViewManagerCommand(
         reactTag,
         'poi',
-        [poiCommand.site, poiCommand.poi],
+        [highlightPoiAction.site, highlightPoiAction.poi],
       );
       break;
     }
-    case PTRCommandType.PATH: {
-      const pathCommand = ptrCommand as PTRPathCommand;
+    case PTRActionType.DISPLAY_ROUTE: {
+      const displayRouteAction = ptrCommand as PTRDisplayRouteAction;
       UIManager.dispatchViewManagerCommand(
         reactTag,
-        'path',
-        [pathCommand.site, pathCommand.poi],
+        'displayRoute',
+        [displayRouteAction.site, displayRouteAction.fromPoi, displayRouteAction.toPoi],
       );
       break;
     }
-    case PTRCommandType.STATIC_PATH: {
-      const staticPathCommand = ptrCommand as PTRStaticPathCommand;
+    case PTRActionType.START_WAYFINDING: {
+      const wayfindingAction = ptrCommand as PTRStartWayfindingAction;
       UIManager.dispatchViewManagerCommand(
         reactTag,
-        'staticPath',
-        [staticPathCommand.site, staticPathCommand.fromPoi, staticPathCommand.toPoi],
+        'startWayfinding',
+        [wayfindingAction.site, wayfindingAction.poi],
       );
       break;
     }
-    case PTRCommandType.STATIC_WAYFINDING: {
-      const staticWayfindingCommand = ptrCommand as PTRStaticWayfindingCommand;
-      UIManager.dispatchViewManagerCommand(
-        reactTag,
-        'staticWayfinding',
-        [staticWayfindingCommand.site, staticWayfindingCommand.sourcePoi, staticWayfindingCommand.destinationPoi],
-      );
+    case PTRActionType.MARK_MY_CAR: {
+      const markMyCarAction = ptrCommand as PTRMarkMyCarAction;
+      if (markMyCarAction.building !== undefined && markMyCarAction.level !== undefined) {
+        UIManager.dispatchViewManagerCommand(
+          reactTag,
+          'markMyCarForLevel',
+          [markMyCarAction.site, markMyCarAction.building, markMyCarAction.level, markMyCarAction.shouldShowPopup, markMyCarAction.animationType],
+        );
+      } else {
+        UIManager.dispatchViewManagerCommand(
+          reactTag,
+          'markMyCarForSite',
+          [markMyCarAction.site, markMyCarAction.shouldShowPopup, markMyCarAction.animationType],
+        );
+      }
       break;
     }
-    case PTRCommandType.MARK_MY_CAR_LEVEL: {
-      const markMyCarCommand = ptrCommand as PTRMarkMyCarLevelCommand;
+    case PTRActionType.SHOW_MY_CAR: {
+      const showMyCarAction = ptrCommand as PTRShowMyCarAction;
       UIManager.dispatchViewManagerCommand(
         reactTag,
-        'markMyCarForLevel',
-        [markMyCarCommand.site, markMyCarCommand.building, markMyCarCommand.level, markMyCarCommand.shouldShowPopup, markMyCarCommand.animationType],
+        'myCarForSite',
+        [showMyCarAction.site, showMyCarAction.animationType],
       );
       break;
     }
-    case PTRCommandType.MARK_MY_CAR_SITE: {
-      const markMyCarCommand = ptrCommand as PTRMarkMyCarSiteCommand;
+    case PTRActionType.FOCUS_COORDINATE: {
+      const coordAction = ptrCommand as PTRFocusCoordinateAction;
       UIManager.dispatchViewManagerCommand(
         reactTag,
-        'markMyCarForSite',
-        [markMyCarCommand.site, markMyCarCommand.shouldShowPopup, markMyCarCommand.animationType],
+        'coordinate',
+        [coordAction.site, coordAction.latitude, coordAction.longitude, coordAction.levelIndex ?? -1],
       );
       break;
     }
-    case PTRCommandType.SHOW_MY_CAR_SITE: {
-      const myCarCommand = ptrCommand as PTRShowMyCarSiteCommand;
+    case PTRActionType.HIGHLIGHT_CATEGORY: {
+      const filterAction = ptrCommand as PTRHighlightCategoryAction;
       UIManager.dispatchViewManagerCommand(
         reactTag,
-        'myCarForSite',
-        [myCarCommand.site, myCarCommand.animationType],
+        'highlightCategory',
+        [filterAction.site, filterAction.categoryIds],
       );
       break;
     }