[build] change style code generator to sort properties alphabetically

JSON keys in our style specification don't have a defined order. This change sorts them alphabetically so that we can rely on the order remaining them same across code generation runs.

10 files changed, 301 insertions, 301 deletions

diff --git a/include/mbgl/style/layers/background_layer.hpp b/include/mbgl/style/layers/background_layer.hpp
index 1e1f4b78a8..97ab2c0592 100644
--- a/include/mbgl/style/layers/background_layer.hpp
+++ b/include/mbgl/style/layers/background_layer.hpp
@@ -30,18 +30,18 @@ public:
     void setBackgroundColorTransition(const TransitionOptions&);
     TransitionOptions getBackgroundColorTransition() const;
 
-    static PropertyValue<std::string> getDefaultBackgroundPattern();
-    const PropertyValue<std::string>& getBackgroundPattern() const;
-    void setBackgroundPattern(const PropertyValue<std::string>&);
-    void setBackgroundPatternTransition(const TransitionOptions&);
-    TransitionOptions getBackgroundPatternTransition() const;
-
     static PropertyValue<float> getDefaultBackgroundOpacity();
     const PropertyValue<float>& getBackgroundOpacity() const;
     void setBackgroundOpacity(const PropertyValue<float>&);
     void setBackgroundOpacityTransition(const TransitionOptions&);
     TransitionOptions getBackgroundOpacityTransition() const;
 
+    static PropertyValue<std::string> getDefaultBackgroundPattern();
+    const PropertyValue<std::string>& getBackgroundPattern() const;
+    void setBackgroundPattern(const PropertyValue<std::string>&);
+    void setBackgroundPatternTransition(const TransitionOptions&);
+    TransitionOptions getBackgroundPatternTransition() const;
+
     // Private implementation
 
     class Impl;
diff --git a/include/mbgl/style/layers/circle_layer.hpp b/include/mbgl/style/layers/circle_layer.hpp
index 4095bc8fe7..62d29964f8 100644
--- a/include/mbgl/style/layers/circle_layer.hpp
+++ b/include/mbgl/style/layers/circle_layer.hpp
@@ -24,11 +24,11 @@ public:
 
     // Paint properties
 
-    static PropertyValue<float> getDefaultCircleRadius();
-    const PropertyValue<float>& getCircleRadius() const;
-    void setCircleRadius(const PropertyValue<float>&);
-    void setCircleRadiusTransition(const TransitionOptions&);
-    TransitionOptions getCircleRadiusTransition() const;
+    static PropertyValue<float> getDefaultCircleBlur();
+    const PropertyValue<float>& getCircleBlur() const;
+    void setCircleBlur(const PropertyValue<float>&);
+    void setCircleBlurTransition(const TransitionOptions&);
+    TransitionOptions getCircleBlurTransition() const;
 
     static PropertyValue<Color> getDefaultCircleColor();
     const PropertyValue<Color>& getCircleColor() const;
@@ -36,29 +36,17 @@ public:
     void setCircleColorTransition(const TransitionOptions&);
     TransitionOptions getCircleColorTransition() const;
 
-    static PropertyValue<float> getDefaultCircleBlur();
-    const PropertyValue<float>& getCircleBlur() const;
-    void setCircleBlur(const PropertyValue<float>&);
-    void setCircleBlurTransition(const TransitionOptions&);
-    TransitionOptions getCircleBlurTransition() const;
-
     static PropertyValue<float> getDefaultCircleOpacity();
     const PropertyValue<float>& getCircleOpacity() const;
     void setCircleOpacity(const PropertyValue<float>&);
     void setCircleOpacityTransition(const TransitionOptions&);
     TransitionOptions getCircleOpacityTransition() const;
 
-    static PropertyValue<std::array<float, 2>> getDefaultCircleTranslate();
-    const PropertyValue<std::array<float, 2>>& getCircleTranslate() const;
-    void setCircleTranslate(const PropertyValue<std::array<float, 2>>&);
-    void setCircleTranslateTransition(const TransitionOptions&);
-    TransitionOptions getCircleTranslateTransition() const;
-
-    static PropertyValue<TranslateAnchorType> getDefaultCircleTranslateAnchor();
-    const PropertyValue<TranslateAnchorType>& getCircleTranslateAnchor() const;
-    void setCircleTranslateAnchor(const PropertyValue<TranslateAnchorType>&);
-    void setCircleTranslateAnchorTransition(const TransitionOptions&);
-    TransitionOptions getCircleTranslateAnchorTransition() const;
+    static PropertyValue<AlignmentType> getDefaultCirclePitchAlignment();
+    const PropertyValue<AlignmentType>& getCirclePitchAlignment() const;
+    void setCirclePitchAlignment(const PropertyValue<AlignmentType>&);
+    void setCirclePitchAlignmentTransition(const TransitionOptions&);
+    TransitionOptions getCirclePitchAlignmentTransition() const;
 
     static PropertyValue<CirclePitchScaleType> getDefaultCirclePitchScale();
     const PropertyValue<CirclePitchScaleType>& getCirclePitchScale() const;
@@ -66,17 +54,11 @@ public:
     void setCirclePitchScaleTransition(const TransitionOptions&);
     TransitionOptions getCirclePitchScaleTransition() const;
 
-    static PropertyValue<AlignmentType> getDefaultCirclePitchAlignment();
-    const PropertyValue<AlignmentType>& getCirclePitchAlignment() const;
-    void setCirclePitchAlignment(const PropertyValue<AlignmentType>&);
-    void setCirclePitchAlignmentTransition(const TransitionOptions&);
-    TransitionOptions getCirclePitchAlignmentTransition() const;
-
-    static PropertyValue<float> getDefaultCircleStrokeWidth();
-    const PropertyValue<float>& getCircleStrokeWidth() const;
-    void setCircleStrokeWidth(const PropertyValue<float>&);
-    void setCircleStrokeWidthTransition(const TransitionOptions&);
-    TransitionOptions getCircleStrokeWidthTransition() const;
+    static PropertyValue<float> getDefaultCircleRadius();
+    const PropertyValue<float>& getCircleRadius() const;
+    void setCircleRadius(const PropertyValue<float>&);
+    void setCircleRadiusTransition(const TransitionOptions&);
+    TransitionOptions getCircleRadiusTransition() const;
 
     static PropertyValue<Color> getDefaultCircleStrokeColor();
     const PropertyValue<Color>& getCircleStrokeColor() const;
@@ -90,6 +72,24 @@ public:
     void setCircleStrokeOpacityTransition(const TransitionOptions&);
     TransitionOptions getCircleStrokeOpacityTransition() const;
 
+    static PropertyValue<float> getDefaultCircleStrokeWidth();
+    const PropertyValue<float>& getCircleStrokeWidth() const;
+    void setCircleStrokeWidth(const PropertyValue<float>&);
+    void setCircleStrokeWidthTransition(const TransitionOptions&);
+    TransitionOptions getCircleStrokeWidthTransition() const;
+
+    static PropertyValue<std::array<float, 2>> getDefaultCircleTranslate();
+    const PropertyValue<std::array<float, 2>>& getCircleTranslate() const;
+    void setCircleTranslate(const PropertyValue<std::array<float, 2>>&);
+    void setCircleTranslateTransition(const TransitionOptions&);
+    TransitionOptions getCircleTranslateTransition() const;
+
+    static PropertyValue<TranslateAnchorType> getDefaultCircleTranslateAnchor();
+    const PropertyValue<TranslateAnchorType>& getCircleTranslateAnchor() const;
+    void setCircleTranslateAnchor(const PropertyValue<TranslateAnchorType>&);
+    void setCircleTranslateAnchorTransition(const TransitionOptions&);
+    TransitionOptions getCircleTranslateAnchorTransition() const;
+
     // Private implementation
 
     class Impl;
diff --git a/include/mbgl/style/layers/fill_extrusion_layer.hpp b/include/mbgl/style/layers/fill_extrusion_layer.hpp
index 80152de80a..5ed9b6012c 100644
--- a/include/mbgl/style/layers/fill_extrusion_layer.hpp
+++ b/include/mbgl/style/layers/fill_extrusion_layer.hpp
@@ -24,11 +24,11 @@ public:
 
     // Paint properties
 
-    static PropertyValue<float> getDefaultFillExtrusionOpacity();
-    const PropertyValue<float>& getFillExtrusionOpacity() const;
-    void setFillExtrusionOpacity(const PropertyValue<float>&);
-    void setFillExtrusionOpacityTransition(const TransitionOptions&);
-    TransitionOptions getFillExtrusionOpacityTransition() const;
+    static PropertyValue<float> getDefaultFillExtrusionBase();
+    const PropertyValue<float>& getFillExtrusionBase() const;
+    void setFillExtrusionBase(const PropertyValue<float>&);
+    void setFillExtrusionBaseTransition(const TransitionOptions&);
+    TransitionOptions getFillExtrusionBaseTransition() const;
 
     static PropertyValue<Color> getDefaultFillExtrusionColor();
     const PropertyValue<Color>& getFillExtrusionColor() const;
@@ -36,6 +36,24 @@ public:
     void setFillExtrusionColorTransition(const TransitionOptions&);
     TransitionOptions getFillExtrusionColorTransition() const;
 
+    static PropertyValue<float> getDefaultFillExtrusionHeight();
+    const PropertyValue<float>& getFillExtrusionHeight() const;
+    void setFillExtrusionHeight(const PropertyValue<float>&);
+    void setFillExtrusionHeightTransition(const TransitionOptions&);
+    TransitionOptions getFillExtrusionHeightTransition() const;
+
+    static PropertyValue<float> getDefaultFillExtrusionOpacity();
+    const PropertyValue<float>& getFillExtrusionOpacity() const;
+    void setFillExtrusionOpacity(const PropertyValue<float>&);
+    void setFillExtrusionOpacityTransition(const TransitionOptions&);
+    TransitionOptions getFillExtrusionOpacityTransition() const;
+
+    static PropertyValue<std::string> getDefaultFillExtrusionPattern();
+    const PropertyValue<std::string>& getFillExtrusionPattern() const;
+    void setFillExtrusionPattern(const PropertyValue<std::string>&);
+    void setFillExtrusionPatternTransition(const TransitionOptions&);
+    TransitionOptions getFillExtrusionPatternTransition() const;
+
     static PropertyValue<std::array<float, 2>> getDefaultFillExtrusionTranslate();
     const PropertyValue<std::array<float, 2>>& getFillExtrusionTranslate() const;
     void setFillExtrusionTranslate(const PropertyValue<std::array<float, 2>>&);
@@ -48,24 +66,6 @@ public:
     void setFillExtrusionTranslateAnchorTransition(const TransitionOptions&);
     TransitionOptions getFillExtrusionTranslateAnchorTransition() const;
 
-    static PropertyValue<std::string> getDefaultFillExtrusionPattern();
-    const PropertyValue<std::string>& getFillExtrusionPattern() const;
-    void setFillExtrusionPattern(const PropertyValue<std::string>&);
-    void setFillExtrusionPatternTransition(const TransitionOptions&);
-    TransitionOptions getFillExtrusionPatternTransition() const;
-
-    static PropertyValue<float> getDefaultFillExtrusionHeight();
-    const PropertyValue<float>& getFillExtrusionHeight() const;
-    void setFillExtrusionHeight(const PropertyValue<float>&);
-    void setFillExtrusionHeightTransition(const TransitionOptions&);
-    TransitionOptions getFillExtrusionHeightTransition() const;
-
-    static PropertyValue<float> getDefaultFillExtrusionBase();
-    const PropertyValue<float>& getFillExtrusionBase() const;
-    void setFillExtrusionBase(const PropertyValue<float>&);
-    void setFillExtrusionBaseTransition(const TransitionOptions&);
-    TransitionOptions getFillExtrusionBaseTransition() const;
-
     static PropertyValue<bool> getDefaultFillExtrusionVerticalGradient();
     const PropertyValue<bool>& getFillExtrusionVerticalGradient() const;
     void setFillExtrusionVerticalGradient(const PropertyValue<bool>&);
diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp
index e4872a5fd8..e029ccc67e 100644
--- a/include/mbgl/style/layers/fill_layer.hpp
+++ b/include/mbgl/style/layers/fill_layer.hpp
@@ -30,24 +30,30 @@ public:
     void setFillAntialiasTransition(const TransitionOptions&);
     TransitionOptions getFillAntialiasTransition() const;
 
-    static PropertyValue<float> getDefaultFillOpacity();
-    const PropertyValue<float>& getFillOpacity() const;
-    void setFillOpacity(const PropertyValue<float>&);
-    void setFillOpacityTransition(const TransitionOptions&);
-    TransitionOptions getFillOpacityTransition() const;
-
     static PropertyValue<Color> getDefaultFillColor();
     const PropertyValue<Color>& getFillColor() const;
     void setFillColor(const PropertyValue<Color>&);
     void setFillColorTransition(const TransitionOptions&);
     TransitionOptions getFillColorTransition() const;
 
+    static PropertyValue<float> getDefaultFillOpacity();
+    const PropertyValue<float>& getFillOpacity() const;
+    void setFillOpacity(const PropertyValue<float>&);
+    void setFillOpacityTransition(const TransitionOptions&);
+    TransitionOptions getFillOpacityTransition() const;
+
     static PropertyValue<Color> getDefaultFillOutlineColor();
     const PropertyValue<Color>& getFillOutlineColor() const;
     void setFillOutlineColor(const PropertyValue<Color>&);
     void setFillOutlineColorTransition(const TransitionOptions&);
     TransitionOptions getFillOutlineColorTransition() const;
 
+    static PropertyValue<std::string> getDefaultFillPattern();
+    const PropertyValue<std::string>& getFillPattern() const;
+    void setFillPattern(const PropertyValue<std::string>&);
+    void setFillPatternTransition(const TransitionOptions&);
+    TransitionOptions getFillPatternTransition() const;
+
     static PropertyValue<std::array<float, 2>> getDefaultFillTranslate();
     const PropertyValue<std::array<float, 2>>& getFillTranslate() const;
     void setFillTranslate(const PropertyValue<std::array<float, 2>>&);
@@ -60,12 +66,6 @@ public:
     void setFillTranslateAnchorTransition(const TransitionOptions&);
     TransitionOptions getFillTranslateAnchorTransition() const;
 
-    static PropertyValue<std::string> getDefaultFillPattern();
-    const PropertyValue<std::string>& getFillPattern() const;
-    void setFillPattern(const PropertyValue<std::string>&);
-    void setFillPatternTransition(const TransitionOptions&);
-    TransitionOptions getFillPatternTransition() const;
-
     // Private implementation
 
     class Impl;
diff --git a/include/mbgl/style/layers/heatmap_layer.hpp b/include/mbgl/style/layers/heatmap_layer.hpp
index bbd9d6eb7b..d8863d9952 100644
--- a/include/mbgl/style/layers/heatmap_layer.hpp
+++ b/include/mbgl/style/layers/heatmap_layer.hpp
@@ -25,17 +25,11 @@ public:
 
     // Paint properties
 
-    static PropertyValue<float> getDefaultHeatmapRadius();
-    const PropertyValue<float>& getHeatmapRadius() const;
-    void setHeatmapRadius(const PropertyValue<float>&);
-    void setHeatmapRadiusTransition(const TransitionOptions&);
-    TransitionOptions getHeatmapRadiusTransition() const;
-
-    static PropertyValue<float> getDefaultHeatmapWeight();
-    const PropertyValue<float>& getHeatmapWeight() const;
-    void setHeatmapWeight(const PropertyValue<float>&);
-    void setHeatmapWeightTransition(const TransitionOptions&);
-    TransitionOptions getHeatmapWeightTransition() const;
+    static ColorRampPropertyValue getDefaultHeatmapColor();
+    const ColorRampPropertyValue& getHeatmapColor() const;
+    void setHeatmapColor(const ColorRampPropertyValue&);
+    void setHeatmapColorTransition(const TransitionOptions&);
+    TransitionOptions getHeatmapColorTransition() const;
 
     static PropertyValue<float> getDefaultHeatmapIntensity();
     const PropertyValue<float>& getHeatmapIntensity() const;
@@ -43,18 +37,24 @@ public:
     void setHeatmapIntensityTransition(const TransitionOptions&);
     TransitionOptions getHeatmapIntensityTransition() const;
 
-    static ColorRampPropertyValue getDefaultHeatmapColor();
-    const ColorRampPropertyValue& getHeatmapColor() const;
-    void setHeatmapColor(const ColorRampPropertyValue&);
-    void setHeatmapColorTransition(const TransitionOptions&);
-    TransitionOptions getHeatmapColorTransition() const;
-
     static PropertyValue<float> getDefaultHeatmapOpacity();
     const PropertyValue<float>& getHeatmapOpacity() const;
     void setHeatmapOpacity(const PropertyValue<float>&);
     void setHeatmapOpacityTransition(const TransitionOptions&);
     TransitionOptions getHeatmapOpacityTransition() const;
 
+    static PropertyValue<float> getDefaultHeatmapRadius();
+    const PropertyValue<float>& getHeatmapRadius() const;
+    void setHeatmapRadius(const PropertyValue<float>&);
+    void setHeatmapRadiusTransition(const TransitionOptions&);
+    TransitionOptions getHeatmapRadiusTransition() const;
+
+    static PropertyValue<float> getDefaultHeatmapWeight();
+    const PropertyValue<float>& getHeatmapWeight() const;
+    void setHeatmapWeight(const PropertyValue<float>&);
+    void setHeatmapWeightTransition(const TransitionOptions&);
+    TransitionOptions getHeatmapWeightTransition() const;
+
     // Private implementation
 
     class Impl;
diff --git a/include/mbgl/style/layers/hillshade_layer.hpp b/include/mbgl/style/layers/hillshade_layer.hpp
index d2eebadf9d..3ec3cdabad 100644
--- a/include/mbgl/style/layers/hillshade_layer.hpp
+++ b/include/mbgl/style/layers/hillshade_layer.hpp
@@ -24,17 +24,11 @@ public:
 
     // Paint properties
 
-    static PropertyValue<float> getDefaultHillshadeIlluminationDirection();
-    const PropertyValue<float>& getHillshadeIlluminationDirection() const;
-    void setHillshadeIlluminationDirection(const PropertyValue<float>&);
-    void setHillshadeIlluminationDirectionTransition(const TransitionOptions&);
-    TransitionOptions getHillshadeIlluminationDirectionTransition() const;
-
-    static PropertyValue<HillshadeIlluminationAnchorType> getDefaultHillshadeIlluminationAnchor();
-    const PropertyValue<HillshadeIlluminationAnchorType>& getHillshadeIlluminationAnchor() const;
-    void setHillshadeIlluminationAnchor(const PropertyValue<HillshadeIlluminationAnchorType>&);
-    void setHillshadeIlluminationAnchorTransition(const TransitionOptions&);
-    TransitionOptions getHillshadeIlluminationAnchorTransition() const;
+    static PropertyValue<Color> getDefaultHillshadeAccentColor();
+    const PropertyValue<Color>& getHillshadeAccentColor() const;
+    void setHillshadeAccentColor(const PropertyValue<Color>&);
+    void setHillshadeAccentColorTransition(const TransitionOptions&);
+    TransitionOptions getHillshadeAccentColorTransition() const;
 
     static PropertyValue<float> getDefaultHillshadeExaggeration();
     const PropertyValue<float>& getHillshadeExaggeration() const;
@@ -42,23 +36,29 @@ public:
     void setHillshadeExaggerationTransition(const TransitionOptions&);
     TransitionOptions getHillshadeExaggerationTransition() const;
 
-    static PropertyValue<Color> getDefaultHillshadeShadowColor();
-    const PropertyValue<Color>& getHillshadeShadowColor() const;
-    void setHillshadeShadowColor(const PropertyValue<Color>&);
-    void setHillshadeShadowColorTransition(const TransitionOptions&);
-    TransitionOptions getHillshadeShadowColorTransition() const;
-
     static PropertyValue<Color> getDefaultHillshadeHighlightColor();
     const PropertyValue<Color>& getHillshadeHighlightColor() const;
     void setHillshadeHighlightColor(const PropertyValue<Color>&);
     void setHillshadeHighlightColorTransition(const TransitionOptions&);
     TransitionOptions getHillshadeHighlightColorTransition() const;
 
-    static PropertyValue<Color> getDefaultHillshadeAccentColor();
-    const PropertyValue<Color>& getHillshadeAccentColor() const;
-    void setHillshadeAccentColor(const PropertyValue<Color>&);
-    void setHillshadeAccentColorTransition(const TransitionOptions&);
-    TransitionOptions getHillshadeAccentColorTransition() const;
+    static PropertyValue<HillshadeIlluminationAnchorType> getDefaultHillshadeIlluminationAnchor();
+    const PropertyValue<HillshadeIlluminationAnchorType>& getHillshadeIlluminationAnchor() const;
+    void setHillshadeIlluminationAnchor(const PropertyValue<HillshadeIlluminationAnchorType>&);
+    void setHillshadeIlluminationAnchorTransition(const TransitionOptions&);
+    TransitionOptions getHillshadeIlluminationAnchorTransition() const;
+
+    static PropertyValue<float> getDefaultHillshadeIlluminationDirection();
+    const PropertyValue<float>& getHillshadeIlluminationDirection() const;
+    void setHillshadeIlluminationDirection(const PropertyValue<float>&);
+    void setHillshadeIlluminationDirectionTransition(const TransitionOptions&);
+    TransitionOptions getHillshadeIlluminationDirectionTransition() const;
+
+    static PropertyValue<Color> getDefaultHillshadeShadowColor();
+    const PropertyValue<Color>& getHillshadeShadowColor() const;
+    void setHillshadeShadowColor(const PropertyValue<Color>&);
+    void setHillshadeShadowColorTransition(const TransitionOptions&);
+    TransitionOptions getHillshadeShadowColorTransition() const;
 
     // Private implementation
 
diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp
index 21fdb3653e..b68753705c 100644
--- a/include/mbgl/style/layers/line_layer.hpp
+++ b/include/mbgl/style/layers/line_layer.hpp
@@ -45,11 +45,11 @@ public:
 
     // Paint properties
 
-    static PropertyValue<float> getDefaultLineOpacity();
-    const PropertyValue<float>& getLineOpacity() const;
-    void setLineOpacity(const PropertyValue<float>&);
-    void setLineOpacityTransition(const TransitionOptions&);
-    TransitionOptions getLineOpacityTransition() const;
+    static PropertyValue<float> getDefaultLineBlur();
+    const PropertyValue<float>& getLineBlur() const;
+    void setLineBlur(const PropertyValue<float>&);
+    void setLineBlurTransition(const TransitionOptions&);
+    TransitionOptions getLineBlurTransition() const;
 
     static PropertyValue<Color> getDefaultLineColor();
     const PropertyValue<Color>& getLineColor() const;
@@ -57,23 +57,11 @@ public:
     void setLineColorTransition(const TransitionOptions&);
     TransitionOptions getLineColorTransition() const;
 
-    static PropertyValue<std::array<float, 2>> getDefaultLineTranslate();
-    const PropertyValue<std::array<float, 2>>& getLineTranslate() const;
-    void setLineTranslate(const PropertyValue<std::array<float, 2>>&);
-    void setLineTranslateTransition(const TransitionOptions&);
-    TransitionOptions getLineTranslateTransition() const;
-
-    static PropertyValue<TranslateAnchorType> getDefaultLineTranslateAnchor();
-    const PropertyValue<TranslateAnchorType>& getLineTranslateAnchor() const;
-    void setLineTranslateAnchor(const PropertyValue<TranslateAnchorType>&);
-    void setLineTranslateAnchorTransition(const TransitionOptions&);
-    TransitionOptions getLineTranslateAnchorTransition() const;
-
-    static PropertyValue<float> getDefaultLineWidth();
-    const PropertyValue<float>& getLineWidth() const;
-    void setLineWidth(const PropertyValue<float>&);
-    void setLineWidthTransition(const TransitionOptions&);
-    TransitionOptions getLineWidthTransition() const;
+    static PropertyValue<std::vector<float>> getDefaultLineDasharray();
+    const PropertyValue<std::vector<float>>& getLineDasharray() const;
+    void setLineDasharray(const PropertyValue<std::vector<float>>&);
+    void setLineDasharrayTransition(const TransitionOptions&);
+    TransitionOptions getLineDasharrayTransition() const;
 
     static PropertyValue<float> getDefaultLineGapWidth();
     const PropertyValue<float>& getLineGapWidth() const;
@@ -81,23 +69,23 @@ public:
     void setLineGapWidthTransition(const TransitionOptions&);
     TransitionOptions getLineGapWidthTransition() const;
 
+    static ColorRampPropertyValue getDefaultLineGradient();
+    const ColorRampPropertyValue& getLineGradient() const;
+    void setLineGradient(const ColorRampPropertyValue&);
+    void setLineGradientTransition(const TransitionOptions&);
+    TransitionOptions getLineGradientTransition() const;
+
     static PropertyValue<float> getDefaultLineOffset();
     const PropertyValue<float>& getLineOffset() const;
     void setLineOffset(const PropertyValue<float>&);
     void setLineOffsetTransition(const TransitionOptions&);
     TransitionOptions getLineOffsetTransition() const;
 
-    static PropertyValue<float> getDefaultLineBlur();
-    const PropertyValue<float>& getLineBlur() const;
-    void setLineBlur(const PropertyValue<float>&);
-    void setLineBlurTransition(const TransitionOptions&);
-    TransitionOptions getLineBlurTransition() const;
-
-    static PropertyValue<std::vector<float>> getDefaultLineDasharray();
-    const PropertyValue<std::vector<float>>& getLineDasharray() const;
-    void setLineDasharray(const PropertyValue<std::vector<float>>&);
-    void setLineDasharrayTransition(const TransitionOptions&);
-    TransitionOptions getLineDasharrayTransition() const;
+    static PropertyValue<float> getDefaultLineOpacity();
+    const PropertyValue<float>& getLineOpacity() const;
+    void setLineOpacity(const PropertyValue<float>&);
+    void setLineOpacityTransition(const TransitionOptions&);
+    TransitionOptions getLineOpacityTransition() const;
 
     static PropertyValue<std::string> getDefaultLinePattern();
     const PropertyValue<std::string>& getLinePattern() const;
@@ -105,11 +93,23 @@ public:
     void setLinePatternTransition(const TransitionOptions&);
     TransitionOptions getLinePatternTransition() const;
 
-    static ColorRampPropertyValue getDefaultLineGradient();
-    const ColorRampPropertyValue& getLineGradient() const;
-    void setLineGradient(const ColorRampPropertyValue&);
-    void setLineGradientTransition(const TransitionOptions&);
-    TransitionOptions getLineGradientTransition() const;
+    static PropertyValue<std::array<float, 2>> getDefaultLineTranslate();
+    const PropertyValue<std::array<float, 2>>& getLineTranslate() const;
+    void setLineTranslate(const PropertyValue<std::array<float, 2>>&);
+    void setLineTranslateTransition(const TransitionOptions&);
+    TransitionOptions getLineTranslateTransition() const;
+
+    static PropertyValue<TranslateAnchorType> getDefaultLineTranslateAnchor();
+    const PropertyValue<TranslateAnchorType>& getLineTranslateAnchor() const;
+    void setLineTranslateAnchor(const PropertyValue<TranslateAnchorType>&);
+    void setLineTranslateAnchorTransition(const TransitionOptions&);
+    TransitionOptions getLineTranslateAnchorTransition() const;
+
+    static PropertyValue<float> getDefaultLineWidth();
+    const PropertyValue<float>& getLineWidth() const;
+    void setLineWidth(const PropertyValue<float>&);
+    void setLineWidthTransition(const TransitionOptions&);
+    TransitionOptions getLineWidthTransition() const;
 
     // Private implementation
 
diff --git a/include/mbgl/style/layers/raster_layer.hpp b/include/mbgl/style/layers/raster_layer.hpp
index bdd9857c39..8bfb1b8e92 100644
--- a/include/mbgl/style/layers/raster_layer.hpp
+++ b/include/mbgl/style/layers/raster_layer.hpp
@@ -24,35 +24,17 @@ public:
 
     // Paint properties
 
-    static PropertyValue<float> getDefaultRasterOpacity();
-    const PropertyValue<float>& getRasterOpacity() const;
-    void setRasterOpacity(const PropertyValue<float>&);
-    void setRasterOpacityTransition(const TransitionOptions&);
-    TransitionOptions getRasterOpacityTransition() const;
-
-    static PropertyValue<float> getDefaultRasterHueRotate();
-    const PropertyValue<float>& getRasterHueRotate() const;
-    void setRasterHueRotate(const PropertyValue<float>&);
-    void setRasterHueRotateTransition(const TransitionOptions&);
-    TransitionOptions getRasterHueRotateTransition() const;
-
-    static PropertyValue<float> getDefaultRasterBrightnessMin();
-    const PropertyValue<float>& getRasterBrightnessMin() const;
-    void setRasterBrightnessMin(const PropertyValue<float>&);
-    void setRasterBrightnessMinTransition(const TransitionOptions&);
-    TransitionOptions getRasterBrightnessMinTransition() const;
-
     static PropertyValue<float> getDefaultRasterBrightnessMax();
     const PropertyValue<float>& getRasterBrightnessMax() const;
     void setRasterBrightnessMax(const PropertyValue<float>&);
     void setRasterBrightnessMaxTransition(const TransitionOptions&);
     TransitionOptions getRasterBrightnessMaxTransition() const;
 
-    static PropertyValue<float> getDefaultRasterSaturation();
-    const PropertyValue<float>& getRasterSaturation() const;
-    void setRasterSaturation(const PropertyValue<float>&);
-    void setRasterSaturationTransition(const TransitionOptions&);
-    TransitionOptions getRasterSaturationTransition() const;
+    static PropertyValue<float> getDefaultRasterBrightnessMin();
+    const PropertyValue<float>& getRasterBrightnessMin() const;
+    void setRasterBrightnessMin(const PropertyValue<float>&);
+    void setRasterBrightnessMinTransition(const TransitionOptions&);
+    TransitionOptions getRasterBrightnessMinTransition() const;
 
     static PropertyValue<float> getDefaultRasterContrast();
     const PropertyValue<float>& getRasterContrast() const;
@@ -60,17 +42,35 @@ public:
     void setRasterContrastTransition(const TransitionOptions&);
     TransitionOptions getRasterContrastTransition() const;
 
+    static PropertyValue<float> getDefaultRasterFadeDuration();
+    const PropertyValue<float>& getRasterFadeDuration() const;
+    void setRasterFadeDuration(const PropertyValue<float>&);
+    void setRasterFadeDurationTransition(const TransitionOptions&);
+    TransitionOptions getRasterFadeDurationTransition() const;
+
+    static PropertyValue<float> getDefaultRasterHueRotate();
+    const PropertyValue<float>& getRasterHueRotate() const;
+    void setRasterHueRotate(const PropertyValue<float>&);
+    void setRasterHueRotateTransition(const TransitionOptions&);
+    TransitionOptions getRasterHueRotateTransition() const;
+
+    static PropertyValue<float> getDefaultRasterOpacity();
+    const PropertyValue<float>& getRasterOpacity() const;
+    void setRasterOpacity(const PropertyValue<float>&);
+    void setRasterOpacityTransition(const TransitionOptions&);
+    TransitionOptions getRasterOpacityTransition() const;
+
     static PropertyValue<RasterResamplingType> getDefaultRasterResampling();
     const PropertyValue<RasterResamplingType>& getRasterResampling() const;
     void setRasterResampling(const PropertyValue<RasterResamplingType>&);
     void setRasterResamplingTransition(const TransitionOptions&);
     TransitionOptions getRasterResamplingTransition() const;
 
-    static PropertyValue<float> getDefaultRasterFadeDuration();
-    const PropertyValue<float>& getRasterFadeDuration() const;
-    void setRasterFadeDuration(const PropertyValue<float>&);
-    void setRasterFadeDurationTransition(const TransitionOptions&);
-    TransitionOptions getRasterFadeDurationTransition() const;
+    static PropertyValue<float> getDefaultRasterSaturation();
+    const PropertyValue<float>& getRasterSaturation() const;
+    void setRasterSaturation(const PropertyValue<float>&);
+    void setRasterSaturationTransition(const TransitionOptions&);
+    TransitionOptions getRasterSaturationTransition() const;
 
     // Private implementation
 
diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp
index 93275e6dd2..2493df6046 100644
--- a/include/mbgl/style/layers/symbol_layer.hpp
+++ b/include/mbgl/style/layers/symbol_layer.hpp
@@ -26,38 +26,46 @@ public:
 
     // Layout properties
 
-    static PropertyValue<SymbolPlacementType> getDefaultSymbolPlacement();
-    const PropertyValue<SymbolPlacementType>& getSymbolPlacement() const;
-    void setSymbolPlacement(const PropertyValue<SymbolPlacementType>&);
-
-    static PropertyValue<float> getDefaultSymbolSpacing();
-    const PropertyValue<float>& getSymbolSpacing() const;
-    void setSymbolSpacing(const PropertyValue<float>&);
-
-    static PropertyValue<bool> getDefaultSymbolAvoidEdges();
-    const PropertyValue<bool>& getSymbolAvoidEdges() const;
-    void setSymbolAvoidEdges(const PropertyValue<bool>&);
-
-    static PropertyValue<float> getDefaultSymbolSortKey();
-    const PropertyValue<float>& getSymbolSortKey() const;
-    void setSymbolSortKey(const PropertyValue<float>&);
-
-    static PropertyValue<SymbolZOrderType> getDefaultSymbolZOrder();
-    const PropertyValue<SymbolZOrderType>& getSymbolZOrder() const;
-    void setSymbolZOrder(const PropertyValue<SymbolZOrderType>&);
-
     static PropertyValue<bool> getDefaultIconAllowOverlap();
     const PropertyValue<bool>& getIconAllowOverlap() const;
     void setIconAllowOverlap(const PropertyValue<bool>&);
 
+    static PropertyValue<SymbolAnchorType> getDefaultIconAnchor();
+    const PropertyValue<SymbolAnchorType>& getIconAnchor() const;
+    void setIconAnchor(const PropertyValue<SymbolAnchorType>&);
+
     static PropertyValue<bool> getDefaultIconIgnorePlacement();
     const PropertyValue<bool>& getIconIgnorePlacement() const;
     void setIconIgnorePlacement(const PropertyValue<bool>&);
 
+    static PropertyValue<std::string> getDefaultIconImage();
+    const PropertyValue<std::string>& getIconImage() const;
+    void setIconImage(const PropertyValue<std::string>&);
+
+    static PropertyValue<bool> getDefaultIconKeepUpright();
+    const PropertyValue<bool>& getIconKeepUpright() const;
+    void setIconKeepUpright(const PropertyValue<bool>&);
+
+    static PropertyValue<std::array<float, 2>> getDefaultIconOffset();
+    const PropertyValue<std::array<float, 2>>& getIconOffset() const;
+    void setIconOffset(const PropertyValue<std::array<float, 2>>&);
+
     static PropertyValue<bool> getDefaultIconOptional();
     const PropertyValue<bool>& getIconOptional() const;
     void setIconOptional(const PropertyValue<bool>&);
 
+    static PropertyValue<float> getDefaultIconPadding();
+    const PropertyValue<float>& getIconPadding() const;
+    void setIconPadding(const PropertyValue<float>&);
+
+    static PropertyValue<AlignmentType> getDefaultIconPitchAlignment();
+    const PropertyValue<AlignmentType>& getIconPitchAlignment() const;
+    void setIconPitchAlignment(const PropertyValue<AlignmentType>&);
+
+    static PropertyValue<float> getDefaultIconRotate();
+    const PropertyValue<float>& getIconRotate() const;
+    void setIconRotate(const PropertyValue<float>&);
+
     static PropertyValue<AlignmentType> getDefaultIconRotationAlignment();
     const PropertyValue<AlignmentType>& getIconRotationAlignment() const;
     void setIconRotationAlignment(const PropertyValue<AlignmentType>&);
@@ -74,41 +82,33 @@ public:
     const PropertyValue<std::array<float, 4>>& getIconTextFitPadding() const;
     void setIconTextFitPadding(const PropertyValue<std::array<float, 4>>&);
 
-    static PropertyValue<std::string> getDefaultIconImage();
-    const PropertyValue<std::string>& getIconImage() const;
-    void setIconImage(const PropertyValue<std::string>&);
-
-    static PropertyValue<float> getDefaultIconRotate();
-    const PropertyValue<float>& getIconRotate() const;
-    void setIconRotate(const PropertyValue<float>&);
-
-    static PropertyValue<float> getDefaultIconPadding();
-    const PropertyValue<float>& getIconPadding() const;
-    void setIconPadding(const PropertyValue<float>&);
+    static PropertyValue<bool> getDefaultSymbolAvoidEdges();
+    const PropertyValue<bool>& getSymbolAvoidEdges() const;
+    void setSymbolAvoidEdges(const PropertyValue<bool>&);
 
-    static PropertyValue<bool> getDefaultIconKeepUpright();
-    const PropertyValue<bool>& getIconKeepUpright() const;
-    void setIconKeepUpright(const PropertyValue<bool>&);
+    static PropertyValue<SymbolPlacementType> getDefaultSymbolPlacement();
+    const PropertyValue<SymbolPlacementType>& getSymbolPlacement() const;
+    void setSymbolPlacement(const PropertyValue<SymbolPlacementType>&);
 
-    static PropertyValue<std::array<float, 2>> getDefaultIconOffset();
-    const PropertyValue<std::array<float, 2>>& getIconOffset() const;
-    void setIconOffset(const PropertyValue<std::array<float, 2>>&);
+    static PropertyValue<float> getDefaultSymbolSortKey();
+    const PropertyValue<float>& getSymbolSortKey() const;
+    void setSymbolSortKey(const PropertyValue<float>&);
 
-    static PropertyValue<SymbolAnchorType> getDefaultIconAnchor();
-    const PropertyValue<SymbolAnchorType>& getIconAnchor() const;
-    void setIconAnchor(const PropertyValue<SymbolAnchorType>&);
+    static PropertyValue<float> getDefaultSymbolSpacing();
+    const PropertyValue<float>& getSymbolSpacing() const;
+    void setSymbolSpacing(const PropertyValue<float>&);
 
-    static PropertyValue<AlignmentType> getDefaultIconPitchAlignment();
-    const PropertyValue<AlignmentType>& getIconPitchAlignment() const;
-    void setIconPitchAlignment(const PropertyValue<AlignmentType>&);
+    static PropertyValue<SymbolZOrderType> getDefaultSymbolZOrder();
+    const PropertyValue<SymbolZOrderType>& getSymbolZOrder() const;
+    void setSymbolZOrder(const PropertyValue<SymbolZOrderType>&);
 
-    static PropertyValue<AlignmentType> getDefaultTextPitchAlignment();
-    const PropertyValue<AlignmentType>& getTextPitchAlignment() const;
-    void setTextPitchAlignment(const PropertyValue<AlignmentType>&);
+    static PropertyValue<bool> getDefaultTextAllowOverlap();
+    const PropertyValue<bool>& getTextAllowOverlap() const;
+    void setTextAllowOverlap(const PropertyValue<bool>&);
 
-    static PropertyValue<AlignmentType> getDefaultTextRotationAlignment();
-    const PropertyValue<AlignmentType>& getTextRotationAlignment() const;
-    void setTextRotationAlignment(const PropertyValue<AlignmentType>&);
+    static PropertyValue<SymbolAnchorType> getDefaultTextAnchor();
+    const PropertyValue<SymbolAnchorType>& getTextAnchor() const;
+    void setTextAnchor(const PropertyValue<SymbolAnchorType>&);
 
     static PropertyValue<expression::Formatted> getDefaultTextField();
     const PropertyValue<expression::Formatted>& getTextField() const;
@@ -118,81 +118,75 @@ public:
     const PropertyValue<std::vector<std::string>>& getTextFont() const;
     void setTextFont(const PropertyValue<std::vector<std::string>>&);
 
-    static PropertyValue<float> getDefaultTextSize();
-    const PropertyValue<float>& getTextSize() const;
-    void setTextSize(const PropertyValue<float>&);
-
-    static PropertyValue<float> getDefaultTextMaxWidth();
-    const PropertyValue<float>& getTextMaxWidth() const;
-    void setTextMaxWidth(const PropertyValue<float>&);
-
-    static PropertyValue<float> getDefaultTextLineHeight();
-    const PropertyValue<float>& getTextLineHeight() const;
-    void setTextLineHeight(const PropertyValue<float>&);
-
-    static PropertyValue<float> getDefaultTextLetterSpacing();
-    const PropertyValue<float>& getTextLetterSpacing() const;
-    void setTextLetterSpacing(const PropertyValue<float>&);
+    static PropertyValue<bool> getDefaultTextIgnorePlacement();
+    const PropertyValue<bool>& getTextIgnorePlacement() const;
+    void setTextIgnorePlacement(const PropertyValue<bool>&);
 
     static PropertyValue<TextJustifyType> getDefaultTextJustify();
     const PropertyValue<TextJustifyType>& getTextJustify() const;
     void setTextJustify(const PropertyValue<TextJustifyType>&);
 
-    static PropertyValue<float> getDefaultTextRadialOffset();
-    const PropertyValue<float>& getTextRadialOffset() const;
-    void setTextRadialOffset(const PropertyValue<float>&);
+    static PropertyValue<bool> getDefaultTextKeepUpright();
+    const PropertyValue<bool>& getTextKeepUpright() const;
+    void setTextKeepUpright(const PropertyValue<bool>&);
 
-    static PropertyValue<std::vector<TextVariableAnchorType>> getDefaultTextVariableAnchor();
-    const PropertyValue<std::vector<TextVariableAnchorType>>& getTextVariableAnchor() const;
-    void setTextVariableAnchor(const PropertyValue<std::vector<TextVariableAnchorType>>&);
+    static PropertyValue<float> getDefaultTextLetterSpacing();
+    const PropertyValue<float>& getTextLetterSpacing() const;
+    void setTextLetterSpacing(const PropertyValue<float>&);
 
-    static PropertyValue<SymbolAnchorType> getDefaultTextAnchor();
-    const PropertyValue<SymbolAnchorType>& getTextAnchor() const;
-    void setTextAnchor(const PropertyValue<SymbolAnchorType>&);
+    static PropertyValue<float> getDefaultTextLineHeight();
+    const PropertyValue<float>& getTextLineHeight() const;
+    void setTextLineHeight(const PropertyValue<float>&);
 
     static PropertyValue<float> getDefaultTextMaxAngle();
     const PropertyValue<float>& getTextMaxAngle() const;
     void setTextMaxAngle(const PropertyValue<float>&);
 
-    static PropertyValue<float> getDefaultTextRotate();
-    const PropertyValue<float>& getTextRotate() const;
-    void setTextRotate(const PropertyValue<float>&);
+    static PropertyValue<float> getDefaultTextMaxWidth();
+    const PropertyValue<float>& getTextMaxWidth() const;
+    void setTextMaxWidth(const PropertyValue<float>&);
+
+    static PropertyValue<std::array<float, 2>> getDefaultTextOffset();
+    const PropertyValue<std::array<float, 2>>& getTextOffset() const;
+    void setTextOffset(const PropertyValue<std::array<float, 2>>&);
+
+    static PropertyValue<bool> getDefaultTextOptional();
+    const PropertyValue<bool>& getTextOptional() const;
+    void setTextOptional(const PropertyValue<bool>&);
 
     static PropertyValue<float> getDefaultTextPadding();
     const PropertyValue<float>& getTextPadding() const;
     void setTextPadding(const PropertyValue<float>&);
 
-    static PropertyValue<bool> getDefaultTextKeepUpright();
-    const PropertyValue<bool>& getTextKeepUpright() const;
-    void setTextKeepUpright(const PropertyValue<bool>&);
+    static PropertyValue<AlignmentType> getDefaultTextPitchAlignment();
+    const PropertyValue<AlignmentType>& getTextPitchAlignment() const;
+    void setTextPitchAlignment(const PropertyValue<AlignmentType>&);
 
-    static PropertyValue<TextTransformType> getDefaultTextTransform();
-    const PropertyValue<TextTransformType>& getTextTransform() const;
-    void setTextTransform(const PropertyValue<TextTransformType>&);
+    static PropertyValue<float> getDefaultTextRadialOffset();
+    const PropertyValue<float>& getTextRadialOffset() const;
+    void setTextRadialOffset(const PropertyValue<float>&);
 
-    static PropertyValue<std::array<float, 2>> getDefaultTextOffset();
-    const PropertyValue<std::array<float, 2>>& getTextOffset() const;
-    void setTextOffset(const PropertyValue<std::array<float, 2>>&);
+    static PropertyValue<float> getDefaultTextRotate();
+    const PropertyValue<float>& getTextRotate() const;
+    void setTextRotate(const PropertyValue<float>&);
 
-    static PropertyValue<bool> getDefaultTextAllowOverlap();
-    const PropertyValue<bool>& getTextAllowOverlap() const;
-    void setTextAllowOverlap(const PropertyValue<bool>&);
+    static PropertyValue<AlignmentType> getDefaultTextRotationAlignment();
+    const PropertyValue<AlignmentType>& getTextRotationAlignment() const;
+    void setTextRotationAlignment(const PropertyValue<AlignmentType>&);
 
-    static PropertyValue<bool> getDefaultTextIgnorePlacement();
-    const PropertyValue<bool>& getTextIgnorePlacement() const;
-    void setTextIgnorePlacement(const PropertyValue<bool>&);
+    static PropertyValue<float> getDefaultTextSize();
+    const PropertyValue<float>& getTextSize() const;
+    void setTextSize(const PropertyValue<float>&);
 
-    static PropertyValue<bool> getDefaultTextOptional();
-    const PropertyValue<bool>& getTextOptional() const;
-    void setTextOptional(const PropertyValue<bool>&);
+    static PropertyValue<TextTransformType> getDefaultTextTransform();
+    const PropertyValue<TextTransformType>& getTextTransform() const;
+    void setTextTransform(const PropertyValue<TextTransformType>&);
 
-    // Paint properties
+    static PropertyValue<std::vector<TextVariableAnchorType>> getDefaultTextVariableAnchor();
+    const PropertyValue<std::vector<TextVariableAnchorType>>& getTextVariableAnchor() const;
+    void setTextVariableAnchor(const PropertyValue<std::vector<TextVariableAnchorType>>&);
 
-    static PropertyValue<float> getDefaultIconOpacity();
-    const PropertyValue<float>& getIconOpacity() const;
-    void setIconOpacity(const PropertyValue<float>&);
-    void setIconOpacityTransition(const TransitionOptions&);
-    TransitionOptions getIconOpacityTransition() const;
+    // Paint properties
 
     static PropertyValue<Color> getDefaultIconColor();
     const PropertyValue<Color>& getIconColor() const;
@@ -200,6 +194,12 @@ public:
     void setIconColorTransition(const TransitionOptions&);
     TransitionOptions getIconColorTransition() const;
 
+    static PropertyValue<float> getDefaultIconHaloBlur();
+    const PropertyValue<float>& getIconHaloBlur() const;
+    void setIconHaloBlur(const PropertyValue<float>&);
+    void setIconHaloBlurTransition(const TransitionOptions&);
+    TransitionOptions getIconHaloBlurTransition() const;
+
     static PropertyValue<Color> getDefaultIconHaloColor();
     const PropertyValue<Color>& getIconHaloColor() const;
     void setIconHaloColor(const PropertyValue<Color>&);
@@ -212,11 +212,11 @@ public:
     void setIconHaloWidthTransition(const TransitionOptions&);
     TransitionOptions getIconHaloWidthTransition() const;
 
-    static PropertyValue<float> getDefaultIconHaloBlur();
-    const PropertyValue<float>& getIconHaloBlur() const;
-    void setIconHaloBlur(const PropertyValue<float>&);
-    void setIconHaloBlurTransition(const TransitionOptions&);
-    TransitionOptions getIconHaloBlurTransition() const;
+    static PropertyValue<float> getDefaultIconOpacity();
+    const PropertyValue<float>& getIconOpacity() const;
+    void setIconOpacity(const PropertyValue<float>&);
+    void setIconOpacityTransition(const TransitionOptions&);
+    TransitionOptions getIconOpacityTransition() const;
 
     static PropertyValue<std::array<float, 2>> getDefaultIconTranslate();
     const PropertyValue<std::array<float, 2>>& getIconTranslate() const;
@@ -230,18 +230,18 @@ public:
     void setIconTranslateAnchorTransition(const TransitionOptions&);
     TransitionOptions getIconTranslateAnchorTransition() const;
 
-    static PropertyValue<float> getDefaultTextOpacity();
-    const PropertyValue<float>& getTextOpacity() const;
-    void setTextOpacity(const PropertyValue<float>&);
-    void setTextOpacityTransition(const TransitionOptions&);
-    TransitionOptions getTextOpacityTransition() const;
-
     static PropertyValue<Color> getDefaultTextColor();
     const PropertyValue<Color>& getTextColor() const;
     void setTextColor(const PropertyValue<Color>&);
     void setTextColorTransition(const TransitionOptions&);
     TransitionOptions getTextColorTransition() const;
 
+    static PropertyValue<float> getDefaultTextHaloBlur();
+    const PropertyValue<float>& getTextHaloBlur() const;
+    void setTextHaloBlur(const PropertyValue<float>&);
+    void setTextHaloBlurTransition(const TransitionOptions&);
+    TransitionOptions getTextHaloBlurTransition() const;
+
     static PropertyValue<Color> getDefaultTextHaloColor();
     const PropertyValue<Color>& getTextHaloColor() const;
     void setTextHaloColor(const PropertyValue<Color>&);
@@ -254,11 +254,11 @@ public:
     void setTextHaloWidthTransition(const TransitionOptions&);
     TransitionOptions getTextHaloWidthTransition() const;
 
-    static PropertyValue<float> getDefaultTextHaloBlur();
-    const PropertyValue<float>& getTextHaloBlur() const;
-    void setTextHaloBlur(const PropertyValue<float>&);
-    void setTextHaloBlurTransition(const TransitionOptions&);
-    TransitionOptions getTextHaloBlurTransition() const;
+    static PropertyValue<float> getDefaultTextOpacity();
+    const PropertyValue<float>& getTextOpacity() const;
+    void setTextOpacity(const PropertyValue<float>&);
+    void setTextOpacityTransition(const TransitionOptions&);
+    TransitionOptions getTextOpacityTransition() const;
 
     static PropertyValue<std::array<float, 2>> getDefaultTextTranslate();
     const PropertyValue<std::array<float, 2>>& getTextTranslate() const;
diff --git a/include/mbgl/style/light.hpp b/include/mbgl/style/light.hpp
index c82792b28d..0b65df9f1b 100644
--- a/include/mbgl/style/light.hpp
+++ b/include/mbgl/style/light.hpp
@@ -23,12 +23,6 @@ public:
     void setAnchorTransition(const TransitionOptions&);
     TransitionOptions getAnchorTransition() const;
 
-    static Position getDefaultPosition();
-    PropertyValue<Position> getPosition() const;
-    void setPosition(PropertyValue<Position>);
-    void setPositionTransition(const TransitionOptions&);
-    TransitionOptions getPositionTransition() const;
-
     static Color getDefaultColor();
     PropertyValue<Color> getColor() const;
     void setColor(PropertyValue<Color>);
@@ -41,6 +35,12 @@ public:
     void setIntensityTransition(const TransitionOptions&);
     TransitionOptions getIntensityTransition() const;
 
+    static Position getDefaultPosition();
+    PropertyValue<Position> getPosition() const;
+    void setPosition(PropertyValue<Position>);
+    void setPositionTransition(const TransitionOptions&);
+    TransitionOptions getPositionTransition() const;
+
     class Impl;
     Immutable<Impl> impl;
     Mutable<Impl> mutableImpl() const;