From 20712b7c84bd91bcf658d74bf25f3460354b5fd6 Mon Sep 17 00:00:00 2001
From: Fabian Guerra Soto <fabian.guerra@mapbox.com>
Date: Fri, 10 Mar 2017 11:33:31 -0800
Subject: Per-attribute transition properties on MGLStyleLayer (#8225)

* [ios, macos] new struct MGLTransition

* [ios] MGLTransition struct moved to MGLTypes.h

* [ios] MGLTransition implemented for style layer properties

* [ios, macos] added support for getting property transitions

* [ios, macos] updated to MGLDurationFromTimeInterval and MGLTimeIntervalFromDuration

* [ios, macos] added transition properties test

* [ios, macos] modified key strings imp

* [ios, macos] The impl for transition properties were changed to public methods

* [ios, macos] Changelog update

* [ios] Fixed layer space formatting

* [core] The name space was fixed for getters that returned TransitionOptions

* [ios, macos] Added rawLayer transition property tests

* [ios] Added a factory method for MGLTransition and transition-related methods to NSValue(MGLAdditions)

* [ios, macos] Copyedited changelog blurbs about transition properties
---
 include/mbgl/style/layers/background_layer.hpp     |  3 +++
 include/mbgl/style/layers/circle_layer.hpp         | 10 ++++++++++
 include/mbgl/style/layers/fill_extrusion_layer.hpp |  7 +++++++
 include/mbgl/style/layers/fill_layer.hpp           |  7 +++++++
 include/mbgl/style/layers/layer.hpp.ejs            |  1 +
 include/mbgl/style/layers/line_layer.hpp           | 10 ++++++++++
 include/mbgl/style/layers/raster_layer.hpp         |  7 +++++++
 include/mbgl/style/layers/symbol_layer.hpp         | 14 ++++++++++++++
 8 files changed, 59 insertions(+)

(limited to 'include')

diff --git a/include/mbgl/style/layers/background_layer.hpp b/include/mbgl/style/layers/background_layer.hpp
index 94076931e7..0de3302b7a 100644
--- a/include/mbgl/style/layers/background_layer.hpp
+++ b/include/mbgl/style/layers/background_layer.hpp
@@ -25,16 +25,19 @@ public:
     PropertyValue<Color> getBackgroundColor(const optional<std::string>& klass = {}) const;
     void setBackgroundColor(PropertyValue<Color>, const optional<std::string>& klass = {});
     void setBackgroundColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getBackgroundColorTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<std::string> getDefaultBackgroundPattern();
     PropertyValue<std::string> getBackgroundPattern(const optional<std::string>& klass = {}) const;
     void setBackgroundPattern(PropertyValue<std::string>, const optional<std::string>& klass = {});
     void setBackgroundPatternTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getBackgroundPatternTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<float> getDefaultBackgroundOpacity();
     PropertyValue<float> getBackgroundOpacity(const optional<std::string>& klass = {}) const;
     void setBackgroundOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
     void setBackgroundOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getBackgroundOpacityTransition(const optional<std::string>& klass = {}) const;
 
     // Private implementation
 
diff --git a/include/mbgl/style/layers/circle_layer.hpp b/include/mbgl/style/layers/circle_layer.hpp
index 35db4b3962..c12d476706 100644
--- a/include/mbgl/style/layers/circle_layer.hpp
+++ b/include/mbgl/style/layers/circle_layer.hpp
@@ -33,51 +33,61 @@ public:
     DataDrivenPropertyValue<float> getCircleRadius(const optional<std::string>& klass = {}) const;
     void setCircleRadius(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setCircleRadiusTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getCircleRadiusTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<Color> getDefaultCircleColor();
     DataDrivenPropertyValue<Color> getCircleColor(const optional<std::string>& klass = {}) const;
     void setCircleColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
     void setCircleColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getCircleColorTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<float> getDefaultCircleBlur();
     DataDrivenPropertyValue<float> getCircleBlur(const optional<std::string>& klass = {}) const;
     void setCircleBlur(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setCircleBlurTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getCircleBlurTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<float> getDefaultCircleOpacity();
     DataDrivenPropertyValue<float> getCircleOpacity(const optional<std::string>& klass = {}) const;
     void setCircleOpacity(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setCircleOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getCircleOpacityTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<std::array<float, 2>> getDefaultCircleTranslate();
     PropertyValue<std::array<float, 2>> getCircleTranslate(const optional<std::string>& klass = {}) const;
     void setCircleTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {});
     void setCircleTranslateTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getCircleTranslateTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<TranslateAnchorType> getDefaultCircleTranslateAnchor();
     PropertyValue<TranslateAnchorType> getCircleTranslateAnchor(const optional<std::string>& klass = {}) const;
     void setCircleTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
     void setCircleTranslateAnchorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getCircleTranslateAnchorTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<CirclePitchScaleType> getDefaultCirclePitchScale();
     PropertyValue<CirclePitchScaleType> getCirclePitchScale(const optional<std::string>& klass = {}) const;
     void setCirclePitchScale(PropertyValue<CirclePitchScaleType>, const optional<std::string>& klass = {});
     void setCirclePitchScaleTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getCirclePitchScaleTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<float> getDefaultCircleStrokeWidth();
     DataDrivenPropertyValue<float> getCircleStrokeWidth(const optional<std::string>& klass = {}) const;
     void setCircleStrokeWidth(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setCircleStrokeWidthTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getCircleStrokeWidthTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<Color> getDefaultCircleStrokeColor();
     DataDrivenPropertyValue<Color> getCircleStrokeColor(const optional<std::string>& klass = {}) const;
     void setCircleStrokeColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
     void setCircleStrokeColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getCircleStrokeColorTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<float> getDefaultCircleStrokeOpacity();
     DataDrivenPropertyValue<float> getCircleStrokeOpacity(const optional<std::string>& klass = {}) const;
     void setCircleStrokeOpacity(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setCircleStrokeOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getCircleStrokeOpacityTransition(const optional<std::string>& klass = {}) const;
 
     // Private implementation
 
diff --git a/include/mbgl/style/layers/fill_extrusion_layer.hpp b/include/mbgl/style/layers/fill_extrusion_layer.hpp
index c19a4ee168..31d517d016 100644
--- a/include/mbgl/style/layers/fill_extrusion_layer.hpp
+++ b/include/mbgl/style/layers/fill_extrusion_layer.hpp
@@ -33,36 +33,43 @@ public:
     PropertyValue<float> getFillExtrusionOpacity(const optional<std::string>& klass = {}) const;
     void setFillExtrusionOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
     void setFillExtrusionOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getFillExtrusionOpacityTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<Color> getDefaultFillExtrusionColor();
     DataDrivenPropertyValue<Color> getFillExtrusionColor(const optional<std::string>& klass = {}) const;
     void setFillExtrusionColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
     void setFillExtrusionColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getFillExtrusionColorTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<std::array<float, 2>> getDefaultFillExtrusionTranslate();
     PropertyValue<std::array<float, 2>> getFillExtrusionTranslate(const optional<std::string>& klass = {}) const;
     void setFillExtrusionTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {});
     void setFillExtrusionTranslateTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getFillExtrusionTranslateTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<TranslateAnchorType> getDefaultFillExtrusionTranslateAnchor();
     PropertyValue<TranslateAnchorType> getFillExtrusionTranslateAnchor(const optional<std::string>& klass = {}) const;
     void setFillExtrusionTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
     void setFillExtrusionTranslateAnchorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getFillExtrusionTranslateAnchorTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<std::string> getDefaultFillExtrusionPattern();
     PropertyValue<std::string> getFillExtrusionPattern(const optional<std::string>& klass = {}) const;
     void setFillExtrusionPattern(PropertyValue<std::string>, const optional<std::string>& klass = {});
     void setFillExtrusionPatternTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getFillExtrusionPatternTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<float> getDefaultFillExtrusionHeight();
     DataDrivenPropertyValue<float> getFillExtrusionHeight(const optional<std::string>& klass = {}) const;
     void setFillExtrusionHeight(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setFillExtrusionHeightTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getFillExtrusionHeightTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<float> getDefaultFillExtrusionBase();
     DataDrivenPropertyValue<float> getFillExtrusionBase(const optional<std::string>& klass = {}) const;
     void setFillExtrusionBase(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setFillExtrusionBaseTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getFillExtrusionBaseTransition(const optional<std::string>& klass = {}) const;
 
     // Private implementation
 
diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp
index c064eab350..aac4be92e2 100644
--- a/include/mbgl/style/layers/fill_layer.hpp
+++ b/include/mbgl/style/layers/fill_layer.hpp
@@ -33,36 +33,43 @@ public:
     PropertyValue<bool> getFillAntialias(const optional<std::string>& klass = {}) const;
     void setFillAntialias(PropertyValue<bool>, const optional<std::string>& klass = {});
     void setFillAntialiasTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getFillAntialiasTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<float> getDefaultFillOpacity();
     DataDrivenPropertyValue<float> getFillOpacity(const optional<std::string>& klass = {}) const;
     void setFillOpacity(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setFillOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getFillOpacityTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<Color> getDefaultFillColor();
     DataDrivenPropertyValue<Color> getFillColor(const optional<std::string>& klass = {}) const;
     void setFillColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
     void setFillColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getFillColorTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<Color> getDefaultFillOutlineColor();
     DataDrivenPropertyValue<Color> getFillOutlineColor(const optional<std::string>& klass = {}) const;
     void setFillOutlineColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
     void setFillOutlineColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getFillOutlineColorTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<std::array<float, 2>> getDefaultFillTranslate();
     PropertyValue<std::array<float, 2>> getFillTranslate(const optional<std::string>& klass = {}) const;
     void setFillTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {});
     void setFillTranslateTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getFillTranslateTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<TranslateAnchorType> getDefaultFillTranslateAnchor();
     PropertyValue<TranslateAnchorType> getFillTranslateAnchor(const optional<std::string>& klass = {}) const;
     void setFillTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
     void setFillTranslateAnchorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getFillTranslateAnchorTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<std::string> getDefaultFillPattern();
     PropertyValue<std::string> getFillPattern(const optional<std::string>& klass = {}) const;
     void setFillPattern(PropertyValue<std::string>, const optional<std::string>& klass = {});
     void setFillPatternTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getFillPatternTransition(const optional<std::string>& klass = {}) const;
 
     // Private implementation
 
diff --git a/include/mbgl/style/layers/layer.hpp.ejs b/include/mbgl/style/layers/layer.hpp.ejs
index d66eae8198..972d932b59 100644
--- a/include/mbgl/style/layers/layer.hpp.ejs
+++ b/include/mbgl/style/layers/layer.hpp.ejs
@@ -61,6 +61,7 @@ public:
     <%- propertyValueType(property) %> get<%- camelize(property.name) %>(const optional<std::string>& klass = {}) const;
     void set<%- camelize(property.name) %>(<%- propertyValueType(property) %>, const optional<std::string>& klass = {});
     void set<%- camelize(property.name) %>Transition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions get<%- camelize(property.name) %>Transition(const optional<std::string>& klass = {}) const;
 
 <% } -%>
     // Private implementation
diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp
index 2ed269ae74..756cc6f431 100644
--- a/include/mbgl/style/layers/line_layer.hpp
+++ b/include/mbgl/style/layers/line_layer.hpp
@@ -53,51 +53,61 @@ public:
     DataDrivenPropertyValue<float> getLineOpacity(const optional<std::string>& klass = {}) const;
     void setLineOpacity(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setLineOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getLineOpacityTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<Color> getDefaultLineColor();
     DataDrivenPropertyValue<Color> getLineColor(const optional<std::string>& klass = {}) const;
     void setLineColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
     void setLineColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getLineColorTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<std::array<float, 2>> getDefaultLineTranslate();
     PropertyValue<std::array<float, 2>> getLineTranslate(const optional<std::string>& klass = {}) const;
     void setLineTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {});
     void setLineTranslateTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getLineTranslateTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<TranslateAnchorType> getDefaultLineTranslateAnchor();
     PropertyValue<TranslateAnchorType> getLineTranslateAnchor(const optional<std::string>& klass = {}) const;
     void setLineTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
     void setLineTranslateAnchorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getLineTranslateAnchorTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<float> getDefaultLineWidth();
     PropertyValue<float> getLineWidth(const optional<std::string>& klass = {}) const;
     void setLineWidth(PropertyValue<float>, const optional<std::string>& klass = {});
     void setLineWidthTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getLineWidthTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<float> getDefaultLineGapWidth();
     DataDrivenPropertyValue<float> getLineGapWidth(const optional<std::string>& klass = {}) const;
     void setLineGapWidth(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setLineGapWidthTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getLineGapWidthTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<float> getDefaultLineOffset();
     DataDrivenPropertyValue<float> getLineOffset(const optional<std::string>& klass = {}) const;
     void setLineOffset(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setLineOffsetTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getLineOffsetTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<float> getDefaultLineBlur();
     DataDrivenPropertyValue<float> getLineBlur(const optional<std::string>& klass = {}) const;
     void setLineBlur(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setLineBlurTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getLineBlurTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<std::vector<float>> getDefaultLineDasharray();
     PropertyValue<std::vector<float>> getLineDasharray(const optional<std::string>& klass = {}) const;
     void setLineDasharray(PropertyValue<std::vector<float>>, const optional<std::string>& klass = {});
     void setLineDasharrayTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getLineDasharrayTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<std::string> getDefaultLinePattern();
     PropertyValue<std::string> getLinePattern(const optional<std::string>& klass = {}) const;
     void setLinePattern(PropertyValue<std::string>, const optional<std::string>& klass = {});
     void setLinePatternTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getLinePatternTransition(const optional<std::string>& klass = {}) const;
 
     // Private implementation
 
diff --git a/include/mbgl/style/layers/raster_layer.hpp b/include/mbgl/style/layers/raster_layer.hpp
index 72665baa72..3596a71f58 100644
--- a/include/mbgl/style/layers/raster_layer.hpp
+++ b/include/mbgl/style/layers/raster_layer.hpp
@@ -28,36 +28,43 @@ public:
     PropertyValue<float> getRasterOpacity(const optional<std::string>& klass = {}) const;
     void setRasterOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
     void setRasterOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getRasterOpacityTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<float> getDefaultRasterHueRotate();
     PropertyValue<float> getRasterHueRotate(const optional<std::string>& klass = {}) const;
     void setRasterHueRotate(PropertyValue<float>, const optional<std::string>& klass = {});
     void setRasterHueRotateTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getRasterHueRotateTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<float> getDefaultRasterBrightnessMin();
     PropertyValue<float> getRasterBrightnessMin(const optional<std::string>& klass = {}) const;
     void setRasterBrightnessMin(PropertyValue<float>, const optional<std::string>& klass = {});
     void setRasterBrightnessMinTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getRasterBrightnessMinTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<float> getDefaultRasterBrightnessMax();
     PropertyValue<float> getRasterBrightnessMax(const optional<std::string>& klass = {}) const;
     void setRasterBrightnessMax(PropertyValue<float>, const optional<std::string>& klass = {});
     void setRasterBrightnessMaxTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getRasterBrightnessMaxTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<float> getDefaultRasterSaturation();
     PropertyValue<float> getRasterSaturation(const optional<std::string>& klass = {}) const;
     void setRasterSaturation(PropertyValue<float>, const optional<std::string>& klass = {});
     void setRasterSaturationTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getRasterSaturationTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<float> getDefaultRasterContrast();
     PropertyValue<float> getRasterContrast(const optional<std::string>& klass = {}) const;
     void setRasterContrast(PropertyValue<float>, const optional<std::string>& klass = {});
     void setRasterContrastTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getRasterContrastTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<float> getDefaultRasterFadeDuration();
     PropertyValue<float> getRasterFadeDuration(const optional<std::string>& klass = {}) const;
     void setRasterFadeDuration(PropertyValue<float>, const optional<std::string>& klass = {});
     void setRasterFadeDurationTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getRasterFadeDurationTransition(const optional<std::string>& klass = {}) const;
 
     // Private implementation
 
diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp
index aeccabb97e..d24f808bac 100644
--- a/include/mbgl/style/layers/symbol_layer.hpp
+++ b/include/mbgl/style/layers/symbol_layer.hpp
@@ -173,71 +173,85 @@ public:
     DataDrivenPropertyValue<float> getIconOpacity(const optional<std::string>& klass = {}) const;
     void setIconOpacity(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setIconOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getIconOpacityTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<Color> getDefaultIconColor();
     DataDrivenPropertyValue<Color> getIconColor(const optional<std::string>& klass = {}) const;
     void setIconColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
     void setIconColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getIconColorTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<Color> getDefaultIconHaloColor();
     DataDrivenPropertyValue<Color> getIconHaloColor(const optional<std::string>& klass = {}) const;
     void setIconHaloColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
     void setIconHaloColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getIconHaloColorTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<float> getDefaultIconHaloWidth();
     DataDrivenPropertyValue<float> getIconHaloWidth(const optional<std::string>& klass = {}) const;
     void setIconHaloWidth(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setIconHaloWidthTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getIconHaloWidthTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<float> getDefaultIconHaloBlur();
     DataDrivenPropertyValue<float> getIconHaloBlur(const optional<std::string>& klass = {}) const;
     void setIconHaloBlur(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setIconHaloBlurTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getIconHaloBlurTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<std::array<float, 2>> getDefaultIconTranslate();
     PropertyValue<std::array<float, 2>> getIconTranslate(const optional<std::string>& klass = {}) const;
     void setIconTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {});
     void setIconTranslateTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getIconTranslateTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<TranslateAnchorType> getDefaultIconTranslateAnchor();
     PropertyValue<TranslateAnchorType> getIconTranslateAnchor(const optional<std::string>& klass = {}) const;
     void setIconTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
     void setIconTranslateAnchorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getIconTranslateAnchorTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<float> getDefaultTextOpacity();
     DataDrivenPropertyValue<float> getTextOpacity(const optional<std::string>& klass = {}) const;
     void setTextOpacity(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setTextOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getTextOpacityTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<Color> getDefaultTextColor();
     DataDrivenPropertyValue<Color> getTextColor(const optional<std::string>& klass = {}) const;
     void setTextColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
     void setTextColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getTextColorTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<Color> getDefaultTextHaloColor();
     DataDrivenPropertyValue<Color> getTextHaloColor(const optional<std::string>& klass = {}) const;
     void setTextHaloColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
     void setTextHaloColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getTextHaloColorTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<float> getDefaultTextHaloWidth();
     DataDrivenPropertyValue<float> getTextHaloWidth(const optional<std::string>& klass = {}) const;
     void setTextHaloWidth(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setTextHaloWidthTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getTextHaloWidthTransition(const optional<std::string>& klass = {}) const;
 
     static DataDrivenPropertyValue<float> getDefaultTextHaloBlur();
     DataDrivenPropertyValue<float> getTextHaloBlur(const optional<std::string>& klass = {}) const;
     void setTextHaloBlur(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setTextHaloBlurTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getTextHaloBlurTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<std::array<float, 2>> getDefaultTextTranslate();
     PropertyValue<std::array<float, 2>> getTextTranslate(const optional<std::string>& klass = {}) const;
     void setTextTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {});
     void setTextTranslateTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getTextTranslateTransition(const optional<std::string>& klass = {}) const;
 
     static PropertyValue<TranslateAnchorType> getDefaultTextTranslateAnchor();
     PropertyValue<TranslateAnchorType> getTextTranslateAnchor(const optional<std::string>& klass = {}) const;
     void setTextTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
     void setTextTranslateAnchorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
+    TransitionOptions getTextTranslateAnchorTransition(const optional<std::string>& klass = {}) const;
 
     // Private implementation
 
-- 
cgit v1.2.1