Merge branch 'master' into android-docs-automation

1 files changed, 2 insertions, 7 deletions

diff --git a/platform/ios/app/MBXState.m b/platform/ios/app/MBXState.m
index 0365306637..455961e88a 100644
--- a/platform/ios/app/MBXState.m
+++ b/platform/ios/app/MBXState.m
@@ -6,7 +6,6 @@ NSString *const MBXShowsUserLocation = @"MBXShowsUserLocation";
 NSString *const MBXDebugMaskValue = @"MBXDebugMaskValue";
 NSString *const MBXShowsZoomLevelOrnament =  @"MBXShowsZoomLevelOrnament";
 NSString *const MBXShowsTimeFrameGraph = @"MBXShowsFrameTimeGraph";
-NSString *const MBXDebugLoggingEnabled = @"MGLMapboxMetricsDebugLoggingEnabled";
 NSString *const MBXShowsMapScale = @"MBXMapShowsScale";
 NSString *const MBXMapShowsHeadingIndicator = @"MBXMapShowsHeadingIndicator";
 NSString *const MBXMapFramerateMeasurementEnabled = @"MBXMapFramerateMeasurementEnabled";
@@ -26,7 +25,6 @@ NSString *const MBXReuseQueueStatsEnabled = @"MBXReuseQueueStatsEnabled";
     [coder encodeObject:[NSNumber numberWithUnsignedInteger:_debugMask] forKey:MBXDebugMaskValue];
     [coder encodeBool:_showsZoomLevelOrnament forKey:MBXShowsZoomLevelOrnament];
     [coder encodeBool:_showsTimeFrameGraph forKey:MBXShowsTimeFrameGraph];
-    [coder encodeBool:_debugLoggingEnabled forKey:MBXDebugLoggingEnabled];
     [coder encodeBool:_showsMapScale forKey:MBXShowsMapScale];
     [coder encodeBool:_showsUserHeadingIndicator forKey:MBXMapShowsHeadingIndicator];
     [coder encodeBool:_framerateMeasurementEnabled forKey:MBXMapFramerateMeasurementEnabled];
@@ -41,7 +39,6 @@ NSString *const MBXReuseQueueStatsEnabled = @"MBXReuseQueueStatsEnabled";
         NSNumber *decodedDebugMaskOptions = [decoder decodeObjectForKey:MBXDebugMaskValue];
         BOOL decodedZoomLevelOrnament = [decoder decodeBoolForKey:MBXShowsZoomLevelOrnament];
         BOOL decodedShowsTimeFrameGraph = [decoder decodeBoolForKey:MBXShowsTimeFrameGraph];
-        BOOL decodedDebugLoggingEnabled = [decoder decodeBoolForKey:MBXDebugLoggingEnabled];
         BOOL decodedShowsMapScale = [decoder decodeBoolForKey:MBXShowsMapScale];
         BOOL decodedShowsUserHeadingIndicator = [decoder decodeBoolForKey:MBXMapShowsHeadingIndicator];
         BOOL decodedFramerateMeasurementEnabled = [decoder decodeBoolForKey:MBXMapFramerateMeasurementEnabled];
@@ -53,7 +50,6 @@ NSString *const MBXReuseQueueStatsEnabled = @"MBXReuseQueueStatsEnabled";
         _debugMask = decodedDebugMaskOptions.intValue;
         _showsZoomLevelOrnament = decodedZoomLevelOrnament;
         _showsTimeFrameGraph = decodedShowsTimeFrameGraph;
-        _debugLoggingEnabled = decodedDebugLoggingEnabled;
         _showsMapScale = decodedShowsMapScale;
         _showsUserHeadingIndicator = decodedShowsUserHeadingIndicator;
         _framerateMeasurementEnabled = decodedFramerateMeasurementEnabled;
@@ -67,15 +63,14 @@ NSString *const MBXReuseQueueStatsEnabled = @"MBXReuseQueueStatsEnabled";
     return YES;
 }
 
-- (NSString*) debugDescription {
-    return [NSString stringWithFormat:@"Camera: %@\nTracking mode: %lu\nShows user location: %@\nDebug mask value: %lu\nShows zoom level ornament: %@\nShows time frame graph: %@\nDebug logging enabled: %@\nShows map scale: %@\nShows user heading indicator: %@\nFramerate measurement enabled: %@\nReuse queue stats enabled: %@",
+- (NSString *)debugDescription {
+    return [NSString stringWithFormat:@"Camera: %@\nTracking mode: %lu\nShows user location: %@\nDebug mask value: %lu\nShows zoom level ornament: %@\nShows time frame graph: %@\nShows map scale: %@\nShows user heading indicator: %@\nFramerate measurement enabled: %@\nReuse queue stats enabled: %@",
             self.camera,
             (unsigned long)self.userTrackingMode,
             self.showsUserLocation ? @"YES" : @"NO",
             (unsigned long)self.debugMask,
             self.showsZoomLevelOrnament ? @"YES" : @"NO",
             self.showsTimeFrameGraph ? @"YES" : @"NO",
-            self.debugLoggingEnabled ? @"YES" : @"NO",
             self.showsMapScale ? @"YES" : @"NO",
             self.showsUserHeadingIndicator ? @"YES" : @"NO",
             self.framerateMeasurementEnabled ? @"YES" : @"NO",