[ios, macos] Rename function NSStringFromMGLTransition to MGLStringFromMGLTransition.

14 files changed, 69 insertions, 69 deletions

diff --git a/platform/darwin/src/MGLBackgroundStyleLayer.mm b/platform/darwin/src/MGLBackgroundStyleLayer.mm
index ffd44359ee..ceaf2ce475 100644
--- a/platform/darwin/src/MGLBackgroundStyleLayer.mm
+++ b/platform/darwin/src/MGLBackgroundStyleLayer.mm
@@ -54,7 +54,7 @@
 
 - (void)setBackgroundColorTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting backgroundColorTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting backgroundColorTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setBackgroundColorTransition(options);
@@ -91,7 +91,7 @@
 
 - (void)setBackgroundOpacityTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting backgroundOpacityTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting backgroundOpacityTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setBackgroundOpacityTransition(options);
@@ -128,7 +128,7 @@
 
 - (void)setBackgroundPatternTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting backgroundPatternTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting backgroundPatternTransition: %@", MGLStringFromMGLTransition(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 f5e77d430d..dd3729829c 100644
--- a/platform/darwin/src/MGLCircleStyleLayer.mm
+++ b/platform/darwin/src/MGLCircleStyleLayer.mm
@@ -111,7 +111,7 @@ namespace mbgl {
 
 - (void)setCircleBlurTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting circleBlurTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting circleBlurTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setCircleBlurTransition(options);
@@ -148,7 +148,7 @@ namespace mbgl {
 
 - (void)setCircleColorTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting circleColorTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting circleColorTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setCircleColorTransition(options);
@@ -185,7 +185,7 @@ namespace mbgl {
 
 - (void)setCircleOpacityTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting circleOpacityTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting circleOpacityTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setCircleOpacityTransition(options);
@@ -240,7 +240,7 @@ namespace mbgl {
 
 - (void)setCircleRadiusTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting circleRadiusTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting circleRadiusTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setCircleRadiusTransition(options);
@@ -302,7 +302,7 @@ namespace mbgl {
 
 - (void)setCircleStrokeColorTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting circleStrokeColorTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting circleStrokeColorTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setCircleStrokeColorTransition(options);
@@ -339,7 +339,7 @@ namespace mbgl {
 
 - (void)setCircleStrokeOpacityTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting circleStrokeOpacityTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting circleStrokeOpacityTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setCircleStrokeOpacityTransition(options);
@@ -376,7 +376,7 @@ namespace mbgl {
 
 - (void)setCircleStrokeWidthTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting circleStrokeWidthTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting circleStrokeWidthTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setCircleStrokeWidthTransition(options);
@@ -413,7 +413,7 @@ namespace mbgl {
 
 - (void)setCircleTranslationTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting circleTranslationTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting circleTranslationTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setCircleTranslateTransition(options);
diff --git a/platform/darwin/src/MGLFillExtrusionStyleLayer.mm b/platform/darwin/src/MGLFillExtrusionStyleLayer.mm
index ea9fa15db3..09a58e37bb 100644
--- a/platform/darwin/src/MGLFillExtrusionStyleLayer.mm
+++ b/platform/darwin/src/MGLFillExtrusionStyleLayer.mm
@@ -101,7 +101,7 @@ namespace mbgl {
 
 - (void)setFillExtrusionBaseTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting fillExtrusionBaseTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting fillExtrusionBaseTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setFillExtrusionBaseTransition(options);
@@ -138,7 +138,7 @@ namespace mbgl {
 
 - (void)setFillExtrusionColorTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting fillExtrusionColorTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting fillExtrusionColorTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setFillExtrusionColorTransition(options);
@@ -175,7 +175,7 @@ namespace mbgl {
 
 - (void)setFillExtrusionHeightTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting fillExtrusionHeightTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting fillExtrusionHeightTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setFillExtrusionHeightTransition(options);
@@ -212,7 +212,7 @@ namespace mbgl {
 
 - (void)setFillExtrusionOpacityTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting fillExtrusionOpacityTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting fillExtrusionOpacityTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setFillExtrusionOpacityTransition(options);
@@ -249,7 +249,7 @@ namespace mbgl {
 
 - (void)setFillExtrusionPatternTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting fillExtrusionPatternTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting fillExtrusionPatternTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setFillExtrusionPatternTransition(options);
@@ -286,7 +286,7 @@ namespace mbgl {
 
 - (void)setFillExtrusionTranslationTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting fillExtrusionTranslationTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting fillExtrusionTranslationTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setFillExtrusionTranslateTransition(options);
diff --git a/platform/darwin/src/MGLFillStyleLayer.mm b/platform/darwin/src/MGLFillStyleLayer.mm
index 20b3b68c34..1d4882edd3 100644
--- a/platform/darwin/src/MGLFillStyleLayer.mm
+++ b/platform/darwin/src/MGLFillStyleLayer.mm
@@ -126,7 +126,7 @@ namespace mbgl {
 
 - (void)setFillColorTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting fillColorTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting fillColorTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setFillColorTransition(options);
@@ -163,7 +163,7 @@ namespace mbgl {
 
 - (void)setFillOpacityTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting fillOpacityTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting fillOpacityTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setFillOpacityTransition(options);
@@ -200,7 +200,7 @@ namespace mbgl {
 
 - (void)setFillOutlineColorTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting fillOutlineColorTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting fillOutlineColorTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setFillOutlineColorTransition(options);
@@ -237,7 +237,7 @@ namespace mbgl {
 
 - (void)setFillPatternTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting fillPatternTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting fillPatternTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setFillPatternTransition(options);
@@ -274,7 +274,7 @@ namespace mbgl {
 
 - (void)setFillTranslationTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting fillTranslationTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting fillTranslationTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setFillTranslateTransition(options);
diff --git a/platform/darwin/src/MGLHeatmapStyleLayer.mm b/platform/darwin/src/MGLHeatmapStyleLayer.mm
index c02d7c0ac1..76675585f3 100644
--- a/platform/darwin/src/MGLHeatmapStyleLayer.mm
+++ b/platform/darwin/src/MGLHeatmapStyleLayer.mm
@@ -110,7 +110,7 @@
 
 - (void)setHeatmapIntensityTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting heatmapIntensityTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting heatmapIntensityTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setHeatmapIntensityTransition(options);
@@ -147,7 +147,7 @@
 
 - (void)setHeatmapOpacityTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting heatmapOpacityTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting heatmapOpacityTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setHeatmapOpacityTransition(options);
@@ -184,7 +184,7 @@
 
 - (void)setHeatmapRadiusTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting heatmapRadiusTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting heatmapRadiusTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setHeatmapRadiusTransition(options);
diff --git a/platform/darwin/src/MGLHillshadeStyleLayer.mm b/platform/darwin/src/MGLHillshadeStyleLayer.mm
index 53269b8087..dcc18ba54d 100644
--- a/platform/darwin/src/MGLHillshadeStyleLayer.mm
+++ b/platform/darwin/src/MGLHillshadeStyleLayer.mm
@@ -70,7 +70,7 @@ namespace mbgl {
 
 - (void)setHillshadeAccentColorTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting hillshadeAccentColorTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting hillshadeAccentColorTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setHillshadeAccentColorTransition(options);
@@ -107,7 +107,7 @@ namespace mbgl {
 
 - (void)setHillshadeExaggerationTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting hillshadeExaggerationTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting hillshadeExaggerationTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setHillshadeExaggerationTransition(options);
@@ -144,7 +144,7 @@ namespace mbgl {
 
 - (void)setHillshadeHighlightColorTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting hillshadeHighlightColorTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting hillshadeHighlightColorTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setHillshadeHighlightColorTransition(options);
@@ -217,7 +217,7 @@ namespace mbgl {
 
 - (void)setHillshadeShadowColorTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting hillshadeShadowColorTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting hillshadeShadowColorTransition: %@", MGLStringFromMGLTransition(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 ef6d2ddfcb..125dd94461 100644
--- a/platform/darwin/src/MGLLight.mm
+++ b/platform/darwin/src/MGLLight.mm
@@ -122,7 +122,7 @@ NS_INLINE mbgl::style::TransitionOptions MGLOptionsFromTransition(MGLTransition
 }
 
 - (void)setPositionTransition:(MGLTransition)transition {
-    MGLLogDebug(@"Setting positionTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting positionTransition: %@", MGLStringFromMGLTransition(transition));
     _positionTransition = transition;
 }
 
@@ -133,7 +133,7 @@ NS_INLINE mbgl::style::TransitionOptions MGLOptionsFromTransition(MGLTransition
 }
 
 - (void)setColorTransition:(MGLTransition)transition {
-    MGLLogDebug(@"Setting colorTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting colorTransition: %@", MGLStringFromMGLTransition(transition));
     _colorTransition = transition;
 }
 
@@ -144,7 +144,7 @@ NS_INLINE mbgl::style::TransitionOptions MGLOptionsFromTransition(MGLTransition
 }
 
 - (void)setIntensityTransition:(MGLTransition)transition {
-    MGLLogDebug(@"Setting intensityTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting intensityTransition: %@", MGLStringFromMGLTransition(transition));
     _intensityTransition = transition;
 }
 
diff --git a/platform/darwin/src/MGLLight.mm.ejs b/platform/darwin/src/MGLLight.mm.ejs
index a97ad28590..49db41c0ee 100644
--- a/platform/darwin/src/MGLLight.mm.ejs
+++ b/platform/darwin/src/MGLLight.mm.ejs
@@ -125,7 +125,7 @@ NS_INLINE mbgl::style::TransitionOptions MGLOptionsFromTransition(MGLTransition
 <% if (property["transition"]) { -%>
 
 - (void)set<%- camelize(property.name) %>Transition:(MGLTransition)transition {
-    MGLLogDebug(@"Setting <%- objCName(property) %>Transition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting <%- objCName(property) %>Transition: %@", MGLStringFromMGLTransition(transition));
     _<%- objCName(property) %>Transition = transition;
 }
 <% } -%>
diff --git a/platform/darwin/src/MGLLineStyleLayer.mm b/platform/darwin/src/MGLLineStyleLayer.mm
index c3a63fa7e1..1409a4608d 100644
--- a/platform/darwin/src/MGLLineStyleLayer.mm
+++ b/platform/darwin/src/MGLLineStyleLayer.mm
@@ -187,7 +187,7 @@ namespace mbgl {
 
 - (void)setLineBlurTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting lineBlurTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting lineBlurTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setLineBlurTransition(options);
@@ -224,7 +224,7 @@ namespace mbgl {
 
 - (void)setLineColorTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting lineColorTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting lineColorTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setLineColorTransition(options);
@@ -261,7 +261,7 @@ namespace mbgl {
 
 - (void)setLineDashPatternTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting lineDashPatternTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting lineDashPatternTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setLineDasharrayTransition(options);
@@ -305,7 +305,7 @@ namespace mbgl {
 
 - (void)setLineGapWidthTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting lineGapWidthTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting lineGapWidthTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setLineGapWidthTransition(options);
@@ -360,7 +360,7 @@ namespace mbgl {
 
 - (void)setLineOffsetTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting lineOffsetTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting lineOffsetTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setLineOffsetTransition(options);
@@ -397,7 +397,7 @@ namespace mbgl {
 
 - (void)setLineOpacityTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting lineOpacityTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting lineOpacityTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setLineOpacityTransition(options);
@@ -434,7 +434,7 @@ namespace mbgl {
 
 - (void)setLinePatternTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting linePatternTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting linePatternTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setLinePatternTransition(options);
@@ -471,7 +471,7 @@ namespace mbgl {
 
 - (void)setLineTranslationTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting lineTranslationTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting lineTranslationTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setLineTranslateTransition(options);
@@ -540,7 +540,7 @@ namespace mbgl {
 
 - (void)setLineWidthTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting lineWidthTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting lineWidthTransition: %@", MGLStringFromMGLTransition(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 8cb6b1bc95..7416400b2e 100644
--- a/platform/darwin/src/MGLRasterStyleLayer.mm
+++ b/platform/darwin/src/MGLRasterStyleLayer.mm
@@ -70,7 +70,7 @@ namespace mbgl {
 
 - (void)setMaximumRasterBrightnessTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting maximumRasterBrightnessTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting maximumRasterBrightnessTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setRasterBrightnessMaxTransition(options);
@@ -114,7 +114,7 @@ namespace mbgl {
 
 - (void)setMinimumRasterBrightnessTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting minimumRasterBrightnessTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting minimumRasterBrightnessTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setRasterBrightnessMinTransition(options);
@@ -158,7 +158,7 @@ namespace mbgl {
 
 - (void)setRasterContrastTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting rasterContrastTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting rasterContrastTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setRasterContrastTransition(options);
@@ -213,7 +213,7 @@ namespace mbgl {
 
 - (void)setRasterHueRotationTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting rasterHueRotationTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting rasterHueRotationTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setRasterHueRotateTransition(options);
@@ -257,7 +257,7 @@ namespace mbgl {
 
 - (void)setRasterOpacityTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting rasterOpacityTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting rasterOpacityTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setRasterOpacityTransition(options);
@@ -319,7 +319,7 @@ namespace mbgl {
 
 - (void)setRasterSaturationTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting rasterSaturationTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting rasterSaturationTransition: %@", MGLStringFromMGLTransition(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 61093867b8..b7be5fb9be 100644
--- a/platform/darwin/src/MGLStyleLayer.mm.ejs
+++ b/platform/darwin/src/MGLStyleLayer.mm.ejs
@@ -206,7 +206,7 @@ namespace mbgl {
 
 - (void)set<%- camelize(property.name) %>Transition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting <%- objCName(property) %>Transition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting <%- objCName(property) %>Transition: %@", MGLStringFromMGLTransition(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 5607bb43c3..cd293481fe 100644
--- a/platform/darwin/src/MGLSymbolStyleLayer.mm
+++ b/platform/darwin/src/MGLSymbolStyleLayer.mm
@@ -987,7 +987,7 @@ namespace mbgl {
 
 - (void)setIconColorTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting iconColorTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting iconColorTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setIconColorTransition(options);
@@ -1024,7 +1024,7 @@ namespace mbgl {
 
 - (void)setIconHaloBlurTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting iconHaloBlurTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting iconHaloBlurTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setIconHaloBlurTransition(options);
@@ -1061,7 +1061,7 @@ namespace mbgl {
 
 - (void)setIconHaloColorTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting iconHaloColorTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting iconHaloColorTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setIconHaloColorTransition(options);
@@ -1098,7 +1098,7 @@ namespace mbgl {
 
 - (void)setIconHaloWidthTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting iconHaloWidthTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting iconHaloWidthTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setIconHaloWidthTransition(options);
@@ -1135,7 +1135,7 @@ namespace mbgl {
 
 - (void)setIconOpacityTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting iconOpacityTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting iconOpacityTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setIconOpacityTransition(options);
@@ -1172,7 +1172,7 @@ namespace mbgl {
 
 - (void)setIconTranslationTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting iconTranslationTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting iconTranslationTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setIconTranslateTransition(options);
@@ -1241,7 +1241,7 @@ namespace mbgl {
 
 - (void)setTextColorTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting textColorTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting textColorTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setTextColorTransition(options);
@@ -1278,7 +1278,7 @@ namespace mbgl {
 
 - (void)setTextHaloBlurTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting textHaloBlurTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting textHaloBlurTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setTextHaloBlurTransition(options);
@@ -1315,7 +1315,7 @@ namespace mbgl {
 
 - (void)setTextHaloColorTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting textHaloColorTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting textHaloColorTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setTextHaloColorTransition(options);
@@ -1352,7 +1352,7 @@ namespace mbgl {
 
 - (void)setTextHaloWidthTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting textHaloWidthTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting textHaloWidthTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setTextHaloWidthTransition(options);
@@ -1389,7 +1389,7 @@ namespace mbgl {
 
 - (void)setTextOpacityTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting textOpacityTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting textOpacityTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setTextOpacityTransition(options);
@@ -1426,7 +1426,7 @@ namespace mbgl {
 
 - (void)setTextTranslationTransition:(MGLTransition )transition {
     MGLAssertStyleLayerIsValid();
-    MGLLogDebug(@"Setting textTranslationTransition: %@", NSStringFromMGLTransition(transition));
+    MGLLogDebug(@"Setting textTranslationTransition: %@", MGLStringFromMGLTransition(transition));
 
     mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } };
     self.rawLayer->setTextTranslateTransition(options);
diff --git a/platform/darwin/src/MGLTypes.h b/platform/darwin/src/MGLTypes.h
index 72b5d07a73..1cf52f20ce 100644
--- a/platform/darwin/src/MGLTypes.h
+++ b/platform/darwin/src/MGLTypes.h
@@ -93,7 +93,7 @@ typedef struct __attribute__((objc_boxable)) MGLTransition {
     NSTimeInterval delay;
 } MGLTransition;
 
-NS_INLINE NSString *NSStringFromMGLTransition(MGLTransition transition) {
+NS_INLINE NSString *MGLStringFromMGLTransition(MGLTransition transition) {
     return [NSString stringWithFormat:@"transition { duration: %f, delay: %f }", transition.duration, transition.delay];
 }
 
diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm
index a42ae5f842..c9e601a88d 100644
--- a/platform/macos/src/MGLMapView.mm
+++ b/platform/macos/src/MGLMapView.mm
@@ -991,7 +991,7 @@ public:
 }
 
 - (void)setCenterCoordinate:(CLLocationCoordinate2D)centerCoordinate animated:(BOOL)animated {
-    MGLLogDebug(@"Setting centerCoordinate: %@ animated: %@", NSStringFromCLLocationCoordinate2D(centerCoordinate), NSStringFromBOOL(animated));
+    MGLLogDebug(@"Setting centerCoordinate: %@ animated: %@", NSStringFromCLLocationCoordinate2D(centerCoordinate), MGLStringFromBOOL(animated));
     [self willChangeValueForKey:@"centerCoordinate"];
     _mbglMap->setLatLng(MGLLatLngFromLocationCoordinate2D(centerCoordinate),
                         MGLEdgeInsetsFromNSEdgeInsets(self.contentInsets),
@@ -1042,7 +1042,7 @@ public:
 }
 
 - (void)setZoomLevel:(double)zoomLevel animated:(BOOL)animated {
-    MGLLogDebug(@"Setting zoomLevel: %f animated: %@", zoomLevel, NSStringFromBOOL(animated));
+    MGLLogDebug(@"Setting zoomLevel: %f animated: %@", zoomLevel, MGLStringFromBOOL(animated));
     [self willChangeValueForKey:@"zoomLevel"];
     _mbglMap->setZoom(zoomLevel,
                       MGLEdgeInsetsFromNSEdgeInsets(self.contentInsets),
@@ -1114,7 +1114,7 @@ public:
 }
 
 - (void)setDirection:(CLLocationDirection)direction animated:(BOOL)animated {
-    MGLLogDebug(@"Setting direction: %f animated: %@", direction, NSStringFromBOOL(animated));
+    MGLLogDebug(@"Setting direction: %f animated: %@", direction, MGLStringFromBOOL(animated));
     [self willChangeValueForKey:@"direction"];
     _mbglMap->setBearing(direction,
                          MGLEdgeInsetsFromNSEdgeInsets(self.contentInsets),
@@ -1141,7 +1141,7 @@ public:
 }
 
 - (void)setCamera:(MGLMapCamera *)camera animated:(BOOL)animated {
-    MGLLogDebug(@"Setting camera: %@ animated: %@", camera, NSStringFromBOOL(animated));
+    MGLLogDebug(@"Setting camera: %@ animated: %@", camera, MGLStringFromBOOL(animated));
     [self setCamera:camera withDuration:animated ? MGLAnimationDuration : 0 animationTimingFunction:nil completionHandler:NULL];
 }
 
@@ -1264,7 +1264,7 @@ public:
 }
 
 - (void)setVisibleCoordinateBounds:(MGLCoordinateBounds)bounds animated:(BOOL)animated {
-    MGLLogDebug(@"Setting visibleCoordinateBounds: %@ animated: %@", MGLStringFromCoordinateBounds(bounds), NSStringFromBOOL(animated));
+    MGLLogDebug(@"Setting visibleCoordinateBounds: %@ animated: %@", MGLStringFromCoordinateBounds(bounds), MGLStringFromBOOL(animated));
     [self setVisibleCoordinateBounds:bounds edgePadding:NSEdgeInsetsZero animated:animated];
 }
 
@@ -2289,7 +2289,7 @@ public:
 
 - (void)selectAnnotation:(id <MGLAnnotation>)annotation atPoint:(NSPoint)gesturePoint moveOnscreen:(BOOL)moveOnscreen animateSelection:(BOOL)animateSelection
 {
-    MGLLogDebug(@"Selecting annotation: %@ atPoint: %@ moveOnscreen: %@ animateSelection: %@", annotation, NSStringFromPoint(gesturePoint), NSStringFromBOOL(moveOnscreen), NSStringFromBOOL(animateSelection));
+    MGLLogDebug(@"Selecting annotation: %@ atPoint: %@ moveOnscreen: %@ animateSelection: %@", annotation, NSStringFromPoint(gesturePoint), MGLStringFromBOOL(moveOnscreen), MGLStringFromBOOL(animateSelection));
     id <MGLAnnotation> selectedAnnotation = self.selectedAnnotation;
     if (annotation == selectedAnnotation) {
         return;
@@ -2401,7 +2401,7 @@ public:
 }
 
 - (void)showAnnotations:(NSArray<id <MGLAnnotation>> *)annotations animated:(BOOL)animated {
-    MGLLogDebug(@"Showing: %lu annotations animated: %@", annotations.count, NSStringFromBOOL(animated));
+    MGLLogDebug(@"Showing: %lu annotations animated: %@", annotations.count, MGLStringFromBOOL(animated));
     CGFloat maximumPadding = 100;
     CGFloat yPadding = (NSHeight(self.bounds) / 5 <= maximumPadding) ? (NSHeight(self.bounds) / 5) : maximumPadding;
     CGFloat xPadding = (NSWidth(self.bounds) / 5 <= maximumPadding) ? (NSWidth(self.bounds) / 5) : maximumPadding;