react-native-pointr 8.14.3 → 8.15.0

package/CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [8.15.0]
+
+### Features
+- Added `PTRMyCarSiteCommand`, `PTRMarkMyCarSiteCommand` and `PTRMarkMyCarLevelCommand` commands to show map widget component.
+- Added `isMyCarMarked` API to `PTRNaPTRNativePointrLibrary`.
+
+### Updates
+- Mobile SDK 8.15.0 integration.
+
 ## [8.14.1]
 
 ### Added

package/android/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,2 @@
+connection.project.dir=../../../android
+eclipse.preferences.version=1

package/android/build.gradle

@@ -95,7 +95,7 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "com.pointrlabs:pointr:8+"
+  implementation "com.pointrlabs:pointr:8.15.0"
   implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
   implementation 'androidx.appcompat:appcompat:1.7.0'
   implementation 'com.google.android.material:material:1.12.0'

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

@@ -13,5 +13,8 @@ annotation class PTRMapWidgetCommandType {
         const val POI = "poi"
         const val PATH = "path"
         const val STATIC_PATH = "staticPath"
+        const val MARK_MY_CAR_LEVEL = "markMyCarForLevel"
+        const val MARK_MY_CAR_SITE = "markMyCarForSite"
+        const val MY_CAR_SITE = "myCarForSite"
     }
 }

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

@@ -1,6 +1,8 @@
 package com.pointr
 
 import android.annotation.SuppressLint
+import android.os.Handler
+import android.os.Looper.getMainLooper
 import android.util.Log
 import android.view.Choreographer
 import android.view.View
@@ -13,19 +15,34 @@ import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.events.RCTEventEmitter
+import com.pointrlabs.core.configuration.MutableConfiguration
 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.Site
+import com.pointrlabs.core.map.handlers.MapWidgetEventsHandler
+import com.pointrlabs.core.map.handlers.PathFindingEventsHandler
+import com.pointrlabs.core.map.handlers.PathUpdatesEventHandler
+import com.pointrlabs.core.map.models.PTRDeepLinkAction
+import com.pointrlabs.core.map.models.PTRDeepLinkLocation
+import com.pointrlabs.core.map.models.PTRDeepLinkPathfindingAction
+import com.pointrlabs.core.map.models.PTRDeepLinkPoiLocation
 import com.pointrlabs.core.map.models.PTRError
 import com.pointrlabs.core.map.models.PTRMapSymbolLayer
 import com.pointrlabs.core.map.models.events_listeners.MapEventsListener
+import com.pointrlabs.core.map.models.events_listeners.MarkMyCarDetailsEvent
+import com.pointrlabs.core.map.models.events_listeners.MarkMyCarDetailsEventsListener
+import com.pointrlabs.core.map.models.events_listeners.PathFindingEventsListener
 import com.pointrlabs.core.map.viewmodels.PTRMapWidgetConfiguration
+import com.pointrlabs.core.map.views.PTRMapAnimationType
 import com.pointrlabs.core.map.views.PTRMapFragment
 import com.pointrlabs.core.map.views.PTRMapWidgetFragment
+import com.pointrlabs.core.map.views.pathfinding.MarkMyCarBottomSheet
 import com.pointrlabs.core.nativecore.wrappers.Plog
 import com.pointrlabs.core.pathfinding.PathManager
+import com.pointrlabs.core.pathfinding.session.PathSession
+import com.pointrlabs.core.pathfinding.session.PathSessionState
 import com.pointrlabs.core.positioning.model.PositioningTypes
 import com.pointrlabs.core.site.SiteManager
 import java.util.concurrent.Semaphore
@@ -33,18 +50,24 @@ import java.util.concurrent.Semaphore
 
 @SuppressLint("LogNotTimber")
 class PTRMapWidgetManager(private val reactContext: ReactApplicationContext) :
-    ViewGroupManager<FrameLayout>(), MapEventsListener {
+    ViewGroupManager<FrameLayout>(), MapEventsListener, MarkMyCarDetailsEventsListener {
 
     override fun getName() = REACT_CLASS
 
+    private var markMyCarButtonSheet: MarkMyCarBottomSheet? = null
     private lateinit var frameLayout: FrameLayout
 
-    private var _ptrMapWidgetFragment: PTRMapWidgetFragment? = null
+    // TODO: Uncomment 1
+    // private var _ptrMapWidgetFragment: PTRMapWidgetFragment? = null
     private val ptrMapWidgetFragment: PTRMapWidgetFragment?
         get() {
-            _ptrMapWidgetFragment?.let { return it }
+            // TODO: Uncomment 1
+            // _ptrMapWidgetFragment?.let { return it }
             Log.i("PTRMapWidgetManager", "Creating map widget fragment")
-            _ptrMapWidgetFragment = createMapWidgetFragment()
+            // TODO: Uncomment 1
+            //_ptrMapWidgetFragment = createMapWidgetFragment()
+            // TODO: Comment 1
+            val _ptrMapWidgetFragment = createMapWidgetFragment()
             Choreographer.getInstance().postFrameCallback(frameCallback)
             _ptrMapWidgetFragment?.addListener(this)
             return _ptrMapWidgetFragment
@@ -86,10 +109,21 @@ class PTRMapWidgetManager(private val reactContext: ReactApplicationContext) :
             )
             return
         }
-        clearPath(ptrMapWidgetFragment)
+        // TODO: Uncomment 1
+//        clearPath(ptrMapWidgetFragment)
+//        dismissMarkMyCarDetails(ptrMapWidgetFragment)
         executeCommand(ptrMapWidgetFragment, command, args1)
     }
 
+    private fun dismissMarkMyCarDetails(ptrMapWidgetFragment: PTRMapWidgetFragment) {
+        val markMyCarButtonSheet = markMyCarButtonSheet ?: return
+        val handler = ptrMapWidgetFragment.markMyCarEventsHandler
+            ?: return Plog.w("Mark my car events handler is null")
+        Plog.i("Dismissing mark my car details")
+        handler.onMarkMyCarDetailsEvent(markMyCarButtonSheet, MarkMyCarDetailsEvent.Cancel)
+        handler.onMarkMyCarDetailsEvent(markMyCarButtonSheet, MarkMyCarDetailsEvent.Close)
+    }
+
     private fun clearPath(ptrMapWidgetFragment: PTRMapWidgetFragment) {
         ptrMapWidgetFragment.mapFragment?.removeAllFeatures { isSuccess, message ->
             if (!isSuccess) {
@@ -150,10 +184,102 @@ class PTRMapWidgetManager(private val reactContext: ReactApplicationContext) :
                 args1.getString(2)
             )
 
+            PTRMapWidgetCommandType.MARK_MY_CAR_SITE -> {
+                showMarkMyCarDetails(
+                    ptrMapWidgetFragment,
+                    args1.getString(0),
+                    shouldShowPopup = args1.getBoolean(1),
+                    animationType = args1.getInt(2)
+                )
+            }
+
+            PTRMapWidgetCommandType.MARK_MY_CAR_LEVEL -> {
+                showMarkMyCarDetails(
+                    ptrMapWidgetFragment,
+                    args1.getString(0),
+                    args1.getString(1),
+                    args1.getInt(2),
+                    args1.getBoolean(3),
+                    args1.getInt(4)
+                )
+            }
+
+            PTRMapWidgetCommandType.MY_CAR_SITE -> {
+                showMyCarDetails(ptrMapWidgetFragment, args1.getString(0), args1.getInt(1))
+            }
+
             else -> return
         }
     }
 
+    private fun showMyCarDetails(
+        ptrMapWidgetFragment: PTRMapWidgetFragment,
+        siteExternalIdentifier: String,
+        animationTypeOrdinal: Int
+    ) {
+        val animationType = PTRMapAnimationType.entries[animationTypeOrdinal]
+        ptrMapWidgetFragment.showMyCarDetails(
+            siteExternalIdentifier,
+            shouldShowDialog = false,
+            animationType = animationType
+        ) onComplete@{ error ->
+            this@PTRMapWidgetManager.mapWidgetDidEndLoading(
+                PTRMapWidgetCommandType.MY_CAR_SITE,
+                siteExternalIdentifier,
+                animationType,
+                error ?: ""
+            )
+            error?.let {
+                Plog.e("Error showing mark my car details: $it")
+                return@onComplete
+            }
+            Plog.i("Mark my car details is shown")
+        }
+    }
+
+    private fun showMarkMyCarDetails(
+        ptrMapWidgetFragment: PTRMapWidgetFragment,
+        siteExternalIdentifier: String,
+        buildingExternalIdentifier: String? = null,
+        levelIndex: Int? = null,
+        shouldShowPopup: Boolean,
+        animationType: Int
+    ) {
+
+        ptrMapWidgetFragment.showMarkMyCarDetails(
+            siteExternalIdentifier,
+            buildingExternalIdentifier,
+            levelIndex,
+            PTRMapAnimationType.entries[animationType],
+            shouldShowPopup
+        ) onComplete@{ error ->
+            if (buildingExternalIdentifier == null || levelIndex == null || levelIndex == PositioningTypes.INVALID_INTEGER) {
+                this@PTRMapWidgetManager.mapWidgetDidEndLoading(
+                    PTRMapWidgetCommandType.MARK_MY_CAR_LEVEL,
+                    siteExternalIdentifier,
+                    buildingExternalIdentifier ?: "",
+                    levelIndex ?: PositioningTypes.INVALID_INTEGER,
+                    shouldShowPopup,
+                    animationType,
+                    error ?: ""
+                )
+            } else {
+                this@PTRMapWidgetManager.mapWidgetDidEndLoading(
+                    PTRMapWidgetCommandType.MARK_MY_CAR_SITE,
+                    siteExternalIdentifier,
+                    shouldShowPopup,
+                    animationType,
+                    error ?: ""
+                )
+            }
+            error?.let {
+                Plog.e("Error showing mark my car details: $it")
+                return@onComplete
+            }
+            Plog.i("Mark my car details is shown")
+        }
+    }
+
     private fun mapWidgetDidEndLoading(
         @PTRMapWidgetCommandType command: String,
         vararg args: Any
@@ -367,7 +493,44 @@ class PTRMapWidgetManager(private val reactContext: ReactApplicationContext) :
     }
 
     private fun showPath(ptrMapWidgetFragment: PTRMapWidgetFragment, site: String, toPoi: String) {
-        ptrMapWidgetFragment.showPathFinding(site, toPoi) { error ->
+
+
+        val siteObject = getSite(site) ?: run {
+            mapWidgetDidEndLoading(
+                PTRMapWidgetCommandType.PATH,
+                site,
+                toPoi,
+                "Site not found"
+            )
+            return
+        }
+        if (!waitForSiteData(siteObject)) {
+            mapWidgetDidEndLoading(
+                PTRMapWidgetCommandType.PATH,
+                site,
+                toPoi,
+                "Site data not found"
+            )
+            return
+        }
+        val target =
+            Pointr.getPointr()?.poiManager?.getPoiByExternalIdentifier(siteObject, toPoi) ?: run {
+                mapWidgetDidEndLoading(
+                    PTRMapWidgetCommandType.PATH,
+                    site,
+                    toPoi,
+                    "Target POI not found"
+                )
+                return
+            }
+
+        val action = PTRDeepLinkPathfindingAction(
+            PTRDeepLinkPoiLocation(
+                siteObject.internalIdentifier,
+                target.id
+            )
+        )
+        ptrMapWidgetFragment.performDeepLinkAction(action) { error ->
             this@PTRMapWidgetManager.mapWidgetDidEndLoading(
                 PTRMapWidgetCommandType.PATH,
                 site,
@@ -376,7 +539,7 @@ class PTRMapWidgetManager(private val reactContext: ReactApplicationContext) :
             )
             error?.let {
                 Plog.e("Error showing path: $it")
-                return@showPathFinding
+                return@performDeepLinkAction
             }
             Plog.i("Path shown")
         }
@@ -580,6 +743,15 @@ class PTRMapWidgetManager(private val reactContext: ReactApplicationContext) :
         Log.e("PTRMapWidgetManager", "Map failed to load: $ptrError")
     }
 
+    override fun onMarkMyCarDetailsEvent(
+        markMyCarSheet: MarkMyCarBottomSheet,
+        markMyCarDetailsEvent: MarkMyCarDetailsEvent
+    ) {
+        super.onMarkMyCarDetailsEvent(markMyCarSheet, markMyCarDetailsEvent)
+        this.markMyCarButtonSheet = markMyCarSheet
+        Plog.i("Mark my car details event: $markMyCarDetailsEvent")
+    }
+
     private val frameCallback = object : Choreographer.FrameCallback {
         override fun doFrame(frameTimeNanos: Long) {
             frameLayout.measure(

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

@@ -154,6 +154,14 @@ class PointrModule(reactContext: ReactApplicationContext) :
         Pointr.getPointr()?.stop()
     }
 
+    @ReactMethod
+    fun isMyCarMarked(callback: Callback) {
+        val pointr = Pointr.getPointr() ?: return callback.invoke("Pointr is not initialized")
+        if (pointr.state != Pointr.State.RUNNING) return callback.invoke("Pointr is not running")
+        if (pointr.myCarFeature == null) return callback.invoke("No saved location")
+        callback.invoke(null)
+    }
+
     @ReactMethod
     fun getCurrentLocation(callback: Callback) {
         val pointr = Pointr.getPointr() ?: return callback.invoke(null)
@@ -410,7 +418,8 @@ class PointrModule(reactContext: ReactApplicationContext) :
             // we need to keep the activity to show the dialog
             val activity = mapFragment.activity ?: return
             val ptrMapWidgetFragment = mapFragment.parentFragment ?: return
-            ptrMapWidgetFragment.parentFragmentManager.beginTransaction().remove(ptrMapWidgetFragment).commit()
+            ptrMapWidgetFragment.parentFragmentManager.beginTransaction()
+                .remove(ptrMapWidgetFragment).commit()
             val ptrDialogModel = PTRDialog.PtrDialogModel(
                 iconDrawableResId = com.pointrlabs.core.R.drawable.error_generic,
                 bigTextString = activity.getString(com.pointrlabs.core.R.string.ptr_error_title_map_loading_generic_error),

package/ios/PTRMapWidgetContainerView.h

@@ -1,10 +1,9 @@
 #import <React/RCTComponent.h>
 #import <PointrKit/PointrKit.h>
-#import "react_native_pointr-Swift.h"
 
 extern NSString * const kLayerStaticPath;
 
-@interface PTRMapWidgetContainerView: UIView<PTRConfigurationManagerDelegate, PointrStateChangeListener, PTRSiteManagerDelegate, PTRDataManagerDelegate, PTRPathManagerDelegate>
+@interface PTRMapWidgetContainerView: UIView<PTRConfigurationManagerDelegate, PTRSiteManagerDelegate, PTRDataManagerDelegate, PTRPathManagerDelegate>
 
 @property (nonatomic, copy) RCTBubblingEventBlock onMapWidgetDidEndLoading;
 @property(readonly, atomic, strong) PTRMapWidgetViewController *mapWidget;
@@ -14,6 +13,7 @@ extern NSString * const kLayerStaticPath;
 
 - (void)ptrMapWidgetDidEndLoadingWithParameters:(NSDictionary *)parameters;
 -(PTRMapWidgetViewController *) getMapWidget;
+-(void) present:(PTRMapWidgetViewController *) mapWidget;
 -(void) showStaticPath:(NSString *) siteExternalIdentifier fromPoiExternalIdentifier:(NSString *) fromPoiExternalIdentifier toPoiExternalIdentifier:(NSString *) toPoiExternalIdentifier;
 
 @end

package/ios/PTRMapWidgetContainerView.m

@@ -1,4 +1,5 @@
 #import "PTRMapWidgetContainerView.h"
+#import "react_native_pointr-Swift.h"
 
 NSString * const kLayerStaticPath = @"static-path";
 
@@ -10,31 +11,29 @@ NSString * const kLayerStaticPath = @"static-path";
     }
 }
 
--(PTRMapWidgetViewController *) getMapWidget {
-    if (self.mapWidget) {
-        self.mapWidget.mapViewController.currentPath = nil;
-        [self.mapWidget.mapViewController removeAllFeatures];
-        [self.mapWidget.mapViewController removeLayerWithLayerIdentifier: kLayerStaticPath];
-        return self.mapWidget;
-    }
-    if ([self waitForPointrState] != PointrStateRunning) {
+-(nonnull PTRMapWidgetViewController *) getMapWidget {
+    if ([self waitForPointrState] == PointrStateRunning) {
+        [self waitForConfiguration];
+    } else {
         NSLog(@"Pointr is not running");
     }
-    [self waitForConfiguration];
     NSLog(@"initializing map widget");
     PTRMapWidgetConfiguration *config = [PointrApp.sharedApp getMapWidgetConfiguration];
     PTRMapwidgetExitButtonConfiguration *exitButtonConfiguration = [[PTRMapwidgetExitButtonConfiguration alloc] initWithPreferredPosition:PTRMapwidgetExitButtonPositionTopRight visibility:PTRMapwidgetExitButtonVisibilityNotVisible];
     config.exitButtonConfiguration = exitButtonConfiguration;
     _mapWidget = [[PTRMapWidgetViewController alloc] initWithConfiguration:config];
-    [self addSubview: self.mapWidget.view];
-    self.mapWidget.view.translatesAutoresizingMaskIntoConstraints = NO;
+    return self.mapWidget;
+}
+
+-(void) present:(PTRMapWidgetViewController *) mapWidget {
+    [self addSubview: mapWidget.view];
+    mapWidget.view.translatesAutoresizingMaskIntoConstraints = NO;
     [NSLayoutConstraint activateConstraints:@[
-        [self.mapWidget.view.leadingAnchor constraintEqualToAnchor:self.leadingAnchor],
-        [self.mapWidget.view.trailingAnchor constraintEqualToAnchor:self.trailingAnchor],
-        [self.mapWidget.view.topAnchor constraintEqualToAnchor:self.topAnchor],
-        [self.mapWidget.view.bottomAnchor constraintEqualToAnchor:self.bottomAnchor],
+        [mapWidget.view.leadingAnchor constraintEqualToAnchor:self.leadingAnchor],
+        [mapWidget.view.trailingAnchor constraintEqualToAnchor:self.trailingAnchor],
+        [mapWidget.view.topAnchor constraintEqualToAnchor:self.topAnchor],
+        [mapWidget.view.bottomAnchor constraintEqualToAnchor:self.bottomAnchor],
     ]];
-    return self.mapWidget;
 }
 
 -(void) showStaticPath:(NSString *) siteExternalIdentifier fromPoiExternalIdentifier:(NSString *) fromPoiExternalIdentifier toPoiExternalIdentifier:(NSString *) toPoiExternalIdentifier {
@@ -112,6 +111,7 @@ NSString * const kLayerStaticPath = @"static-path";
                 NSLog(@"ready");
             }];
         }
+        [self present: mapWidget];
     });
 }
 
@@ -264,20 +264,18 @@ NSString * const kLayerStaticPath = @"static-path";
 
 - (PointrState) waitForPointrState {
     NSLog(@"waiting for pointr to run");
-    self.semaphore = dispatch_semaphore_create(0);
-    [[Pointr shared] addListener: self];
-    PointrState state = [Pointr shared].state;
-    if (state != PointrStateRunning && state > PointrStateOff) {
-        dispatch_semaphore_wait(self.semaphore, DISPATCH_TIME_FOREVER);
+    PointrState state1 = [Pointr shared].state;
+    if (state1 == PointrStateRunning || state1 < PointrStateOff) {
+        return [Pointr shared].state;
     }
-    [[Pointr shared] removeListener:self];
+    dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+    [[Pointr shared] startWithParams:PointrApp.params onStateChanged:^(PointrState state) {
+        if (state == PointrStateRunning || state < PointrStateOff) {
+            dispatch_semaphore_signal(semaphore);
+        }
+    }];
+    dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
     return [Pointr shared].state;
 }
 
-- (void)pointrStateDidChangeTo:(PointrState)state {
-    if (state == PointrStateRunning || state <= PointrStateOff) {
-        dispatch_semaphore_signal(self.semaphore);
-    }
-}
-
 @end

package/ios/PTRMapWidgetManager.m

@@ -42,6 +42,7 @@ RCT_EXPORT_METHOD(site:(nonnull NSNumber*) reactTag siteExternalIdentifier:(NSSt
                 }
                 NSLog(@"ready");
             }];
+            [ptrMapWidgetContainerView present:mapWidget];
         });
     }];
 }
@@ -67,7 +68,8 @@ RCT_EXPORT_METHOD(building:(nonnull NSNumber*) reactTag siteExternalIdentifier:(
                 };
                 [ptrMapWidgetContainerView ptrMapWidgetDidEndLoadingWithParameters: ptrCommand];
             }];
-                    });
+            [ptrMapWidgetContainerView present:mapWidget];
+        });
     }];
 }
 
@@ -93,6 +95,7 @@ RCT_EXPORT_METHOD(level:(nonnull NSNumber*) reactTag siteExternalIdentifier:(NSS
                 };
                 [ptrMapWidgetContainerView ptrMapWidgetDidEndLoadingWithParameters: ptrCommand];
             }];
+            [ptrMapWidgetContainerView present:mapWidget];
         });
     }];
 }
@@ -118,6 +121,7 @@ RCT_EXPORT_METHOD(poi:(nonnull NSNumber*) reactTag siteExternalIdentifier:(NSStr
                 };
                 [ptrMapWidgetContainerView ptrMapWidgetDidEndLoadingWithParameters: ptrCommand];
             }];
+            [ptrMapWidgetContainerView present:mapWidget];
         });
     }];
 }
@@ -143,6 +147,7 @@ RCT_EXPORT_METHOD(path:(nonnull NSNumber*) reactTag siteExternalIdentifier:(NSSt
                 };
                 [ptrMapWidgetContainerView ptrMapWidgetDidEndLoadingWithParameters: ptrCommand];
             }];
+            [ptrMapWidgetContainerView present:mapWidget];
         });
     }];
 }
@@ -162,4 +167,90 @@ RCT_EXPORT_METHOD(staticPath:(nonnull NSNumber*) reactTag siteExternalIdentifier
     }];
 }
 
+RCT_EXPORT_METHOD(markMyCarForLevel:(nonnull NSNumber*) reactTag siteExternalIdentifier:(nonnull NSString*) siteExternalIdentifier buildingExternalIdentifier:(nonnull NSString*) buildingExternalIdentifier levelIndex:(NSInteger) levelIndex shouldShowPopup:(BOOL) shouldShowPopup animationType:(NSInteger) animationType) {
+    [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *,UIView *> *viewRegistry) {
+        UIView *view = viewRegistry[reactTag];
+        if (!view || ![view isKindOfClass:[PTRMapWidgetContainerView class]]) {
+            RCTLogError(@"Cannot find PTRMapWidgetContainerView with tag #%@", reactTag);
+            return;
+        }
+        NSLog(@"found PTRMapWidgetContainerView");
+        PTRMapWidgetContainerView *ptrMapWidgetContainerView = (PTRMapWidgetContainerView *)view;
+        dispatch_async(dispatch_get_main_queue(), ^{
+            PTRMapWidgetViewController *mapWidget = [ptrMapWidgetContainerView getMapWidget];
+            NSLog(@"calling show mark my car method of mapWidget");
+            if (levelIndex == [PTRPositioningTypes invalidInteger]) {
+                NSLog(@"Level index cannot be invalid");
+                return;
+            }
+            [mapWidget showMarkMyCarDetailsWithSiteExternalIdentifier:siteExternalIdentifier buildingExternalIdentifier:buildingExternalIdentifier levelIndex:levelIndex showPopup:shouldShowPopup animationType:(PTRMapAnimationType)animationType completion:^(PTRMapWidgetError * _Nullable error) {
+                NSDictionary *ptrCommand = @{
+                    @"command": @"markMyCarForLevel",
+                    @"siteExternalIdentifier": siteExternalIdentifier,
+                    @"buildingExternalIdentifier": buildingExternalIdentifier,
+                    @"levelIndex": [NSNumber numberWithInteger: levelIndex],
+                    @"shouldShowPopup": @(shouldShowPopup),
+                    @"animationType": @(animationType),
+                    @"error": error ? error.errorCode : @""
+                };
+                [ptrMapWidgetContainerView ptrMapWidgetDidEndLoadingWithParameters: ptrCommand];
+            }];
+            [ptrMapWidgetContainerView present:mapWidget];
+        });
+    }];
+}
+
+RCT_EXPORT_METHOD(markMyCarForSite:(nonnull NSNumber*) reactTag siteExternalIdentifier:(nonnull NSString*) siteExternalIdentifier shouldShowPopup:(BOOL) shouldShowPopup animationType:(NSInteger) animationType) {
+    [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *,UIView *> *viewRegistry) {
+        UIView *view = viewRegistry[reactTag];
+        if (!view || ![view isKindOfClass:[PTRMapWidgetContainerView class]]) {
+            RCTLogError(@"Cannot find PTRMapWidgetContainerView with tag #%@", reactTag);
+            return;
+        }
+        NSLog(@"found PTRMapWidgetContainerView");
+        PTRMapWidgetContainerView *ptrMapWidgetContainerView = (PTRMapWidgetContainerView *)view;
+        dispatch_async(dispatch_get_main_queue(), ^{
+            PTRMapWidgetViewController *mapWidget = [ptrMapWidgetContainerView getMapWidget];
+            NSLog(@"calling show mark my car method of mapWidget");
+            [mapWidget showMarkMyCarDetailsWithSiteExternalIdentifier:siteExternalIdentifier showPopup:shouldShowPopup animationType: (PTRMapAnimationType) animationType  completion:^(PTRMapWidgetError * _Nullable error) {
+                NSDictionary *ptrCommand = @{
+                    @"command": @"markMyCarForSite",
+                    @"siteExternalIdentifier": siteExternalIdentifier,
+                    @"shouldShowPopup": @(shouldShowPopup),
+                    @"animationType": @(animationType),
+                    @"error": error ? error.errorCode : @""
+                };
+                [ptrMapWidgetContainerView ptrMapWidgetDidEndLoadingWithParameters: ptrCommand];
+            }];
+            [ptrMapWidgetContainerView present:mapWidget];
+        });
+    }];
+}
+
+RCT_EXPORT_METHOD(myCarForSite:(nonnull NSNumber*) reactTag siteExternalIdentifier:(nonnull NSString*) siteExternalIdentifier animationType:(NSInteger) animationType) {
+    [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *,UIView *> *viewRegistry) {
+        UIView *view = viewRegistry[reactTag];
+        if (!view || ![view isKindOfClass:[PTRMapWidgetContainerView class]]) {
+            RCTLogError(@"Cannot find PTRMapWidgetContainerView with tag #%@", reactTag);
+            return;
+        }
+        NSLog(@"found PTRMapWidgetContainerView");
+        PTRMapWidgetContainerView *ptrMapWidgetContainerView = (PTRMapWidgetContainerView *)view;
+        dispatch_async(dispatch_get_main_queue(), ^{
+            PTRMapWidgetViewController *mapWidget = [ptrMapWidgetContainerView getMapWidget];
+            NSLog(@"calling show mark my car method of mapWidget");
+            [mapWidget showMyCarDetailsWithSiteExternalIdentifier: siteExternalIdentifier animationType: (PTRMapAnimationType) animationType  completion:^(PTRMapWidgetError * _Nullable error) {
+                NSDictionary *ptrCommand = @{
+                    @"command": @"myCarForSite",
+                    @"siteExternalIdentifier": siteExternalIdentifier,
+                    @"animationType": @(animationType),
+                    @"error": error ? error.errorCode : @""
+                };
+                [ptrMapWidgetContainerView ptrMapWidgetDidEndLoadingWithParameters: ptrCommand];
+            }];
+            [ptrMapWidgetContainerView present:mapWidget];
+        });
+    }];
+}
+
 @end

package/ios/PTRNativeLibrary.m

@@ -129,6 +129,15 @@ RCT_EXPORT_METHOD(requestPermissions) {
     [PointrApp.sharedApp requestPermissions];
 }
 
+RCT_EXPORT_METHOD(isMyCarMarked:(RCTResponseSenderBlock)callback) {
+    PTRFeature *feature = [Pointr.shared getMyCarFeature];
+    if (feature == nil) {
+        callback(@[@"No saved location"]);
+        return;
+    }
+    callback(@[]);
+}
+
 #pragma mark Event Manager Delegate
 
 - (void)onPositionManagerCalculatedLocationWithLocation:(NSDictionary<NSString *,id> * _Nonnull)location {

package/ios/PointrApp.swift

@@ -23,11 +23,11 @@ import PointrKit
     
     @objc public static var shouldRequestPermissionsAtStartup: Bool = true
     
-    let params = PTRParams()
+    @objc public static let params = PTRParams()
     
     let dispatchGroup = DispatchGroup()
     
-    var viewController: PTRMapWidgetViewController? = nil
+    var ptrMapWidget: PTRMapWidgetViewController? = nil
     
     var configuration: Dictionary<String,Any>? = nil
     
@@ -81,14 +81,14 @@ import PointrKit
     func initialize(licenseKey: String, baseUrl: String, clientIdentifier: String, environment: String = "prod", logLevel: Int = 4, rootViewController: UIViewController) {
         Pointr.shared.permissionManager?.delegate = self
         self.rootViewController = rootViewController
-        self.params.mode = PointrReleaseMode()
+        PointrApp.params.mode = PointrDebugMode()
         // No need to set environment
-        self.params.loggerLevel = PTRLoggerLevel.init(rawValue: Int32(logLevel)) ?? .error
+        PointrApp.params.loggerLevel = PTRLoggerLevel.init(rawValue: Int32(logLevel)) ?? .error
         
         // Enter you license key
-        self.params.licenseKey = licenseKey
-        self.params.baseUrl = baseUrl
-        self.params.clientIdentifier = clientIdentifier
+        PointrApp.params.licenseKey = licenseKey
+        PointrApp.params.baseUrl = baseUrl
+        PointrApp.params.clientIdentifier = clientIdentifier
     }
     
     func getEnvironmentFromString(env: String) -> PTREnvironment {
@@ -156,16 +156,19 @@ import PointrKit
     }
     
     func start(completion: @escaping (String) -> Void) {
+        let dispatchGroup = DispatchGroup()
         dispatchGroup.enter()
-        Pointr.shared.addListener(self)
-        Pointr.shared.start(with: params) {_ in }
+        Pointr.shared.start(with: PointrApp.params) { state in
+            if (state == .running || state.rawValue <= 0) {
+              dispatchGroup.leave()
+            }
+        }
         dispatchGroup.wait()
-        
         if Pointr.shared.state == .running {
             Pointr.shared.positionManager?.addListener(self)
         }
         
-        completion(getPointrStateStringFromPointrState(state: Pointr.shared.state))
+        completion(PointrApp.getPointrStateStringFromPointrState(state: Pointr.shared.state))
     }
     
     func stop() {
@@ -188,7 +191,7 @@ import PointrKit
     func showSite(siteExternalIdentifier id: String, animationType:Int, completion: @escaping (String?) -> Void) {
         func showSiteWithCompletion(completion: @escaping (String?) -> Void) {
             self.initializeMapWidget()
-            self.viewController!.showSite(siteExternalIdentifier: id, animationType: self.getAnimationTypeFromInt(value: animationType)) { error in
+            self.ptrMapWidget!.showSite(siteExternalIdentifier: id, animationType: self.getAnimationTypeFromInt(value: animationType)) { error in
                 completion(self.getErrorStringFromMapWidgetError(error: error))
             }
             self.presentMapWidgetIfNotPresented()
@@ -210,7 +213,7 @@ import PointrKit
     func showBuilding(siteExternalIdentifier: String, buildingExternalIdentifier: String, animationType:Int, completion: @escaping (String?) -> Void) {
         func showBuildingWithCompletion(completion: @escaping (String?) -> Void) {
             self.initializeMapWidget()
-            self.viewController!.showBuilding(siteExternalIdentifier: siteExternalIdentifier, buildingExternalIdentifier: buildingExternalIdentifier, animationType: self.getAnimationTypeFromInt(value: animationType)) { error in
+            self.ptrMapWidget!.showBuilding(siteExternalIdentifier: siteExternalIdentifier, buildingExternalIdentifier: buildingExternalIdentifier, animationType: self.getAnimationTypeFromInt(value: animationType)) { error in
                 completion(self.getErrorStringFromMapWidgetError(error: error))
             }
             self.presentMapWidgetIfNotPresented()
@@ -232,7 +235,7 @@ import PointrKit
     func showLevel(siteExternalIdentifier: String, buildingExternalIdentifier: String, levelIndex: Int, animationType:Int, completion: @escaping (String?) -> Void) {
         func showLevelWithCompletion(completion: @escaping (String?) -> Void) {
             self.initializeMapWidget()
-            self.viewController!.showLevel(siteExternalIdentifier: siteExternalIdentifier, buildingExternalIdentifier: buildingExternalIdentifier, levelIndex: levelIndex, animationType: self.getAnimationTypeFromInt(value: animationType)) { error in
+            self.ptrMapWidget!.showLevel(siteExternalIdentifier: siteExternalIdentifier, buildingExternalIdentifier: buildingExternalIdentifier, levelIndex: levelIndex, animationType: self.getAnimationTypeFromInt(value: animationType)) { error in
                 completion(self.getErrorStringFromMapWidgetError(error: error))
             }
             self.presentMapWidgetIfNotPresented()
@@ -254,7 +257,7 @@ import PointrKit
     func showPoiDetails(siteExternalIdentifier id: String, poiExternalIdentifier: String, animationType:Int, completion: @escaping (String?) -> Void) {
         func showPoiDetailsWithCompletion(completion: @escaping (String?) -> Void) {
             self.initializeMapWidget()
-            self.viewController!.showPoiDetails(siteExternalIdentifier: id, poiExternalIdentifier: poiExternalIdentifier, animationType: self.getAnimationTypeFromInt(value: animationType)) { error in
+            self.ptrMapWidget!.showPoiDetails(siteExternalIdentifier: id, poiExternalIdentifier: poiExternalIdentifier, animationType: self.getAnimationTypeFromInt(value: animationType)) { error in
                 completion(self.getErrorStringFromMapWidgetError(error: error))
             }
             self.presentMapWidgetIfNotPresented()
@@ -276,7 +279,7 @@ import PointrKit
     func showPathFindingToPoi(siteExternalIdentifier id: String, poiExternalIdentifier: String, animationType:Int, completion: @escaping (String?) -> Void) {
         func showPathFindingToPoiWithCompletion(completion: @escaping (String?) -> Void) {
             self.initializeMapWidget()
-            self.viewController!.showPathFinding(siteExternalIdentifier: id, poiExternalIdentifier: poiExternalIdentifier, animationType: self.getAnimationTypeFromInt(value: animationType)) { error in
+            self.ptrMapWidget!.showPathFinding(siteExternalIdentifier: id, poiExternalIdentifier: poiExternalIdentifier, animationType: self.getAnimationTypeFromInt(value: animationType)) { error in
                 completion(self.getErrorStringFromMapWidgetError(error: error))
             }
             self.presentMapWidgetIfNotPresented()
@@ -347,16 +350,16 @@ import PointrKit
             DispatchQueue.main.async {
                 self.initializeMapWidget()
                 self.presentMapWidgetIfNotPresented()
-                self.viewController!.showLevel(fromLevel, animationType: self.getAnimationTypeFromInt(value: animationType)) { error in
+                self.ptrMapWidget!.showLevel(fromLevel, animationType: self.getAnimationTypeFromInt(value: animationType)) { error in
                     if let e = error {
                         completion(self.getErrorStringFromMapWidgetError(error: e))
                         return
                     }
                     let layer = PTRMapSymbolLayer(identifier: UUID().uuidString)
-                    self.viewController?.mapViewController.addLayer(layer)
-                    self.viewController?.mapViewController.addFeatures([to, from], toLayer: layer.identifier)
-                    self.viewController?.mapViewController.zoomToCoordinate(to.coordinate)
-                    self.viewController?.mapViewController.currentPath = path
+                    self.ptrMapWidget?.mapViewController.addLayer(layer)
+                    self.ptrMapWidget?.mapViewController.addFeatures([to, from], toLayer: layer.identifier)
+                    self.ptrMapWidget?.mapViewController.zoomToCoordinate(to.coordinate)
+                    self.ptrMapWidget?.mapViewController.currentPath = path
                     completion(nil)
                 }
             }
@@ -410,15 +413,15 @@ import PointrKit
     }
     
     func initializeMapWidget() {
-        if self.viewController != nil { return }
+        if self.ptrMapWidget != nil { return }
         waitForThemeManager()
-        self.viewController = PTRMapWidgetViewController(configuration: getMapWidgetConfiguration())
-        self.viewController?.exitButton?.addListener(self)
-        self.viewController?.mapViewController.addListener(self)
+        self.ptrMapWidget = PTRMapWidgetViewController(configuration: getMapWidgetConfiguration())
+        self.ptrMapWidget?.exitButton?.addListener(self)
+        self.ptrMapWidget?.mapViewController.addListener(self)
     }
     
     func presentMapWidgetIfNotPresented() {
-        guard let viewController = viewController else {
+        guard let viewController = ptrMapWidget else {
             return
         }
         if viewController.view.window != nil {
@@ -494,7 +497,7 @@ import PointrKit
         }
     }
     
-    func getPointrStateStringFromPointrState(state: PointrState) -> String {
+    @objc static func getPointrStateStringFromPointrState(state: PointrState) -> String {
         switch state {
         case .running:
             return "running"
@@ -537,19 +540,10 @@ extension PointrApp: PTRPositionManagerDelegate {
     }
 }
 
-extension PointrApp: PointrStateChangeListener {
-    public func pointrStateDidChange(to state: PointrState) {
-        if state.rawValue <= 0 || state == .running {
-            Pointr.shared.removeListener(self)
-            dispatchGroup.leave()
-        }
-    }
-}
-
 extension PointrApp: PTRExitButtonEventsListener {
     public func exitButtonDidTap(_ exitbutton: PointrKit.PTRMapWidgetExitButton) {
-        self.viewController?.view.removeFromSuperview()
-        self.viewController = nil
+        self.ptrMapWidget?.view.removeFromSuperview()
+        self.ptrMapWidget = nil
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-pointr",
-  "version": "8.14.3",
+  "version": "8.15.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", "~> 8"
+  s.dependency 'PointrKit', '8.15.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

@@ -7,7 +7,10 @@ export enum PTRCommandType {
     LEVEL = "level",
     POI = "poi",
     PATH = "path",
-    STATIC_PATH = "staticPath"
+    STATIC_PATH = "staticPath",
+    MARK_MY_CAR_LEVEL = "markMyCarForLevel",
+    MARK_MY_CAR_SITE = "markMyCarForSite",
+    MY_CAR_SITE = "myCarForSite"
 }
 /**
  * Base class for all Pointr SDK commands
@@ -76,4 +79,41 @@ export class PTRStaticPathCommand extends PTRCommand {
     constructor(public site: string, public fromPoi: string, public toPoi: string) {
         super(PTRCommandType.STATIC_PATH);
     }
+}
+
+/**
+ * Command to show mark my car details
+ * @param site - the site to show mark my car details
+ * @param building - the building to show mark my car details
+ * @param level - the level to show mark my car details
+ * @param shouldShowPopup - flag to show popup or not
+ * @param animationType - animation type to show map loading
+ */
+export class PTRMarkMyCarLevelCommand extends PTRCommand {
+    constructor(public site: string, public building: string, public level: number, public shouldShowPopup: boolean = true, public animationType: number = 1) {
+        super(PTRCommandType.MARK_MY_CAR_LEVEL);
+    }
+}
+
+/**
+ * Command to show mark my car details
+ * @param site - the site to show mark my car details
+ * @param shouldShowPopup - flag to show popup or not
+ * @param animationType - animation type to show map loading
+ */
+export class PTRMarkMyCarSiteCommand extends PTRCommand {
+    constructor(public site: string, public shouldShowPopup: boolean = true, public animationType: number = 1) {
+        super(PTRCommandType.MARK_MY_CAR_SITE);
+    }
+}
+
+/**
+ * Command to show my car details
+ * @param site - the site to show my car details
+ * @param animationType - animation type to show map loading
+ */
+export class PTRMyCarSiteCommand extends PTRCommand {
+    constructor(public site: string, public animationType: number = 1) {
+        super(PTRCommandType.MY_CAR_SITE);
+    }
 }

package/src/PTRMapWidgetUtils.ts

@@ -1,5 +1,5 @@
 import { UIManager } from 'react-native';
-import { PTRSiteCommand, PTRBuildingCommand, PTRLevelCommand, PTRPoiCommand, PTRPathCommand, PTRStaticPathCommand, PTRCommand, PTRCommandType } from 'react-native-pointr/src/PTRCommand';
+import { PTRSiteCommand, PTRBuildingCommand, PTRLevelCommand, PTRPoiCommand, PTRPathCommand, PTRStaticPathCommand, PTRCommand, PTRCommandType, PTRMarkMyCarLevelCommand, PTRMarkMyCarSiteCommand, PTRMyCarSiteCommand } from 'react-native-pointr/src/PTRCommand';
 /**
  * Show the map widget with the given command
  * @param reactTag view tag of the map widget
@@ -62,5 +62,32 @@ export const showMapWidget = (reactTag: number, ptrCommand: PTRCommand) => {
       );
       break;
     }
+    case PTRCommandType.MARK_MY_CAR_LEVEL: {
+      const markMyCarCommand = ptrCommand as PTRMarkMyCarLevelCommand;
+      UIManager.dispatchViewManagerCommand(
+        reactTag,
+        ptrCommand.type,
+        [markMyCarCommand.site, markMyCarCommand.building, markMyCarCommand.level, markMyCarCommand.shouldShowPopup, markMyCarCommand.animationType],
+      );
+      break;
+    }
+    case PTRCommandType.MARK_MY_CAR_SITE: {
+      const markMyCarCommand = ptrCommand as PTRMarkMyCarSiteCommand;
+      UIManager.dispatchViewManagerCommand(
+        reactTag,
+        ptrCommand.type,
+        [markMyCarCommand.site, markMyCarCommand.shouldShowPopup, markMyCarCommand.animationType],
+      );
+      break;
+    }
+    case PTRCommandType.MY_CAR_SITE: {
+      const myCarCommand = ptrCommand as PTRMyCarSiteCommand;
+      UIManager.dispatchViewManagerCommand(
+        reactTag,
+        ptrCommand.type,
+        [myCarCommand.site, myCarCommand.animationType],
+      );
+      break;
+    }
   }
 }