From c8fbcfd322e1af4520f0bdc7e5945f6ffd3b4b73 Mon Sep 17 00:00:00 2001 From: Fabian Guerra Soto Date: Wed, 14 Nov 2018 15:42:18 -0800 Subject: [ios, macos] Logging. (#13235) * [ios, macos] Update the logging subsystem to platform agnostic. * [ios, macos] Add coordinate to string function. * [ios, macos] Add BOOL to string function. * [ios, macos] Add tracing logs. * [ios, macos] Add tracing logs to generated style classes. * [ios, macos] Split logging categories accordingly to MGLLoggingLevel. * [ios, macos] Log network requests. * [ios, macos] Migrate NSAssert to MGLAssert. * [ios, macos] Include MGLLoggingConfiguration to filesource-files.txt. * [ios, macos] Fix logger string specifier for the line parameter. * [ios, macos] Add logs to shapes classes. * [ios, macos] Add logs to offline classes. * [ios, macos] Add logs to annotation classes. * [ios, macos] Add logs to foundation classes. * [ios, macos] Fix snapshotter size logging. * [macos] Add logs to map view. * [ios, macos] Fix string from boolean prefix, add custom function for NSCAssert. * Log size test * [ios, macos] Add logging conditional compilation flag. * [ios, macos] Rename function NSStringFromMGLTransition to MGLStringFromMGLTransition. * [ios, macos] Remove verbose logging for release builds. * [ios, macos] Rename NSStringFromCLLocationCoordinate2D to MGLStringFromCLLocationCoordinate2D. * [ios, macos] Clean unnecesary blank lines in MGLLight.mm set methods. * [ios, macos] Fix logging grammar, format, function names. * [ios, macos] Remove compilation flag, rename flags. --- platform/darwin/src/MGLRasterStyleLayer.mm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'platform/darwin/src/MGLRasterStyleLayer.mm') diff --git a/platform/darwin/src/MGLRasterStyleLayer.mm b/platform/darwin/src/MGLRasterStyleLayer.mm index c87355b04d..7416400b2e 100644 --- a/platform/darwin/src/MGLRasterStyleLayer.mm +++ b/platform/darwin/src/MGLRasterStyleLayer.mm @@ -7,6 +7,7 @@ #import "MGLStyleLayer_Private.h" #import "MGLStyleValue_Private.h" #import "MGLRasterStyleLayer.h" +#import "MGLLoggingConfiguration_Private.h" #include #include @@ -30,6 +31,7 @@ namespace mbgl { - (instancetype)initWithIdentifier:(NSString *)identifier source:(MGLSource *)source { + MGLLogDebug(@"Initializing %@ with identifier: %@ source: %@", NSStringFromClass([self class]), identifier, source); auto layer = std::make_unique(identifier.UTF8String, source.identifier.UTF8String); return self = [super initWithPendingLayer:std::move(layer)]; } @@ -50,6 +52,7 @@ namespace mbgl { - (void)setMaximumRasterBrightness:(NSExpression *)maximumRasterBrightness { MGLAssertStyleLayerIsValid(); + MGLLogDebug(@"Setting maximumRasterBrightness: %@", maximumRasterBrightness); auto mbglValue = MGLStyleValueTransformer().toPropertyValue>(maximumRasterBrightness, false); self.rawLayer->setRasterBrightnessMax(mbglValue); @@ -67,6 +70,7 @@ namespace mbgl { - (void)setMaximumRasterBrightnessTransition:(MGLTransition )transition { MGLAssertStyleLayerIsValid(); + MGLLogDebug(@"Setting maximumRasterBrightnessTransition: %@", MGLStringFromMGLTransition(transition)); mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; self.rawLayer->setRasterBrightnessMaxTransition(options); @@ -92,6 +96,7 @@ namespace mbgl { - (void)setMinimumRasterBrightness:(NSExpression *)minimumRasterBrightness { MGLAssertStyleLayerIsValid(); + MGLLogDebug(@"Setting minimumRasterBrightness: %@", minimumRasterBrightness); auto mbglValue = MGLStyleValueTransformer().toPropertyValue>(minimumRasterBrightness, false); self.rawLayer->setRasterBrightnessMin(mbglValue); @@ -109,6 +114,7 @@ namespace mbgl { - (void)setMinimumRasterBrightnessTransition:(MGLTransition )transition { MGLAssertStyleLayerIsValid(); + MGLLogDebug(@"Setting minimumRasterBrightnessTransition: %@", MGLStringFromMGLTransition(transition)); mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; self.rawLayer->setRasterBrightnessMinTransition(options); @@ -134,6 +140,7 @@ namespace mbgl { - (void)setRasterContrast:(NSExpression *)rasterContrast { MGLAssertStyleLayerIsValid(); + MGLLogDebug(@"Setting rasterContrast: %@", rasterContrast); auto mbglValue = MGLStyleValueTransformer().toPropertyValue>(rasterContrast, false); self.rawLayer->setRasterContrast(mbglValue); @@ -151,6 +158,7 @@ namespace mbgl { - (void)setRasterContrastTransition:(MGLTransition )transition { MGLAssertStyleLayerIsValid(); + MGLLogDebug(@"Setting rasterContrastTransition: %@", MGLStringFromMGLTransition(transition)); mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; self.rawLayer->setRasterContrastTransition(options); @@ -169,6 +177,7 @@ namespace mbgl { - (void)setRasterFadeDuration:(NSExpression *)rasterFadeDuration { MGLAssertStyleLayerIsValid(); + MGLLogDebug(@"Setting rasterFadeDuration: %@", rasterFadeDuration); auto mbglValue = MGLStyleValueTransformer().toPropertyValue>(rasterFadeDuration, false); self.rawLayer->setRasterFadeDuration(mbglValue); @@ -186,6 +195,7 @@ namespace mbgl { - (void)setRasterHueRotation:(NSExpression *)rasterHueRotation { MGLAssertStyleLayerIsValid(); + MGLLogDebug(@"Setting rasterHueRotation: %@", rasterHueRotation); auto mbglValue = MGLStyleValueTransformer().toPropertyValue>(rasterHueRotation, false); self.rawLayer->setRasterHueRotate(mbglValue); @@ -203,6 +213,7 @@ namespace mbgl { - (void)setRasterHueRotationTransition:(MGLTransition )transition { MGLAssertStyleLayerIsValid(); + MGLLogDebug(@"Setting rasterHueRotationTransition: %@", MGLStringFromMGLTransition(transition)); mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; self.rawLayer->setRasterHueRotateTransition(options); @@ -228,6 +239,7 @@ namespace mbgl { - (void)setRasterOpacity:(NSExpression *)rasterOpacity { MGLAssertStyleLayerIsValid(); + MGLLogDebug(@"Setting rasterOpacity: %@", rasterOpacity); auto mbglValue = MGLStyleValueTransformer().toPropertyValue>(rasterOpacity, false); self.rawLayer->setRasterOpacity(mbglValue); @@ -245,6 +257,7 @@ namespace mbgl { - (void)setRasterOpacityTransition:(MGLTransition )transition { MGLAssertStyleLayerIsValid(); + MGLLogDebug(@"Setting rasterOpacityTransition: %@", MGLStringFromMGLTransition(transition)); mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; self.rawLayer->setRasterOpacityTransition(options); @@ -263,6 +276,7 @@ namespace mbgl { - (void)setRasterResamplingMode:(NSExpression *)rasterResamplingMode { MGLAssertStyleLayerIsValid(); + MGLLogDebug(@"Setting rasterResamplingMode: %@", rasterResamplingMode); auto mbglValue = MGLStyleValueTransformer().toPropertyValue>(rasterResamplingMode, false); self.rawLayer->setRasterResampling(mbglValue); @@ -287,6 +301,7 @@ namespace mbgl { - (void)setRasterSaturation:(NSExpression *)rasterSaturation { MGLAssertStyleLayerIsValid(); + MGLLogDebug(@"Setting rasterSaturation: %@", rasterSaturation); auto mbglValue = MGLStyleValueTransformer().toPropertyValue>(rasterSaturation, false); self.rawLayer->setRasterSaturation(mbglValue); @@ -304,6 +319,7 @@ namespace mbgl { - (void)setRasterSaturationTransition:(MGLTransition )transition { MGLAssertStyleLayerIsValid(); + MGLLogDebug(@"Setting rasterSaturationTransition: %@", MGLStringFromMGLTransition(transition)); mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; self.rawLayer->setRasterSaturationTransition(options); -- cgit v1.2.1