summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Guerra <fabian.guerra@mapbox.com>2018-10-31 15:02:17 -0700
committerFabian Guerra <fabian.guerra@mapbox.com>2018-11-13 15:56:40 -0800
commitd27ec49fb1f2369c463615aeb1191f7c7ef6e97e (patch)
treee31ecb8a8f4461de1a10ad66734621db79c7d1aa
parent37c7d6ad87b2558cc3d916d6c21826cf13e59db9 (diff)
downloadqtlocation-mapboxgl-d27ec49fb1f2369c463615aeb1191f7c7ef6e97e.tar.gz
[ios, macos] Add tracing logs to generated style classes.
-rw-r--r--platform/darwin/src/MGLBackgroundStyleLayer.mm8
-rw-r--r--platform/darwin/src/MGLCircleStyleLayer.mm23
-rw-r--r--platform/darwin/src/MGLFillExtrusionStyleLayer.mm17
-rw-r--r--platform/darwin/src/MGLFillStyleLayer.mm16
-rw-r--r--platform/darwin/src/MGLHeatmapStyleLayer.mm12
-rw-r--r--platform/darwin/src/MGLHillshadeStyleLayer.mm12
-rw-r--r--platform/darwin/src/MGLLight.mm43
-rw-r--r--platform/darwin/src/MGLLight.mm.ejs21
-rw-r--r--platform/darwin/src/MGLLineStyleLayer.mm28
-rw-r--r--platform/darwin/src/MGLRasterStyleLayer.mm16
-rw-r--r--platform/darwin/src/MGLStyleLayer.mm.ejs8
-rw-r--r--platform/darwin/src/MGLSymbolStyleLayer.mm67
-rw-r--r--platform/darwin/src/MGLTypes.h4
13 files changed, 275 insertions, 0 deletions
diff --git a/platform/darwin/src/MGLBackgroundStyleLayer.mm b/platform/darwin/src/MGLBackgroundStyleLayer.mm
index 890c485677..ffd44359ee 100644
--- a/platform/darwin/src/MGLBackgroundStyleLayer.mm
+++ b/platform/darwin/src/MGLBackgroundStyleLayer.mm
@@ -7,6 +7,7 @@
#import "MGLStyleLayer_Private.h"
#import "MGLStyleValue_Private.h"
#import "MGLBackgroundStyleLayer.h"
+#import "MGLLoggingConfiguration_Private.h"
#include <mbgl/style/transition_options.hpp>
#include <mbgl/style/layers/background_layer.hpp>
@@ -21,6 +22,7 @@
- (instancetype)initWithIdentifier:(NSString *)identifier
{
+ MGLLogDebug(@"Initializing %@ with identifier: %@", NSStringFromClass([self class]), identifier);
auto layer = std::make_unique<mbgl::style::BackgroundLayer>(identifier.UTF8String);
return self = [super initWithPendingLayer:std::move(layer)];
}
@@ -34,6 +36,7 @@
- (void)setBackgroundColor:(NSExpression *)backgroundColor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting backgroundColor: %@", backgroundColor);
auto mbglValue = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toPropertyValue<mbgl::style::PropertyValue<mbgl::Color>>(backgroundColor, false);
self.rawLayer->setBackgroundColor(mbglValue);
@@ -51,6 +54,7 @@
- (void)setBackgroundColorTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting backgroundColorTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setBackgroundColorTransition(options);
@@ -69,6 +73,7 @@
- (void)setBackgroundOpacity:(NSExpression *)backgroundOpacity {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting backgroundOpacity: %@", backgroundOpacity);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(backgroundOpacity, false);
self.rawLayer->setBackgroundOpacity(mbglValue);
@@ -86,6 +91,7 @@
- (void)setBackgroundOpacityTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting backgroundOpacityTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setBackgroundOpacityTransition(options);
@@ -104,6 +110,7 @@
- (void)setBackgroundPattern:(NSExpression *)backgroundPattern {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting backgroundPattern: %@", backgroundPattern);
auto mbglValue = MGLStyleValueTransformer<std::string, NSString *>().toPropertyValue<mbgl::style::PropertyValue<std::string>>(backgroundPattern, false);
self.rawLayer->setBackgroundPattern(mbglValue);
@@ -121,6 +128,7 @@
- (void)setBackgroundPatternTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting backgroundPatternTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setBackgroundPatternTransition(options);
diff --git a/platform/darwin/src/MGLCircleStyleLayer.mm b/platform/darwin/src/MGLCircleStyleLayer.mm
index a391d72e7f..f5e77d430d 100644
--- a/platform/darwin/src/MGLCircleStyleLayer.mm
+++ b/platform/darwin/src/MGLCircleStyleLayer.mm
@@ -7,6 +7,7 @@
#import "MGLStyleLayer_Private.h"
#import "MGLStyleValue_Private.h"
#import "MGLCircleStyleLayer.h"
+#import "MGLLoggingConfiguration_Private.h"
#include <mbgl/style/transition_options.hpp>
#include <mbgl/style/layers/circle_layer.hpp>
@@ -40,6 +41,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<mbgl::style::CircleLayer>(identifier.UTF8String, source.identifier.UTF8String);
return self = [super initWithPendingLayer:std::move(layer)];
}
@@ -67,6 +69,7 @@ namespace mbgl {
- (void)setSourceLayerIdentifier:(NSString *)sourceLayerIdentifier
{
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting sourceLayerIdentifier: %@", sourceLayerIdentifier);
self.rawLayer->setSourceLayer(sourceLayerIdentifier.UTF8String ?: "");
}
@@ -74,6 +77,7 @@ namespace mbgl {
- (void)setPredicate:(NSPredicate *)predicate
{
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting predicate: %@", predicate);
self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::Filter());
}
@@ -89,6 +93,7 @@ namespace mbgl {
- (void)setCircleBlur:(NSExpression *)circleBlur {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting circleBlur: %@", circleBlur);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(circleBlur, true);
self.rawLayer->setCircleBlur(mbglValue);
@@ -106,6 +111,7 @@ namespace mbgl {
- (void)setCircleBlurTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting circleBlurTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setCircleBlurTransition(options);
@@ -124,6 +130,7 @@ namespace mbgl {
- (void)setCircleColor:(NSExpression *)circleColor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting circleColor: %@", circleColor);
auto mbglValue = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toPropertyValue<mbgl::style::PropertyValue<mbgl::Color>>(circleColor, true);
self.rawLayer->setCircleColor(mbglValue);
@@ -141,6 +148,7 @@ namespace mbgl {
- (void)setCircleColorTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting circleColorTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setCircleColorTransition(options);
@@ -159,6 +167,7 @@ namespace mbgl {
- (void)setCircleOpacity:(NSExpression *)circleOpacity {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting circleOpacity: %@", circleOpacity);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(circleOpacity, true);
self.rawLayer->setCircleOpacity(mbglValue);
@@ -176,6 +185,7 @@ namespace mbgl {
- (void)setCircleOpacityTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting circleOpacityTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setCircleOpacityTransition(options);
@@ -194,6 +204,7 @@ namespace mbgl {
- (void)setCirclePitchAlignment:(NSExpression *)circlePitchAlignment {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting circlePitchAlignment: %@", circlePitchAlignment);
auto mbglValue = MGLStyleValueTransformer<mbgl::style::AlignmentType, NSValue *, mbgl::style::AlignmentType, MGLCirclePitchAlignment>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::AlignmentType>>(circlePitchAlignment, false);
self.rawLayer->setCirclePitchAlignment(mbglValue);
@@ -211,6 +222,7 @@ namespace mbgl {
- (void)setCircleRadius:(NSExpression *)circleRadius {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting circleRadius: %@", circleRadius);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(circleRadius, true);
self.rawLayer->setCircleRadius(mbglValue);
@@ -228,6 +240,7 @@ namespace mbgl {
- (void)setCircleRadiusTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting circleRadiusTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setCircleRadiusTransition(options);
@@ -246,6 +259,7 @@ namespace mbgl {
- (void)setCircleScaleAlignment:(NSExpression *)circleScaleAlignment {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting circleScaleAlignment: %@", circleScaleAlignment);
auto mbglValue = MGLStyleValueTransformer<mbgl::style::CirclePitchScaleType, NSValue *, mbgl::style::CirclePitchScaleType, MGLCircleScaleAlignment>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::CirclePitchScaleType>>(circleScaleAlignment, false);
self.rawLayer->setCirclePitchScale(mbglValue);
@@ -270,6 +284,7 @@ namespace mbgl {
- (void)setCircleStrokeColor:(NSExpression *)circleStrokeColor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting circleStrokeColor: %@", circleStrokeColor);
auto mbglValue = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toPropertyValue<mbgl::style::PropertyValue<mbgl::Color>>(circleStrokeColor, true);
self.rawLayer->setCircleStrokeColor(mbglValue);
@@ -287,6 +302,7 @@ namespace mbgl {
- (void)setCircleStrokeColorTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting circleStrokeColorTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setCircleStrokeColorTransition(options);
@@ -305,6 +321,7 @@ namespace mbgl {
- (void)setCircleStrokeOpacity:(NSExpression *)circleStrokeOpacity {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting circleStrokeOpacity: %@", circleStrokeOpacity);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(circleStrokeOpacity, true);
self.rawLayer->setCircleStrokeOpacity(mbglValue);
@@ -322,6 +339,7 @@ namespace mbgl {
- (void)setCircleStrokeOpacityTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting circleStrokeOpacityTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setCircleStrokeOpacityTransition(options);
@@ -340,6 +358,7 @@ namespace mbgl {
- (void)setCircleStrokeWidth:(NSExpression *)circleStrokeWidth {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting circleStrokeWidth: %@", circleStrokeWidth);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(circleStrokeWidth, true);
self.rawLayer->setCircleStrokeWidth(mbglValue);
@@ -357,6 +376,7 @@ namespace mbgl {
- (void)setCircleStrokeWidthTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting circleStrokeWidthTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setCircleStrokeWidthTransition(options);
@@ -375,6 +395,7 @@ namespace mbgl {
- (void)setCircleTranslation:(NSExpression *)circleTranslation {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting circleTranslation: %@", circleTranslation);
auto mbglValue = MGLStyleValueTransformer<std::array<float, 2>, NSValue *>().toPropertyValue<mbgl::style::PropertyValue<std::array<float, 2>>>(circleTranslation, false);
self.rawLayer->setCircleTranslate(mbglValue);
@@ -392,6 +413,7 @@ namespace mbgl {
- (void)setCircleTranslationTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting circleTranslationTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setCircleTranslateTransition(options);
@@ -417,6 +439,7 @@ namespace mbgl {
- (void)setCircleTranslationAnchor:(NSExpression *)circleTranslationAnchor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting circleTranslationAnchor: %@", circleTranslationAnchor);
auto mbglValue = MGLStyleValueTransformer<mbgl::style::TranslateAnchorType, NSValue *, mbgl::style::TranslateAnchorType, MGLCircleTranslationAnchor>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::TranslateAnchorType>>(circleTranslationAnchor, false);
self.rawLayer->setCircleTranslateAnchor(mbglValue);
diff --git a/platform/darwin/src/MGLFillExtrusionStyleLayer.mm b/platform/darwin/src/MGLFillExtrusionStyleLayer.mm
index 570b83b854..ea9fa15db3 100644
--- a/platform/darwin/src/MGLFillExtrusionStyleLayer.mm
+++ b/platform/darwin/src/MGLFillExtrusionStyleLayer.mm
@@ -7,6 +7,7 @@
#import "MGLStyleLayer_Private.h"
#import "MGLStyleValue_Private.h"
#import "MGLFillExtrusionStyleLayer.h"
+#import "MGLLoggingConfiguration_Private.h"
#include <mbgl/style/transition_options.hpp>
#include <mbgl/style/layers/fill_extrusion_layer.hpp>
@@ -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<mbgl::style::FillExtrusionLayer>(identifier.UTF8String, source.identifier.UTF8String);
return self = [super initWithPendingLayer:std::move(layer)];
}
@@ -57,6 +59,7 @@ namespace mbgl {
- (void)setSourceLayerIdentifier:(NSString *)sourceLayerIdentifier
{
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting sourceLayerIdentifier: %@", sourceLayerIdentifier);
self.rawLayer->setSourceLayer(sourceLayerIdentifier.UTF8String ?: "");
}
@@ -64,6 +67,7 @@ namespace mbgl {
- (void)setPredicate:(NSPredicate *)predicate
{
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting predicate: %@", predicate);
self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::Filter());
}
@@ -79,6 +83,7 @@ namespace mbgl {
- (void)setFillExtrusionBase:(NSExpression *)fillExtrusionBase {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillExtrusionBase: %@", fillExtrusionBase);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(fillExtrusionBase, true);
self.rawLayer->setFillExtrusionBase(mbglValue);
@@ -96,6 +101,7 @@ namespace mbgl {
- (void)setFillExtrusionBaseTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillExtrusionBaseTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setFillExtrusionBaseTransition(options);
@@ -114,6 +120,7 @@ namespace mbgl {
- (void)setFillExtrusionColor:(NSExpression *)fillExtrusionColor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillExtrusionColor: %@", fillExtrusionColor);
auto mbglValue = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toPropertyValue<mbgl::style::PropertyValue<mbgl::Color>>(fillExtrusionColor, true);
self.rawLayer->setFillExtrusionColor(mbglValue);
@@ -131,6 +138,7 @@ namespace mbgl {
- (void)setFillExtrusionColorTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillExtrusionColorTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setFillExtrusionColorTransition(options);
@@ -149,6 +157,7 @@ namespace mbgl {
- (void)setFillExtrusionHeight:(NSExpression *)fillExtrusionHeight {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillExtrusionHeight: %@", fillExtrusionHeight);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(fillExtrusionHeight, true);
self.rawLayer->setFillExtrusionHeight(mbglValue);
@@ -166,6 +175,7 @@ namespace mbgl {
- (void)setFillExtrusionHeightTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillExtrusionHeightTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setFillExtrusionHeightTransition(options);
@@ -184,6 +194,7 @@ namespace mbgl {
- (void)setFillExtrusionOpacity:(NSExpression *)fillExtrusionOpacity {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillExtrusionOpacity: %@", fillExtrusionOpacity);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(fillExtrusionOpacity, false);
self.rawLayer->setFillExtrusionOpacity(mbglValue);
@@ -201,6 +212,7 @@ namespace mbgl {
- (void)setFillExtrusionOpacityTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillExtrusionOpacityTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setFillExtrusionOpacityTransition(options);
@@ -219,6 +231,7 @@ namespace mbgl {
- (void)setFillExtrusionPattern:(NSExpression *)fillExtrusionPattern {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillExtrusionPattern: %@", fillExtrusionPattern);
auto mbglValue = MGLStyleValueTransformer<std::string, NSString *>().toPropertyValue<mbgl::style::PropertyValue<std::string>>(fillExtrusionPattern, true);
self.rawLayer->setFillExtrusionPattern(mbglValue);
@@ -236,6 +249,7 @@ namespace mbgl {
- (void)setFillExtrusionPatternTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillExtrusionPatternTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setFillExtrusionPatternTransition(options);
@@ -254,6 +268,7 @@ namespace mbgl {
- (void)setFillExtrusionTranslation:(NSExpression *)fillExtrusionTranslation {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillExtrusionTranslation: %@", fillExtrusionTranslation);
auto mbglValue = MGLStyleValueTransformer<std::array<float, 2>, NSValue *>().toPropertyValue<mbgl::style::PropertyValue<std::array<float, 2>>>(fillExtrusionTranslation, false);
self.rawLayer->setFillExtrusionTranslate(mbglValue);
@@ -271,6 +286,7 @@ namespace mbgl {
- (void)setFillExtrusionTranslationTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillExtrusionTranslationTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setFillExtrusionTranslateTransition(options);
@@ -296,6 +312,7 @@ namespace mbgl {
- (void)setFillExtrusionTranslationAnchor:(NSExpression *)fillExtrusionTranslationAnchor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillExtrusionTranslationAnchor: %@", fillExtrusionTranslationAnchor);
auto mbglValue = MGLStyleValueTransformer<mbgl::style::TranslateAnchorType, NSValue *, mbgl::style::TranslateAnchorType, MGLFillExtrusionTranslationAnchor>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::TranslateAnchorType>>(fillExtrusionTranslationAnchor, false);
self.rawLayer->setFillExtrusionTranslateAnchor(mbglValue);
diff --git a/platform/darwin/src/MGLFillStyleLayer.mm b/platform/darwin/src/MGLFillStyleLayer.mm
index bb8c7fc1f2..20b3b68c34 100644
--- a/platform/darwin/src/MGLFillStyleLayer.mm
+++ b/platform/darwin/src/MGLFillStyleLayer.mm
@@ -7,6 +7,7 @@
#import "MGLStyleLayer_Private.h"
#import "MGLStyleValue_Private.h"
#import "MGLFillStyleLayer.h"
+#import "MGLLoggingConfiguration_Private.h"
#include <mbgl/style/transition_options.hpp>
#include <mbgl/style/layers/fill_layer.hpp>
@@ -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<mbgl::style::FillLayer>(identifier.UTF8String, source.identifier.UTF8String);
return self = [super initWithPendingLayer:std::move(layer)];
}
@@ -57,6 +59,7 @@ namespace mbgl {
- (void)setSourceLayerIdentifier:(NSString *)sourceLayerIdentifier
{
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting sourceLayerIdentifier: %@", sourceLayerIdentifier);
self.rawLayer->setSourceLayer(sourceLayerIdentifier.UTF8String ?: "");
}
@@ -64,6 +67,7 @@ namespace mbgl {
- (void)setPredicate:(NSPredicate *)predicate
{
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting predicate: %@", predicate);
self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::Filter());
}
@@ -79,6 +83,7 @@ namespace mbgl {
- (void)setFillAntialiased:(NSExpression *)fillAntialiased {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillAntialiased: %@", fillAntialiased);
auto mbglValue = MGLStyleValueTransformer<bool, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<bool>>(fillAntialiased, false);
self.rawLayer->setFillAntialias(mbglValue);
@@ -103,6 +108,7 @@ namespace mbgl {
- (void)setFillColor:(NSExpression *)fillColor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillColor: %@", fillColor);
auto mbglValue = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toPropertyValue<mbgl::style::PropertyValue<mbgl::Color>>(fillColor, true);
self.rawLayer->setFillColor(mbglValue);
@@ -120,6 +126,7 @@ namespace mbgl {
- (void)setFillColorTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillColorTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setFillColorTransition(options);
@@ -138,6 +145,7 @@ namespace mbgl {
- (void)setFillOpacity:(NSExpression *)fillOpacity {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillOpacity: %@", fillOpacity);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(fillOpacity, true);
self.rawLayer->setFillOpacity(mbglValue);
@@ -155,6 +163,7 @@ namespace mbgl {
- (void)setFillOpacityTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillOpacityTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setFillOpacityTransition(options);
@@ -173,6 +182,7 @@ namespace mbgl {
- (void)setFillOutlineColor:(NSExpression *)fillOutlineColor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillOutlineColor: %@", fillOutlineColor);
auto mbglValue = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toPropertyValue<mbgl::style::PropertyValue<mbgl::Color>>(fillOutlineColor, true);
self.rawLayer->setFillOutlineColor(mbglValue);
@@ -190,6 +200,7 @@ namespace mbgl {
- (void)setFillOutlineColorTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillOutlineColorTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setFillOutlineColorTransition(options);
@@ -208,6 +219,7 @@ namespace mbgl {
- (void)setFillPattern:(NSExpression *)fillPattern {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillPattern: %@", fillPattern);
auto mbglValue = MGLStyleValueTransformer<std::string, NSString *>().toPropertyValue<mbgl::style::PropertyValue<std::string>>(fillPattern, true);
self.rawLayer->setFillPattern(mbglValue);
@@ -225,6 +237,7 @@ namespace mbgl {
- (void)setFillPatternTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillPatternTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setFillPatternTransition(options);
@@ -243,6 +256,7 @@ namespace mbgl {
- (void)setFillTranslation:(NSExpression *)fillTranslation {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillTranslation: %@", fillTranslation);
auto mbglValue = MGLStyleValueTransformer<std::array<float, 2>, NSValue *>().toPropertyValue<mbgl::style::PropertyValue<std::array<float, 2>>>(fillTranslation, false);
self.rawLayer->setFillTranslate(mbglValue);
@@ -260,6 +274,7 @@ namespace mbgl {
- (void)setFillTranslationTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillTranslationTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setFillTranslateTransition(options);
@@ -285,6 +300,7 @@ namespace mbgl {
- (void)setFillTranslationAnchor:(NSExpression *)fillTranslationAnchor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting fillTranslationAnchor: %@", fillTranslationAnchor);
auto mbglValue = MGLStyleValueTransformer<mbgl::style::TranslateAnchorType, NSValue *, mbgl::style::TranslateAnchorType, MGLFillTranslationAnchor>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::TranslateAnchorType>>(fillTranslationAnchor, false);
self.rawLayer->setFillTranslateAnchor(mbglValue);
diff --git a/platform/darwin/src/MGLHeatmapStyleLayer.mm b/platform/darwin/src/MGLHeatmapStyleLayer.mm
index c74869d408..c02d7c0ac1 100644
--- a/platform/darwin/src/MGLHeatmapStyleLayer.mm
+++ b/platform/darwin/src/MGLHeatmapStyleLayer.mm
@@ -7,6 +7,7 @@
#import "MGLStyleLayer_Private.h"
#import "MGLStyleValue_Private.h"
#import "MGLHeatmapStyleLayer.h"
+#import "MGLLoggingConfiguration_Private.h"
#include <mbgl/style/transition_options.hpp>
#include <mbgl/style/layers/heatmap_layer.hpp>
@@ -21,6 +22,7 @@
- (instancetype)initWithIdentifier:(NSString *)identifier source:(MGLSource *)source
{
+ MGLLogDebug(@"Initializing %@ with identifier: %@ source: %@", NSStringFromClass([self class]), identifier, source);
auto layer = std::make_unique<mbgl::style::HeatmapLayer>(identifier.UTF8String, source.identifier.UTF8String);
return self = [super initWithPendingLayer:std::move(layer)];
}
@@ -48,6 +50,7 @@
- (void)setSourceLayerIdentifier:(NSString *)sourceLayerIdentifier
{
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting sourceLayerIdentifier: %@", sourceLayerIdentifier);
self.rawLayer->setSourceLayer(sourceLayerIdentifier.UTF8String ?: "");
}
@@ -55,6 +58,7 @@
- (void)setPredicate:(NSPredicate *)predicate
{
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting predicate: %@", predicate);
self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::Filter());
}
@@ -70,6 +74,7 @@
- (void)setHeatmapColor:(NSExpression *)heatmapColor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting heatmapColor: %@", heatmapColor);
auto mbglValue = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toPropertyValue<mbgl::style::ColorRampPropertyValue>(heatmapColor);
self.rawLayer->setHeatmapColor(mbglValue);
@@ -87,6 +92,7 @@
- (void)setHeatmapIntensity:(NSExpression *)heatmapIntensity {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting heatmapIntensity: %@", heatmapIntensity);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(heatmapIntensity, false);
self.rawLayer->setHeatmapIntensity(mbglValue);
@@ -104,6 +110,7 @@
- (void)setHeatmapIntensityTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting heatmapIntensityTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setHeatmapIntensityTransition(options);
@@ -122,6 +129,7 @@
- (void)setHeatmapOpacity:(NSExpression *)heatmapOpacity {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting heatmapOpacity: %@", heatmapOpacity);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(heatmapOpacity, false);
self.rawLayer->setHeatmapOpacity(mbglValue);
@@ -139,6 +147,7 @@
- (void)setHeatmapOpacityTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting heatmapOpacityTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setHeatmapOpacityTransition(options);
@@ -157,6 +166,7 @@
- (void)setHeatmapRadius:(NSExpression *)heatmapRadius {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting heatmapRadius: %@", heatmapRadius);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(heatmapRadius, true);
self.rawLayer->setHeatmapRadius(mbglValue);
@@ -174,6 +184,7 @@
- (void)setHeatmapRadiusTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting heatmapRadiusTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setHeatmapRadiusTransition(options);
@@ -192,6 +203,7 @@
- (void)setHeatmapWeight:(NSExpression *)heatmapWeight {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting heatmapWeight: %@", heatmapWeight);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(heatmapWeight, true);
self.rawLayer->setHeatmapWeight(mbglValue);
diff --git a/platform/darwin/src/MGLHillshadeStyleLayer.mm b/platform/darwin/src/MGLHillshadeStyleLayer.mm
index 16d043f603..53269b8087 100644
--- a/platform/darwin/src/MGLHillshadeStyleLayer.mm
+++ b/platform/darwin/src/MGLHillshadeStyleLayer.mm
@@ -7,6 +7,7 @@
#import "MGLStyleLayer_Private.h"
#import "MGLStyleValue_Private.h"
#import "MGLHillshadeStyleLayer.h"
+#import "MGLLoggingConfiguration_Private.h"
#include <mbgl/style/transition_options.hpp>
#include <mbgl/style/layers/hillshade_layer.hpp>
@@ -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<mbgl::style::HillshadeLayer>(identifier.UTF8String, source.identifier.UTF8String);
return self = [super initWithPendingLayer:std::move(layer)];
}
@@ -50,6 +52,7 @@ namespace mbgl {
- (void)setHillshadeAccentColor:(NSExpression *)hillshadeAccentColor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting hillshadeAccentColor: %@", hillshadeAccentColor);
auto mbglValue = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toPropertyValue<mbgl::style::PropertyValue<mbgl::Color>>(hillshadeAccentColor, false);
self.rawLayer->setHillshadeAccentColor(mbglValue);
@@ -67,6 +70,7 @@ namespace mbgl {
- (void)setHillshadeAccentColorTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting hillshadeAccentColorTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setHillshadeAccentColorTransition(options);
@@ -85,6 +89,7 @@ namespace mbgl {
- (void)setHillshadeExaggeration:(NSExpression *)hillshadeExaggeration {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting hillshadeExaggeration: %@", hillshadeExaggeration);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(hillshadeExaggeration, false);
self.rawLayer->setHillshadeExaggeration(mbglValue);
@@ -102,6 +107,7 @@ namespace mbgl {
- (void)setHillshadeExaggerationTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting hillshadeExaggerationTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setHillshadeExaggerationTransition(options);
@@ -120,6 +126,7 @@ namespace mbgl {
- (void)setHillshadeHighlightColor:(NSExpression *)hillshadeHighlightColor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting hillshadeHighlightColor: %@", hillshadeHighlightColor);
auto mbglValue = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toPropertyValue<mbgl::style::PropertyValue<mbgl::Color>>(hillshadeHighlightColor, false);
self.rawLayer->setHillshadeHighlightColor(mbglValue);
@@ -137,6 +144,7 @@ namespace mbgl {
- (void)setHillshadeHighlightColorTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting hillshadeHighlightColorTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setHillshadeHighlightColorTransition(options);
@@ -155,6 +163,7 @@ namespace mbgl {
- (void)setHillshadeIlluminationAnchor:(NSExpression *)hillshadeIlluminationAnchor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting hillshadeIlluminationAnchor: %@", hillshadeIlluminationAnchor);
auto mbglValue = MGLStyleValueTransformer<mbgl::style::HillshadeIlluminationAnchorType, NSValue *, mbgl::style::HillshadeIlluminationAnchorType, MGLHillshadeIlluminationAnchor>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::HillshadeIlluminationAnchorType>>(hillshadeIlluminationAnchor, false);
self.rawLayer->setHillshadeIlluminationAnchor(mbglValue);
@@ -172,6 +181,7 @@ namespace mbgl {
- (void)setHillshadeIlluminationDirection:(NSExpression *)hillshadeIlluminationDirection {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting hillshadeIlluminationDirection: %@", hillshadeIlluminationDirection);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(hillshadeIlluminationDirection, false);
self.rawLayer->setHillshadeIlluminationDirection(mbglValue);
@@ -189,6 +199,7 @@ namespace mbgl {
- (void)setHillshadeShadowColor:(NSExpression *)hillshadeShadowColor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting hillshadeShadowColor: %@", hillshadeShadowColor);
auto mbglValue = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toPropertyValue<mbgl::style::PropertyValue<mbgl::Color>>(hillshadeShadowColor, false);
self.rawLayer->setHillshadeShadowColor(mbglValue);
@@ -206,6 +217,7 @@ namespace mbgl {
- (void)setHillshadeShadowColorTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting hillshadeShadowColorTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setHillshadeShadowColorTransition(options);
diff --git a/platform/darwin/src/MGLLight.mm b/platform/darwin/src/MGLLight.mm
index 0234e74d5b..ef6d2ddfcb 100644
--- a/platform/darwin/src/MGLLight.mm
+++ b/platform/darwin/src/MGLLight.mm
@@ -8,6 +8,7 @@
#import "NSDate+MGLAdditions.h"
#import "MGLStyleValue_Private.h"
#import "NSValue+MGLAdditions.h"
+#import "MGLLoggingConfiguration_Private.h"
#import <mbgl/style/light.hpp>
#import <mbgl/style/types.hpp>
@@ -43,6 +44,7 @@ NS_INLINE mbgl::style::TransitionOptions MGLOptionsFromTransition(MGLTransition
- (instancetype)initWithMBGLLight:(const mbgl::style::Light *)mbglLight
{
if (self = [super init]) {
+ MGLLogInfo(@"Initializing %@.", NSStringFromClass([self class]));
auto anchor = mbglLight->getAnchor();
NSExpression *anchorExpression;
if (anchor.isUndefined()) {
@@ -105,4 +107,45 @@ NS_INLINE mbgl::style::TransitionOptions MGLOptionsFromTransition(MGLTransition
return mbglLight;
}
+
+
+- (void)setAnchor:(NSExpression *)anchor {
+ MGLLogDebug(@"Setting anchor: %@", anchor);
+
+ _anchor = anchor;
+}
+
+- (void)setPosition:(NSExpression *)position {
+ MGLLogDebug(@"Setting position: %@", position);
+
+ _position = position;
+}
+
+- (void)setPositionTransition:(MGLTransition)transition {
+ MGLLogDebug(@"Setting positionTransition: %@", NSStringFromMGLTransition(transition));
+ _positionTransition = transition;
+}
+
+- (void)setColor:(NSExpression *)color {
+ MGLLogDebug(@"Setting color: %@", color);
+
+ _color = color;
+}
+
+- (void)setColorTransition:(MGLTransition)transition {
+ MGLLogDebug(@"Setting colorTransition: %@", NSStringFromMGLTransition(transition));
+ _colorTransition = transition;
+}
+
+- (void)setIntensity:(NSExpression *)intensity {
+ MGLLogDebug(@"Setting intensity: %@", intensity);
+
+ _intensity = intensity;
+}
+
+- (void)setIntensityTransition:(MGLTransition)transition {
+ MGLLogDebug(@"Setting intensityTransition: %@", NSStringFromMGLTransition(transition));
+ _intensityTransition = transition;
+}
+
@end
diff --git a/platform/darwin/src/MGLLight.mm.ejs b/platform/darwin/src/MGLLight.mm.ejs
index 24ab1d8138..a97ad28590 100644
--- a/platform/darwin/src/MGLLight.mm.ejs
+++ b/platform/darwin/src/MGLLight.mm.ejs
@@ -11,6 +11,7 @@
#import "NSDate+MGLAdditions.h"
#import "MGLStyleValue_Private.h"
#import "NSValue+MGLAdditions.h"
+#import "MGLLoggingConfiguration_Private.h"
#import <mbgl/style/light.hpp>
#import <mbgl/style/types.hpp>
@@ -51,6 +52,7 @@ NS_INLINE mbgl::style::TransitionOptions MGLOptionsFromTransition(MGLTransition
- (instancetype)initWithMBGLLight:(const mbgl::style::Light *)mbglLight
{
if (self = [super init]) {
+ MGLLogInfo(@"Initializing %@.", NSStringFromClass([self class]));
<% if (properties.length) { -%>
<% for (const property of properties) { -%>
<% if (property.type == "enum") { -%>
@@ -111,4 +113,23 @@ NS_INLINE mbgl::style::TransitionOptions MGLOptionsFromTransition(MGLTransition
return mbglLight;
}
+<% if (properties.length) { -%>
+
+<% for (const property of properties) { -%>
+
+- (void)set<%- camelize(property.name) %>:(NSExpression *)<%- objCName(property) %> {
+ MGLLogDebug(@"Setting <%- objCName(property) %>: %@", <%- objCName(property) %>);
+
+ _<%- objCName(property) %> = <%- objCName(property) %>;
+}
+<% if (property["transition"]) { -%>
+
+- (void)set<%- camelize(property.name) %>Transition:(MGLTransition)transition {
+ MGLLogDebug(@"Setting <%- objCName(property) %>Transition: %@", NSStringFromMGLTransition(transition));
+ _<%- objCName(property) %>Transition = transition;
+}
+<% } -%>
+<% } -%>
+<% } -%>
+
@end
diff --git a/platform/darwin/src/MGLLineStyleLayer.mm b/platform/darwin/src/MGLLineStyleLayer.mm
index 0f749f90af..c3a63fa7e1 100644
--- a/platform/darwin/src/MGLLineStyleLayer.mm
+++ b/platform/darwin/src/MGLLineStyleLayer.mm
@@ -7,6 +7,7 @@
#import "MGLStyleLayer_Private.h"
#import "MGLStyleValue_Private.h"
#import "MGLLineStyleLayer.h"
+#import "MGLLoggingConfiguration_Private.h"
#include <mbgl/style/transition_options.hpp>
#include <mbgl/style/layers/line_layer.hpp>
@@ -42,6 +43,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<mbgl::style::LineLayer>(identifier.UTF8String, source.identifier.UTF8String);
return self = [super initWithPendingLayer:std::move(layer)];
}
@@ -69,6 +71,7 @@ namespace mbgl {
- (void)setSourceLayerIdentifier:(NSString *)sourceLayerIdentifier
{
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting sourceLayerIdentifier: %@", sourceLayerIdentifier);
self.rawLayer->setSourceLayer(sourceLayerIdentifier.UTF8String ?: "");
}
@@ -76,6 +79,7 @@ namespace mbgl {
- (void)setPredicate:(NSPredicate *)predicate
{
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting predicate: %@", predicate);
self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::Filter());
}
@@ -91,6 +95,7 @@ namespace mbgl {
- (void)setLineCap:(NSExpression *)lineCap {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting lineCap: %@", lineCap);
auto mbglValue = MGLStyleValueTransformer<mbgl::style::LineCapType, NSValue *, mbgl::style::LineCapType, MGLLineCap>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::LineCapType>>(lineCap, false);
self.rawLayer->setLineCap(mbglValue);
@@ -108,6 +113,7 @@ namespace mbgl {
- (void)setLineJoin:(NSExpression *)lineJoin {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting lineJoin: %@", lineJoin);
auto mbglValue = MGLStyleValueTransformer<mbgl::style::LineJoinType, NSValue *, mbgl::style::LineJoinType, MGLLineJoin>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::LineJoinType>>(lineJoin, true);
self.rawLayer->setLineJoin(mbglValue);
@@ -125,6 +131,7 @@ namespace mbgl {
- (void)setLineMiterLimit:(NSExpression *)lineMiterLimit {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting lineMiterLimit: %@", lineMiterLimit);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(lineMiterLimit, false);
self.rawLayer->setLineMiterLimit(mbglValue);
@@ -142,6 +149,7 @@ namespace mbgl {
- (void)setLineRoundLimit:(NSExpression *)lineRoundLimit {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting lineRoundLimit: %@", lineRoundLimit);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(lineRoundLimit, false);
self.rawLayer->setLineRoundLimit(mbglValue);
@@ -161,6 +169,7 @@ namespace mbgl {
- (void)setLineBlur:(NSExpression *)lineBlur {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting lineBlur: %@", lineBlur);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(lineBlur, true);
self.rawLayer->setLineBlur(mbglValue);
@@ -178,6 +187,7 @@ namespace mbgl {
- (void)setLineBlurTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting lineBlurTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setLineBlurTransition(options);
@@ -196,6 +206,7 @@ namespace mbgl {
- (void)setLineColor:(NSExpression *)lineColor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting lineColor: %@", lineColor);
auto mbglValue = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toPropertyValue<mbgl::style::PropertyValue<mbgl::Color>>(lineColor, true);
self.rawLayer->setLineColor(mbglValue);
@@ -213,6 +224,7 @@ namespace mbgl {
- (void)setLineColorTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting lineColorTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setLineColorTransition(options);
@@ -231,6 +243,7 @@ namespace mbgl {
- (void)setLineDashPattern:(NSExpression *)lineDashPattern {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting lineDashPattern: %@", lineDashPattern);
auto mbglValue = MGLStyleValueTransformer<std::vector<float>, NSArray<NSNumber *> *, float>().toPropertyValue<mbgl::style::PropertyValue<std::vector<float>>>(lineDashPattern, false);
self.rawLayer->setLineDasharray(mbglValue);
@@ -248,6 +261,7 @@ namespace mbgl {
- (void)setLineDashPatternTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting lineDashPatternTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setLineDasharrayTransition(options);
@@ -273,6 +287,7 @@ namespace mbgl {
- (void)setLineGapWidth:(NSExpression *)lineGapWidth {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting lineGapWidth: %@", lineGapWidth);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(lineGapWidth, true);
self.rawLayer->setLineGapWidth(mbglValue);
@@ -290,6 +305,7 @@ namespace mbgl {
- (void)setLineGapWidthTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting lineGapWidthTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setLineGapWidthTransition(options);
@@ -308,6 +324,7 @@ namespace mbgl {
- (void)setLineGradient:(NSExpression *)lineGradient {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting lineGradient: %@", lineGradient);
auto mbglValue = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toPropertyValue<mbgl::style::ColorRampPropertyValue>(lineGradient);
self.rawLayer->setLineGradient(mbglValue);
@@ -325,6 +342,7 @@ namespace mbgl {
- (void)setLineOffset:(NSExpression *)lineOffset {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting lineOffset: %@", lineOffset);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(lineOffset, true);
self.rawLayer->setLineOffset(mbglValue);
@@ -342,6 +360,7 @@ namespace mbgl {
- (void)setLineOffsetTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting lineOffsetTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setLineOffsetTransition(options);
@@ -360,6 +379,7 @@ namespace mbgl {
- (void)setLineOpacity:(NSExpression *)lineOpacity {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting lineOpacity: %@", lineOpacity);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(lineOpacity, true);
self.rawLayer->setLineOpacity(mbglValue);
@@ -377,6 +397,7 @@ namespace mbgl {
- (void)setLineOpacityTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting lineOpacityTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setLineOpacityTransition(options);
@@ -395,6 +416,7 @@ namespace mbgl {
- (void)setLinePattern:(NSExpression *)linePattern {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting linePattern: %@", linePattern);
auto mbglValue = MGLStyleValueTransformer<std::string, NSString *>().toPropertyValue<mbgl::style::PropertyValue<std::string>>(linePattern, true);
self.rawLayer->setLinePattern(mbglValue);
@@ -412,6 +434,7 @@ namespace mbgl {
- (void)setLinePatternTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting linePatternTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setLinePatternTransition(options);
@@ -430,6 +453,7 @@ namespace mbgl {
- (void)setLineTranslation:(NSExpression *)lineTranslation {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting lineTranslation: %@", lineTranslation);
auto mbglValue = MGLStyleValueTransformer<std::array<float, 2>, NSValue *>().toPropertyValue<mbgl::style::PropertyValue<std::array<float, 2>>>(lineTranslation, false);
self.rawLayer->setLineTranslate(mbglValue);
@@ -447,6 +471,7 @@ namespace mbgl {
- (void)setLineTranslationTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting lineTranslationTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setLineTranslateTransition(options);
@@ -472,6 +497,7 @@ namespace mbgl {
- (void)setLineTranslationAnchor:(NSExpression *)lineTranslationAnchor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting lineTranslationAnchor: %@", lineTranslationAnchor);
auto mbglValue = MGLStyleValueTransformer<mbgl::style::TranslateAnchorType, NSValue *, mbgl::style::TranslateAnchorType, MGLLineTranslationAnchor>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::TranslateAnchorType>>(lineTranslationAnchor, false);
self.rawLayer->setLineTranslateAnchor(mbglValue);
@@ -496,6 +522,7 @@ namespace mbgl {
- (void)setLineWidth:(NSExpression *)lineWidth {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting lineWidth: %@", lineWidth);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(lineWidth, true);
self.rawLayer->setLineWidth(mbglValue);
@@ -513,6 +540,7 @@ namespace mbgl {
- (void)setLineWidthTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting lineWidthTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setLineWidthTransition(options);
diff --git a/platform/darwin/src/MGLRasterStyleLayer.mm b/platform/darwin/src/MGLRasterStyleLayer.mm
index c87355b04d..8cb6b1bc95 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 <mbgl/style/transition_options.hpp>
#include <mbgl/style/layers/raster_layer.hpp>
@@ -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<mbgl::style::RasterLayer>(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<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(maximumRasterBrightness, false);
self.rawLayer->setRasterBrightnessMax(mbglValue);
@@ -67,6 +70,7 @@ namespace mbgl {
- (void)setMaximumRasterBrightnessTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting maximumRasterBrightnessTransition: %@", NSStringFromMGLTransition(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<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(minimumRasterBrightness, false);
self.rawLayer->setRasterBrightnessMin(mbglValue);
@@ -109,6 +114,7 @@ namespace mbgl {
- (void)setMinimumRasterBrightnessTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting minimumRasterBrightnessTransition: %@", NSStringFromMGLTransition(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<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(rasterContrast, false);
self.rawLayer->setRasterContrast(mbglValue);
@@ -151,6 +158,7 @@ namespace mbgl {
- (void)setRasterContrastTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting rasterContrastTransition: %@", NSStringFromMGLTransition(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<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(rasterFadeDuration, false);
self.rawLayer->setRasterFadeDuration(mbglValue);
@@ -186,6 +195,7 @@ namespace mbgl {
- (void)setRasterHueRotation:(NSExpression *)rasterHueRotation {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting rasterHueRotation: %@", rasterHueRotation);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(rasterHueRotation, false);
self.rawLayer->setRasterHueRotate(mbglValue);
@@ -203,6 +213,7 @@ namespace mbgl {
- (void)setRasterHueRotationTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting rasterHueRotationTransition: %@", NSStringFromMGLTransition(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<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(rasterOpacity, false);
self.rawLayer->setRasterOpacity(mbglValue);
@@ -245,6 +257,7 @@ namespace mbgl {
- (void)setRasterOpacityTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting rasterOpacityTransition: %@", NSStringFromMGLTransition(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<mbgl::style::RasterResamplingType, NSValue *, mbgl::style::RasterResamplingType, MGLRasterResamplingMode>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::RasterResamplingType>>(rasterResamplingMode, false);
self.rawLayer->setRasterResampling(mbglValue);
@@ -287,6 +301,7 @@ namespace mbgl {
- (void)setRasterSaturation:(NSExpression *)rasterSaturation {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting rasterSaturation: %@", rasterSaturation);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(rasterSaturation, false);
self.rawLayer->setRasterSaturation(mbglValue);
@@ -304,6 +319,7 @@ namespace mbgl {
- (void)setRasterSaturationTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting rasterSaturationTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setRasterSaturationTransition(options);
diff --git a/platform/darwin/src/MGLStyleLayer.mm.ejs b/platform/darwin/src/MGLStyleLayer.mm.ejs
index 6d0c4bfdd9..61093867b8 100644
--- a/platform/darwin/src/MGLStyleLayer.mm.ejs
+++ b/platform/darwin/src/MGLStyleLayer.mm.ejs
@@ -13,6 +13,7 @@
#import "MGLStyleLayer_Private.h"
#import "MGLStyleValue_Private.h"
#import "MGL<%- camelize(type) %>StyleLayer.h"
+#import "MGLLoggingConfiguration_Private.h"
#include <mbgl/style/transition_options.hpp>
#include <mbgl/style/layers/<%- type.replace('-', '_') %>_layer.hpp>
@@ -58,6 +59,7 @@ namespace mbgl {
<% if (type == 'background') { -%>
- (instancetype)initWithIdentifier:(NSString *)identifier
{
+ MGLLogDebug(@"Initializing %@ with identifier: %@", NSStringFromClass([self class]), identifier);
auto layer = std::make_unique<mbgl::style::<%- camelize(type) %>Layer>(identifier.UTF8String);
return self = [super initWithPendingLayer:std::move(layer)];
}
@@ -65,6 +67,7 @@ namespace mbgl {
<% } else { -%>
- (instancetype)initWithIdentifier:(NSString *)identifier source:(MGLSource *)source
{
+ MGLLogDebug(@"Initializing %@ with identifier: %@ source: %@", NSStringFromClass([self class]), identifier, source);
auto layer = std::make_unique<mbgl::style::<%- camelize(type) %>Layer>(identifier.UTF8String, source.identifier.UTF8String);
return self = [super initWithPendingLayer:std::move(layer)];
}
@@ -95,6 +98,7 @@ namespace mbgl {
- (void)setSourceLayerIdentifier:(NSString *)sourceLayerIdentifier
{
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting sourceLayerIdentifier: %@", sourceLayerIdentifier);
self.rawLayer->setSourceLayer(sourceLayerIdentifier.UTF8String ?: "");
}
@@ -102,6 +106,7 @@ namespace mbgl {
- (void)setPredicate:(NSPredicate *)predicate
{
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting predicate: %@", predicate);
self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::Filter());
}
@@ -120,6 +125,7 @@ namespace mbgl {
<% for (const property of layoutProperties) { -%>
- (void)set<%- camelize(property.name) %>:(NSExpression *)<%- objCName(property) %> {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting <%- objCName(property) %>: %@", <%- objCName(property) %>);
<% if (property.tokens) { -%>
if (<%- objCName(property) %> && <%- objCName(property) %>.expressionType == NSConstantValueExpressionType) {
@@ -171,6 +177,7 @@ namespace mbgl {
- (void)set<%- camelize(property.name) %>:(NSExpression *)<%- objCName(property) %> {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting <%- objCName(property) %>: %@", <%- objCName(property) %>);
<% switch (property['property-type']) {
case 'color-ramp': -%>
@@ -199,6 +206,7 @@ namespace mbgl {
- (void)set<%- camelize(property.name) %>Transition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting <%- objCName(property) %>Transition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->set<%- camelize(originalPropertyName(property)) %>Transition(options);
diff --git a/platform/darwin/src/MGLSymbolStyleLayer.mm b/platform/darwin/src/MGLSymbolStyleLayer.mm
index e1bc7e7d20..5607bb43c3 100644
--- a/platform/darwin/src/MGLSymbolStyleLayer.mm
+++ b/platform/darwin/src/MGLSymbolStyleLayer.mm
@@ -7,6 +7,7 @@
#import "MGLStyleLayer_Private.h"
#import "MGLStyleValue_Private.h"
#import "MGLSymbolStyleLayer.h"
+#import "MGLLoggingConfiguration_Private.h"
#include <mbgl/style/transition_options.hpp>
#include <mbgl/style/layers/symbol_layer.hpp>
@@ -113,6 +114,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<mbgl::style::SymbolLayer>(identifier.UTF8String, source.identifier.UTF8String);
return self = [super initWithPendingLayer:std::move(layer)];
}
@@ -140,6 +142,7 @@ namespace mbgl {
- (void)setSourceLayerIdentifier:(NSString *)sourceLayerIdentifier
{
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting sourceLayerIdentifier: %@", sourceLayerIdentifier);
self.rawLayer->setSourceLayer(sourceLayerIdentifier.UTF8String ?: "");
}
@@ -147,6 +150,7 @@ namespace mbgl {
- (void)setPredicate:(NSPredicate *)predicate
{
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting predicate: %@", predicate);
self.rawLayer->setFilter(predicate ? predicate.mgl_filter : mbgl::style::Filter());
}
@@ -162,6 +166,7 @@ namespace mbgl {
- (void)setIconAllowsOverlap:(NSExpression *)iconAllowsOverlap {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconAllowsOverlap: %@", iconAllowsOverlap);
auto mbglValue = MGLStyleValueTransformer<bool, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<bool>>(iconAllowsOverlap, false);
self.rawLayer->setIconAllowOverlap(mbglValue);
@@ -186,6 +191,7 @@ namespace mbgl {
- (void)setIconAnchor:(NSExpression *)iconAnchor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconAnchor: %@", iconAnchor);
auto mbglValue = MGLStyleValueTransformer<mbgl::style::SymbolAnchorType, NSValue *, mbgl::style::SymbolAnchorType, MGLIconAnchor>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::SymbolAnchorType>>(iconAnchor, true);
self.rawLayer->setIconAnchor(mbglValue);
@@ -203,6 +209,7 @@ namespace mbgl {
- (void)setIconIgnoresPlacement:(NSExpression *)iconIgnoresPlacement {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconIgnoresPlacement: %@", iconIgnoresPlacement);
auto mbglValue = MGLStyleValueTransformer<bool, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<bool>>(iconIgnoresPlacement, false);
self.rawLayer->setIconIgnorePlacement(mbglValue);
@@ -227,6 +234,7 @@ namespace mbgl {
- (void)setIconImageName:(NSExpression *)iconImageName {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconImageName: %@", iconImageName);
if (iconImageName && iconImageName.expressionType == NSConstantValueExpressionType) {
std::string string = ((NSString *)iconImageName.constantValue).UTF8String;
@@ -259,6 +267,7 @@ namespace mbgl {
- (void)setIconOffset:(NSExpression *)iconOffset {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconOffset: %@", iconOffset);
auto mbglValue = MGLStyleValueTransformer<std::array<float, 2>, NSValue *>().toPropertyValue<mbgl::style::PropertyValue<std::array<float, 2>>>(iconOffset, true);
self.rawLayer->setIconOffset(mbglValue);
@@ -276,6 +285,7 @@ namespace mbgl {
- (void)setIconOptional:(NSExpression *)iconOptional {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconOptional: %@", iconOptional);
auto mbglValue = MGLStyleValueTransformer<bool, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<bool>>(iconOptional, false);
self.rawLayer->setIconOptional(mbglValue);
@@ -293,6 +303,7 @@ namespace mbgl {
- (void)setIconPadding:(NSExpression *)iconPadding {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconPadding: %@", iconPadding);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(iconPadding, false);
self.rawLayer->setIconPadding(mbglValue);
@@ -310,6 +321,7 @@ namespace mbgl {
- (void)setIconPitchAlignment:(NSExpression *)iconPitchAlignment {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconPitchAlignment: %@", iconPitchAlignment);
auto mbglValue = MGLStyleValueTransformer<mbgl::style::AlignmentType, NSValue *, mbgl::style::AlignmentType, MGLIconPitchAlignment>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::AlignmentType>>(iconPitchAlignment, false);
self.rawLayer->setIconPitchAlignment(mbglValue);
@@ -327,6 +339,7 @@ namespace mbgl {
- (void)setIconRotation:(NSExpression *)iconRotation {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconRotation: %@", iconRotation);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(iconRotation, true);
self.rawLayer->setIconRotate(mbglValue);
@@ -351,6 +364,7 @@ namespace mbgl {
- (void)setIconRotationAlignment:(NSExpression *)iconRotationAlignment {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconRotationAlignment: %@", iconRotationAlignment);
auto mbglValue = MGLStyleValueTransformer<mbgl::style::AlignmentType, NSValue *, mbgl::style::AlignmentType, MGLIconRotationAlignment>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::AlignmentType>>(iconRotationAlignment, false);
self.rawLayer->setIconRotationAlignment(mbglValue);
@@ -368,6 +382,7 @@ namespace mbgl {
- (void)setIconScale:(NSExpression *)iconScale {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconScale: %@", iconScale);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(iconScale, true);
self.rawLayer->setIconSize(mbglValue);
@@ -392,6 +407,7 @@ namespace mbgl {
- (void)setIconTextFit:(NSExpression *)iconTextFit {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconTextFit: %@", iconTextFit);
auto mbglValue = MGLStyleValueTransformer<mbgl::style::IconTextFitType, NSValue *, mbgl::style::IconTextFitType, MGLIconTextFit>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::IconTextFitType>>(iconTextFit, false);
self.rawLayer->setIconTextFit(mbglValue);
@@ -409,6 +425,7 @@ namespace mbgl {
- (void)setIconTextFitPadding:(NSExpression *)iconTextFitPadding {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconTextFitPadding: %@", iconTextFitPadding);
auto mbglValue = MGLStyleValueTransformer<std::array<float, 4>, NSValue *>().toPropertyValue<mbgl::style::PropertyValue<std::array<float, 4>>>(iconTextFitPadding, false);
self.rawLayer->setIconTextFitPadding(mbglValue);
@@ -426,6 +443,7 @@ namespace mbgl {
- (void)setKeepsIconUpright:(NSExpression *)keepsIconUpright {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting keepsIconUpright: %@", keepsIconUpright);
auto mbglValue = MGLStyleValueTransformer<bool, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<bool>>(keepsIconUpright, false);
self.rawLayer->setIconKeepUpright(mbglValue);
@@ -450,6 +468,7 @@ namespace mbgl {
- (void)setKeepsTextUpright:(NSExpression *)keepsTextUpright {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting keepsTextUpright: %@", keepsTextUpright);
auto mbglValue = MGLStyleValueTransformer<bool, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<bool>>(keepsTextUpright, false);
self.rawLayer->setTextKeepUpright(mbglValue);
@@ -474,6 +493,7 @@ namespace mbgl {
- (void)setMaximumTextAngle:(NSExpression *)maximumTextAngle {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting maximumTextAngle: %@", maximumTextAngle);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(maximumTextAngle, false);
self.rawLayer->setTextMaxAngle(mbglValue);
@@ -498,6 +518,7 @@ namespace mbgl {
- (void)setMaximumTextWidth:(NSExpression *)maximumTextWidth {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting maximumTextWidth: %@", maximumTextWidth);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(maximumTextWidth, true);
self.rawLayer->setTextMaxWidth(mbglValue);
@@ -522,6 +543,7 @@ namespace mbgl {
- (void)setSymbolAvoidsEdges:(NSExpression *)symbolAvoidsEdges {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting symbolAvoidsEdges: %@", symbolAvoidsEdges);
auto mbglValue = MGLStyleValueTransformer<bool, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<bool>>(symbolAvoidsEdges, false);
self.rawLayer->setSymbolAvoidEdges(mbglValue);
@@ -546,6 +568,7 @@ namespace mbgl {
- (void)setSymbolPlacement:(NSExpression *)symbolPlacement {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting symbolPlacement: %@", symbolPlacement);
auto mbglValue = MGLStyleValueTransformer<mbgl::style::SymbolPlacementType, NSValue *, mbgl::style::SymbolPlacementType, MGLSymbolPlacement>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::SymbolPlacementType>>(symbolPlacement, false);
self.rawLayer->setSymbolPlacement(mbglValue);
@@ -563,6 +586,7 @@ namespace mbgl {
- (void)setSymbolSpacing:(NSExpression *)symbolSpacing {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting symbolSpacing: %@", symbolSpacing);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(symbolSpacing, false);
self.rawLayer->setSymbolSpacing(mbglValue);
@@ -580,6 +604,7 @@ namespace mbgl {
- (void)setSymbolZOrder:(NSExpression *)symbolZOrder {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting symbolZOrder: %@", symbolZOrder);
auto mbglValue = MGLStyleValueTransformer<mbgl::style::SymbolZOrderType, NSValue *, mbgl::style::SymbolZOrderType, MGLSymbolZOrder>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::SymbolZOrderType>>(symbolZOrder, false);
self.rawLayer->setSymbolZOrder(mbglValue);
@@ -597,6 +622,7 @@ namespace mbgl {
- (void)setText:(NSExpression *)text {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting text: %@", text);
if (text && text.expressionType == NSConstantValueExpressionType) {
std::string string = ((NSString *)text.constantValue).UTF8String;
@@ -629,6 +655,7 @@ namespace mbgl {
- (void)setTextAllowsOverlap:(NSExpression *)textAllowsOverlap {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textAllowsOverlap: %@", textAllowsOverlap);
auto mbglValue = MGLStyleValueTransformer<bool, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<bool>>(textAllowsOverlap, false);
self.rawLayer->setTextAllowOverlap(mbglValue);
@@ -653,6 +680,7 @@ namespace mbgl {
- (void)setTextAnchor:(NSExpression *)textAnchor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textAnchor: %@", textAnchor);
auto mbglValue = MGLStyleValueTransformer<mbgl::style::SymbolAnchorType, NSValue *, mbgl::style::SymbolAnchorType, MGLTextAnchor>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::SymbolAnchorType>>(textAnchor, true);
self.rawLayer->setTextAnchor(mbglValue);
@@ -670,6 +698,7 @@ namespace mbgl {
- (void)setTextFontNames:(NSExpression *)textFontNames {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textFontNames: %@", textFontNames);
auto mbglValue = MGLStyleValueTransformer<std::vector<std::string>, NSArray<NSString *> *, std::string>().toPropertyValue<mbgl::style::PropertyValue<std::vector<std::string>>>(textFontNames, true);
self.rawLayer->setTextFont(mbglValue);
@@ -694,6 +723,7 @@ namespace mbgl {
- (void)setTextFontSize:(NSExpression *)textFontSize {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textFontSize: %@", textFontSize);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(textFontSize, true);
self.rawLayer->setTextSize(mbglValue);
@@ -718,6 +748,7 @@ namespace mbgl {
- (void)setTextIgnoresPlacement:(NSExpression *)textIgnoresPlacement {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textIgnoresPlacement: %@", textIgnoresPlacement);
auto mbglValue = MGLStyleValueTransformer<bool, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<bool>>(textIgnoresPlacement, false);
self.rawLayer->setTextIgnorePlacement(mbglValue);
@@ -742,6 +773,7 @@ namespace mbgl {
- (void)setTextJustification:(NSExpression *)textJustification {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textJustification: %@", textJustification);
auto mbglValue = MGLStyleValueTransformer<mbgl::style::TextJustifyType, NSValue *, mbgl::style::TextJustifyType, MGLTextJustification>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::TextJustifyType>>(textJustification, true);
self.rawLayer->setTextJustify(mbglValue);
@@ -766,6 +798,7 @@ namespace mbgl {
- (void)setTextLetterSpacing:(NSExpression *)textLetterSpacing {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textLetterSpacing: %@", textLetterSpacing);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(textLetterSpacing, true);
self.rawLayer->setTextLetterSpacing(mbglValue);
@@ -783,6 +816,7 @@ namespace mbgl {
- (void)setTextLineHeight:(NSExpression *)textLineHeight {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textLineHeight: %@", textLineHeight);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(textLineHeight, false);
self.rawLayer->setTextLineHeight(mbglValue);
@@ -800,6 +834,7 @@ namespace mbgl {
- (void)setTextOffset:(NSExpression *)textOffset {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textOffset: %@", textOffset);
auto mbglValue = MGLStyleValueTransformer<std::array<float, 2>, NSValue *>().toPropertyValue<mbgl::style::PropertyValue<std::array<float, 2>>>(textOffset, true);
self.rawLayer->setTextOffset(mbglValue);
@@ -817,6 +852,7 @@ namespace mbgl {
- (void)setTextOptional:(NSExpression *)textOptional {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textOptional: %@", textOptional);
auto mbglValue = MGLStyleValueTransformer<bool, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<bool>>(textOptional, false);
self.rawLayer->setTextOptional(mbglValue);
@@ -834,6 +870,7 @@ namespace mbgl {
- (void)setTextPadding:(NSExpression *)textPadding {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textPadding: %@", textPadding);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(textPadding, false);
self.rawLayer->setTextPadding(mbglValue);
@@ -851,6 +888,7 @@ namespace mbgl {
- (void)setTextPitchAlignment:(NSExpression *)textPitchAlignment {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textPitchAlignment: %@", textPitchAlignment);
auto mbglValue = MGLStyleValueTransformer<mbgl::style::AlignmentType, NSValue *, mbgl::style::AlignmentType, MGLTextPitchAlignment>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::AlignmentType>>(textPitchAlignment, false);
self.rawLayer->setTextPitchAlignment(mbglValue);
@@ -868,6 +906,7 @@ namespace mbgl {
- (void)setTextRotation:(NSExpression *)textRotation {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textRotation: %@", textRotation);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(textRotation, true);
self.rawLayer->setTextRotate(mbglValue);
@@ -892,6 +931,7 @@ namespace mbgl {
- (void)setTextRotationAlignment:(NSExpression *)textRotationAlignment {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textRotationAlignment: %@", textRotationAlignment);
auto mbglValue = MGLStyleValueTransformer<mbgl::style::AlignmentType, NSValue *, mbgl::style::AlignmentType, MGLTextRotationAlignment>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::AlignmentType>>(textRotationAlignment, false);
self.rawLayer->setTextRotationAlignment(mbglValue);
@@ -909,6 +949,7 @@ namespace mbgl {
- (void)setTextTransform:(NSExpression *)textTransform {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textTransform: %@", textTransform);
auto mbglValue = MGLStyleValueTransformer<mbgl::style::TextTransformType, NSValue *, mbgl::style::TextTransformType, MGLTextTransform>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::TextTransformType>>(textTransform, true);
self.rawLayer->setTextTransform(mbglValue);
@@ -928,6 +969,7 @@ namespace mbgl {
- (void)setIconColor:(NSExpression *)iconColor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconColor: %@", iconColor);
auto mbglValue = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toPropertyValue<mbgl::style::PropertyValue<mbgl::Color>>(iconColor, true);
self.rawLayer->setIconColor(mbglValue);
@@ -945,6 +987,7 @@ namespace mbgl {
- (void)setIconColorTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconColorTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setIconColorTransition(options);
@@ -963,6 +1006,7 @@ namespace mbgl {
- (void)setIconHaloBlur:(NSExpression *)iconHaloBlur {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconHaloBlur: %@", iconHaloBlur);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(iconHaloBlur, true);
self.rawLayer->setIconHaloBlur(mbglValue);
@@ -980,6 +1024,7 @@ namespace mbgl {
- (void)setIconHaloBlurTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconHaloBlurTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setIconHaloBlurTransition(options);
@@ -998,6 +1043,7 @@ namespace mbgl {
- (void)setIconHaloColor:(NSExpression *)iconHaloColor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconHaloColor: %@", iconHaloColor);
auto mbglValue = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toPropertyValue<mbgl::style::PropertyValue<mbgl::Color>>(iconHaloColor, true);
self.rawLayer->setIconHaloColor(mbglValue);
@@ -1015,6 +1061,7 @@ namespace mbgl {
- (void)setIconHaloColorTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconHaloColorTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setIconHaloColorTransition(options);
@@ -1033,6 +1080,7 @@ namespace mbgl {
- (void)setIconHaloWidth:(NSExpression *)iconHaloWidth {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconHaloWidth: %@", iconHaloWidth);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(iconHaloWidth, true);
self.rawLayer->setIconHaloWidth(mbglValue);
@@ -1050,6 +1098,7 @@ namespace mbgl {
- (void)setIconHaloWidthTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconHaloWidthTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setIconHaloWidthTransition(options);
@@ -1068,6 +1117,7 @@ namespace mbgl {
- (void)setIconOpacity:(NSExpression *)iconOpacity {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconOpacity: %@", iconOpacity);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(iconOpacity, true);
self.rawLayer->setIconOpacity(mbglValue);
@@ -1085,6 +1135,7 @@ namespace mbgl {
- (void)setIconOpacityTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconOpacityTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setIconOpacityTransition(options);
@@ -1103,6 +1154,7 @@ namespace mbgl {
- (void)setIconTranslation:(NSExpression *)iconTranslation {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconTranslation: %@", iconTranslation);
auto mbglValue = MGLStyleValueTransformer<std::array<float, 2>, NSValue *>().toPropertyValue<mbgl::style::PropertyValue<std::array<float, 2>>>(iconTranslation, false);
self.rawLayer->setIconTranslate(mbglValue);
@@ -1120,6 +1172,7 @@ namespace mbgl {
- (void)setIconTranslationTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconTranslationTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setIconTranslateTransition(options);
@@ -1145,6 +1198,7 @@ namespace mbgl {
- (void)setIconTranslationAnchor:(NSExpression *)iconTranslationAnchor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting iconTranslationAnchor: %@", iconTranslationAnchor);
auto mbglValue = MGLStyleValueTransformer<mbgl::style::TranslateAnchorType, NSValue *, mbgl::style::TranslateAnchorType, MGLIconTranslationAnchor>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::TranslateAnchorType>>(iconTranslationAnchor, false);
self.rawLayer->setIconTranslateAnchor(mbglValue);
@@ -1169,6 +1223,7 @@ namespace mbgl {
- (void)setTextColor:(NSExpression *)textColor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textColor: %@", textColor);
auto mbglValue = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toPropertyValue<mbgl::style::PropertyValue<mbgl::Color>>(textColor, true);
self.rawLayer->setTextColor(mbglValue);
@@ -1186,6 +1241,7 @@ namespace mbgl {
- (void)setTextColorTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textColorTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setTextColorTransition(options);
@@ -1204,6 +1260,7 @@ namespace mbgl {
- (void)setTextHaloBlur:(NSExpression *)textHaloBlur {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textHaloBlur: %@", textHaloBlur);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(textHaloBlur, true);
self.rawLayer->setTextHaloBlur(mbglValue);
@@ -1221,6 +1278,7 @@ namespace mbgl {
- (void)setTextHaloBlurTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textHaloBlurTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setTextHaloBlurTransition(options);
@@ -1239,6 +1297,7 @@ namespace mbgl {
- (void)setTextHaloColor:(NSExpression *)textHaloColor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textHaloColor: %@", textHaloColor);
auto mbglValue = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toPropertyValue<mbgl::style::PropertyValue<mbgl::Color>>(textHaloColor, true);
self.rawLayer->setTextHaloColor(mbglValue);
@@ -1256,6 +1315,7 @@ namespace mbgl {
- (void)setTextHaloColorTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textHaloColorTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setTextHaloColorTransition(options);
@@ -1274,6 +1334,7 @@ namespace mbgl {
- (void)setTextHaloWidth:(NSExpression *)textHaloWidth {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textHaloWidth: %@", textHaloWidth);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(textHaloWidth, true);
self.rawLayer->setTextHaloWidth(mbglValue);
@@ -1291,6 +1352,7 @@ namespace mbgl {
- (void)setTextHaloWidthTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textHaloWidthTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setTextHaloWidthTransition(options);
@@ -1309,6 +1371,7 @@ namespace mbgl {
- (void)setTextOpacity:(NSExpression *)textOpacity {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textOpacity: %@", textOpacity);
auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue<mbgl::style::PropertyValue<float>>(textOpacity, true);
self.rawLayer->setTextOpacity(mbglValue);
@@ -1326,6 +1389,7 @@ namespace mbgl {
- (void)setTextOpacityTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textOpacityTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setTextOpacityTransition(options);
@@ -1344,6 +1408,7 @@ namespace mbgl {
- (void)setTextTranslation:(NSExpression *)textTranslation {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textTranslation: %@", textTranslation);
auto mbglValue = MGLStyleValueTransformer<std::array<float, 2>, NSValue *>().toPropertyValue<mbgl::style::PropertyValue<std::array<float, 2>>>(textTranslation, false);
self.rawLayer->setTextTranslate(mbglValue);
@@ -1361,6 +1426,7 @@ namespace mbgl {
- (void)setTextTranslationTransition:(MGLTransition )transition {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textTranslationTransition: %@", NSStringFromMGLTransition(transition));
mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
self.rawLayer->setTextTranslateTransition(options);
@@ -1386,6 +1452,7 @@ namespace mbgl {
- (void)setTextTranslationAnchor:(NSExpression *)textTranslationAnchor {
MGLAssertStyleLayerIsValid();
+ MGLLogDebug(@"Setting textTranslationAnchor: %@", textTranslationAnchor);
auto mbglValue = MGLStyleValueTransformer<mbgl::style::TranslateAnchorType, NSValue *, mbgl::style::TranslateAnchorType, MGLTextTranslationAnchor>().toPropertyValue<mbgl::style::PropertyValue<mbgl::style::TranslateAnchorType>>(textTranslationAnchor, false);
self.rawLayer->setTextTranslateAnchor(mbglValue);
diff --git a/platform/darwin/src/MGLTypes.h b/platform/darwin/src/MGLTypes.h
index 035c6f6593..72b5d07a73 100644
--- a/platform/darwin/src/MGLTypes.h
+++ b/platform/darwin/src/MGLTypes.h
@@ -93,6 +93,10 @@ typedef struct __attribute__((objc_boxable)) MGLTransition {
NSTimeInterval delay;
} MGLTransition;
+NS_INLINE NSString *NSStringFromMGLTransition(MGLTransition transition) {
+ return [NSString stringWithFormat:@"transition { duration: %f, delay: %f }", transition.duration, transition.delay];
+}
+
/**
Creates a new `MGLTransition` from the given duration and delay.