Fix location permissions ask, add delay for map to load

1 files changed, 7 insertions, 1 deletions

diff --git a/ios/app/MBXViewController.mm b/ios/app/MBXViewController.mm
index 99c207d24d..af25fa4dc5 100644
--- a/ios/app/MBXViewController.mm
+++ b/ios/app/MBXViewController.mm
@@ -49,7 +49,6 @@ mbgl::Settings_NSUserDefaults *settings = nullptr;
 
     self.mapView = [[MGLMapView alloc] initWithFrame:self.view.bounds];
     self.mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-    self.mapView.showsUserLocation = YES;
     self.mapView.delegate = self;
     [self.view addSubview:self.mapView];
 
@@ -76,6 +75,13 @@ mbgl::Settings_NSUserDefaults *settings = nullptr;
 
     settings = new mbgl::Settings_NSUserDefaults();
     [self restoreState:nil];
+
+    if ( ! settings->showsUserLocation)
+    {
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 2 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+            self.mapView.showsUserLocation = YES;
+        });
+    }
 }
 
 - (void)saveState:(__unused NSNotification *)notification