Debug checkpoint for _property

5 files changed, 73 insertions, 83 deletions

diff --git a/platform/ios/app/MBXState.h b/platform/ios/app/MBXState.h
index fc9000da27..f174c0383b 100644
--- a/platform/ios/app/MBXState.h
+++ b/platform/ios/app/MBXState.h
@@ -15,18 +15,13 @@ FOUNDATION_EXTERN NSString *const MBXShowsTimeFrameGraph;
 @property (nonatomic, nullable) NSMutableDictionary *state;
 
 @property (nonatomic, nullable) MGLMapCamera *camera;
-@property (nonatomic) NSInteger userTrackingMode;
+@property (nonatomic) MGLUserTrackingMode userTrackingMode;
 @property (nonatomic) BOOL showsUserLocation;
-@property (nonatomic) NSInteger debugMask;
+@property (nonatomic) MGLMapDebugMaskOptions debugMask;
 @property (nonatomic) BOOL showsZoomLevelHUD;
 @property (nonatomic) BOOL showsTimeFrameGraph;
 
-- (void)saveMapCameraState:(MGLMapCamera *)camera;
-- (void)saveUserTrackingModeState:(NSInteger)trackingMode;
-- (void)saveShowsUserLocationState:(BOOL)showUserLocation;
-- (void)saveDebugMaskState:(NSInteger)debugMask;
-- (void)saveZoomLevelHUDState:(BOOL)showsZoomLevelHUD;
-- (void)saveDisplayTimeFrameGraphState:(BOOL)displayTimeFramGraphState;
+@property (nonatomic, strong) NSObject *test;
 
 @end
 
diff --git a/platform/ios/app/MBXState.m b/platform/ios/app/MBXState.m
index 232b2833f4..d576a29ade 100644
--- a/platform/ios/app/MBXState.m
+++ b/platform/ios/app/MBXState.m
@@ -7,11 +7,10 @@ NSString *const MBXDebugMask = @"MBXDebugMask";
 NSString *const MBXShowsZoomLevelHUD =  @"MBXShowsZoomLevelHUD";
 NSString *const MBXShowsTimeFrameGraph = @"MBXShowsFrameTimeGraph";
 
-
 @implementation MBXState
 
 - (instancetype) init {
-    if ((self = super.self)) {
+    if (self = [super init]) {
         NSMutableDictionary *dictionary = [NSMutableDictionary dictionaryWithObjectsAndKeys: @"", MBXCamera,
             @"", MBXUserTrackingMode,
             @"", MBXShowsUserLocation,
@@ -25,53 +24,77 @@ NSString *const MBXShowsTimeFrameGraph = @"MBXShowsFrameTimeGraph";
     return self;
 }
 
-- (void)saveMapCameraState:(MGLMapCamera *)camera {
-    _camera = camera;
+- (void) setCamera:(MGLMapCamera *)camera {
+    self.camera = camera;
+}
+
+- (MGLMapCamera*)camera {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSData *archivedCamera = [NSKeyedArchiver archivedDataWithRootObject:camera];
-    [self.state setValue:camera forKey:@"MBXCamera"];
-    [defaults setObject:archivedCamera forKey:@"MBXCamera"];
-    [defaults synchronize];
+    NSData *archivedCamera = [defaults objectForKey:@"MBXCamera"];
+    MGLMapCamera *unarchivedCamera = archivedCamera ? [NSKeyedUnarchiver unarchiveObjectWithData:archivedCamera] : nil;
+    return unarchivedCamera;
+}
+
+-(void)setTest:(NSObject *)test {
+    _test = test;
 }
 
-- (void)saveUserTrackingModeState:(NSInteger)trackingMode; {
-    _userTrackingMode = trackingMode;
+- (void)setUserTrackingMode:(MGLUserTrackingMode)userTrackingMode {
+     _userTrackingMode = userTrackingMode;
+}
+
+- (MGLUserTrackingMode)userTrackingMode {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    [self.state setValue:@(trackingMode) forKey:@"MBXUserTrackingMode"];
-    [defaults setInteger:trackingMode forKey:@"MBXUserTrackingMode"];
-    [defaults synchronize];
+    MGLUserTrackingMode uncheckedTrackingMode = [defaults integerForKey:@"MBXUserTrackingMode"];
+
+    if (uncheckedTrackingMode >= 0 &&
+        (MGLUserTrackingMode)uncheckedTrackingMode >= MGLUserTrackingModeNone &&
+        (MGLUserTrackingMode)uncheckedTrackingMode <= MGLUserTrackingModeFollowWithCourse)
+    {
+        return uncheckedTrackingMode;
+    }
+
+    return 0;
+}
+
+- (void)setShowsUserLocation:(BOOL)showsUserLocation {
+    self.showsUserLocation = showsUserLocation;
 }
 
-- (void)saveShowsUserLocationState:(BOOL)showUserLocation {
-    _showsUserLocation = showUserLocation;
+- (BOOL)showsUserLocation {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    [self.state setValue:@(showUserLocation) forKey:@"MBXShowsUserLocation"];
-    [defaults setBool:showUserLocation forKey:@"MBXShowsUserLocation"];
-    [defaults synchronize];
+    NSInteger showsUserLocation = [defaults integerForKey:@"MBXShowsUserLocation"];
+    return showsUserLocation;
+}
+
+- (void)setDebugMask:(MGLMapDebugMaskOptions)debugMask {
+    self.debugMask = debugMask;
 }
 
-- (void)saveDebugMaskState:(NSInteger)debugMask {
-    _debugMask = debugMask;
+- (MGLMapDebugMaskOptions)debugMask {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    [self.state setValue:@(debugMask) forKey:@"MBXDebugMask"];
-    [defaults setInteger:debugMask forKey:@"MBXDebugMask"];
-    [defaults synchronize];
+    NSInteger debugMask = [defaults integerForKey:@"MBXDebugMask"];
+    return debugMask;
 }
 
-- (void)saveZoomLevelHUDState:(BOOL)showsZoomLevelHUD {
-    _showsZoomLevelHUD = showsZoomLevelHUD;
+- (void)setShowsZoomLevelHUD:(BOOL)showsZoomLevelHUD {
+    self.showsZoomLevelHUD = showsZoomLevelHUD;
+}
+
+-(BOOL)showsZoomLevelHUD {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    [self.state setValue:@(showsZoomLevelHUD) forKey:@"MBXShowsZoomLevelHUD"];
-    [defaults setBool:showsZoomLevelHUD forKey:@"MBXShowsZoomLevelHUD"];
-    [defaults synchronize];
+    BOOL showsZoomLevelHUD = [defaults integerForKey:@"MBXShowsZoomLevelHUD"];
+    return showsZoomLevelHUD;
+}
+
+-(void)setShowsTimeFrameGraph:(BOOL)showsTimeFrameGraph {
+    self.showsTimeFrameGraph = showsTimeFrameGraph;
 }
 
-- (void)saveDisplayTimeFrameGraphState:(BOOL)displayTimeFramGraphState {
-    _showsTimeFrameGraph = displayTimeFramGraphState;
+-(BOOL)showsTimeFrameGraph {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    [self.state setValue:@(displayTimeFramGraphState) forKey:@"MBXShowsFrameTimeGraph"];
-    [defaults setBool:displayTimeFramGraphState forKey:@"MBXShowsFrameTimeGraph"];
-    [defaults synchronize];
+    BOOL showsTimeFrameGraph = [defaults integerForKey:@"MBXShowsTimeFrameGraph"];
+    return showsTimeFrameGraph;
 }
 
 @end
diff --git a/platform/ios/app/MBXStateManager.h b/platform/ios/app/MBXStateManager.h
index 757f182f84..229695ae10 100644
--- a/platform/ios/app/MBXStateManager.h
+++ b/platform/ios/app/MBXStateManager.h
@@ -9,7 +9,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (instancetype) sharedManager;
 
-- (void)saveState:(MBXState*)state forKey:(NSObject*)key;
+- (void)saveState:(MBXState*)state;
 
 - (void)restoreState;
 
diff --git a/platform/ios/app/MBXStateManager.m b/platform/ios/app/MBXStateManager.m
index bd37ffe8b4..f6117c612f 100644
--- a/platform/ios/app/MBXStateManager.m
+++ b/platform/ios/app/MBXStateManager.m
@@ -18,12 +18,11 @@
     return _currentState;
 }
 
-- (void)saveState:(MBXState*)state forKey:(NSObject*)key {
+- (void)saveState:(MBXState*)state {
 
 }
 
 -(void)restoreState {
-    // Load from NSUserDefaults
 }
 
 -(void)resetState {
diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m
index da44cc3715..0af43ebd93 100644
--- a/platform/ios/app/MBXViewController.m
+++ b/platform/ios/app/MBXViewController.m
@@ -172,15 +172,20 @@ CLLocationCoordinate2D randomWorldCoordinate() {
 - (void)viewDidLoad
 {
     [super viewDidLoad];
+    MBXState *test = [[MBXState alloc] init];
+    test.userTrackingMode = MGLUserTrackingModeNone;
 
-    [[MBXStateManager sharedManager].currentState saveDebugMaskState:NO];
-    [[MBXStateManager sharedManager].currentState saveUserTrackingModeState:MGLUserTrackingModeNone];
-    [[MBXStateManager sharedManager].currentState saveShowsUserLocationState:NO];
+//    MBXState *currentState = [MBXStateManager sharedManager].currentState;
+//
+//    currentState.debugMask = MGLMapDebugTileBoundariesMask;
+    
+//    [MBXStateManager sharedManager].currentState.userTrackingMode = NO;
+    [MBXStateManager sharedManager].currentState.showsUserLocation = NO;
 
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(saveState:) name:UIApplicationDidEnterBackgroundNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(saveState:) name:UIApplicationWillTerminateNotification object:nil];
 
-    [self restoreState:[MBXStateManager sharedManager].currentState];
+    // Restore state here
 
     self.debugLoggingEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:@"MGLMapboxMetricsDebugLoggingEnabled"];
 
@@ -226,38 +231,6 @@ CLLocationCoordinate2D randomWorldCoordinate() {
     }];
 }
 
-- (void)saveState:(__unused NSNotification *)notification
-{
-    MBXState *currentState = [MBXStateManager sharedManager].currentState;
-    [currentState saveMapCameraState:self.mapView.camera];
-    [currentState saveShowsUserLocationState:self.mapView.showsUserLocation];
-    [currentState saveUserTrackingModeState:self.mapView.userTrackingMode];
-    [currentState saveDebugMaskState:self.mapView.debugMask];
-    [currentState saveZoomLevelHUDState:self.mapInfoHUDEnabled];
-    [currentState saveDisplayTimeFrameGraphState:self.frameTimeGraphEnabled];
-}
-
-- (void)restoreState:(MBXState*)state
-{
-    if (state.camera)
-    {
-        self.mapView.camera = state.camera;
-    }
-
-    self.mapView.showsUserLocation = state.showsUserLocation;
-    self.mapView.userTrackingMode = state.userTrackingMode;
-    self.mapView.debugMask = state.debugMask;
-    self.mapInfoHUDEnabled = state.showsZoomLevelHUD;
-
-    [self updateHUD];
-
-    if (state.showsTimeFrameGraph == YES)
-    {
-        self.frameTimeGraphEnabled = YES;
-        self.frameTimeGraphView.hidden = NO;
-    }
-}
-
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations
 {
     return UIInterfaceOrientationMaskAll;
@@ -407,7 +380,7 @@ CLLocationCoordinate2D randomWorldCoordinate() {
                     self.mapInfoHUDEnabled = !self.mapInfoHUDEnabled;
                     self.hudLabel.hidden = !self.mapInfoHUDEnabled;
 
-                    [[MBXStateManager sharedManager].currentState saveZoomLevelHUDState:self.mapInfoHUDEnabled];
+//                    [MBXStateManager sharedManager].currentState.showsZoomLevelHUD:self.mapInfoHUDEnabled;
 
                     self.reuseQueueStatsEnabled = NO;
                     [self updateHUD];
@@ -417,7 +390,7 @@ CLLocationCoordinate2D randomWorldCoordinate() {
                 {
                     self.frameTimeGraphEnabled = !self.frameTimeGraphEnabled;
                     self.frameTimeGraphView.hidden = !self.frameTimeGraphEnabled;
-                    [[MBXStateManager sharedManager].currentState saveDisplayTimeFrameGraphState:self.frameTimeGraphEnabled];
+//                    [[MBXStateManager sharedManager].currentState.showsTimeFrameGraph:self.frameTimeGraphEnabled];
                     break;
                 }
                 case MBXSettingsDebugToolsShowReuseQueueStats:
@@ -425,7 +398,7 @@ CLLocationCoordinate2D randomWorldCoordinate() {
                     self.reuseQueueStatsEnabled = !self.reuseQueueStatsEnabled;
                     self.hudLabel.hidden = !self.reuseQueueStatsEnabled;
                     self.mapInfoHUDEnabled = NO;
-                    [[MBXStateManager sharedManager].currentState saveZoomLevelHUDState:self.mapInfoHUDEnabled];
+//                    [[MBXStateManager sharedManager].currentState.showsZoomLevelHUD:self.mapInfoHUDEnabled];
                     break;
                 }
                 default: