From 63cce78cf1597ba5879227f2298bda52e91e4e04 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 23 Aug 2016 12:49:47 -0700
Subject: [core] Add static getters for property default values (#6124)

---
 include/mbgl/style/layers/background_layer.hpp |  3 ++
 include/mbgl/style/layers/circle_layer.hpp     |  7 ++++
 include/mbgl/style/layers/fill_layer.hpp       |  7 ++++
 include/mbgl/style/layers/layer.hpp.ejs        |  2 ++
 include/mbgl/style/layers/line_layer.hpp       | 14 ++++++++
 include/mbgl/style/layers/raster_layer.hpp     |  7 ++++
 include/mbgl/style/layers/symbol_layer.hpp     | 48 ++++++++++++++++++++++++++
 7 files changed, 88 insertions(+)

(limited to 'include/mbgl/style/layers')

diff --git a/include/mbgl/style/layers/background_layer.hpp b/include/mbgl/style/layers/background_layer.hpp
index ac97ec2e6d..68aebfd37c 100644
--- a/include/mbgl/style/layers/background_layer.hpp
+++ b/include/mbgl/style/layers/background_layer.hpp
@@ -18,12 +18,15 @@ public:
 
     // Paint properties
 
+    static PropertyValue<Color> getDefaultBackgroundColor();
     PropertyValue<Color> getBackgroundColor() const;
     void setBackgroundColor(PropertyValue<Color>, const optional<std::string>& klass = {});
 
+    static PropertyValue<std::string> getDefaultBackgroundPattern();
     PropertyValue<std::string> getBackgroundPattern() const;
     void setBackgroundPattern(PropertyValue<std::string>, const optional<std::string>& klass = {});
 
+    static PropertyValue<float> getDefaultBackgroundOpacity();
     PropertyValue<float> getBackgroundOpacity() const;
     void setBackgroundOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
 
diff --git a/include/mbgl/style/layers/circle_layer.hpp b/include/mbgl/style/layers/circle_layer.hpp
index 873f95bcff..39ea61c5f3 100644
--- a/include/mbgl/style/layers/circle_layer.hpp
+++ b/include/mbgl/style/layers/circle_layer.hpp
@@ -26,24 +26,31 @@ public:
 
     // Paint properties
 
+    static PropertyValue<float> getDefaultCircleRadius();
     PropertyValue<float> getCircleRadius() const;
     void setCircleRadius(PropertyValue<float>, const optional<std::string>& klass = {});
 
+    static PropertyValue<Color> getDefaultCircleColor();
     PropertyValue<Color> getCircleColor() const;
     void setCircleColor(PropertyValue<Color>, const optional<std::string>& klass = {});
 
+    static PropertyValue<float> getDefaultCircleBlur();
     PropertyValue<float> getCircleBlur() const;
     void setCircleBlur(PropertyValue<float>, const optional<std::string>& klass = {});
 
+    static PropertyValue<float> getDefaultCircleOpacity();
     PropertyValue<float> getCircleOpacity() const;
     void setCircleOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
 
+    static PropertyValue<std::array<float, 2>> getDefaultCircleTranslate();
     PropertyValue<std::array<float, 2>> getCircleTranslate() const;
     void setCircleTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {});
 
+    static PropertyValue<TranslateAnchorType> getDefaultCircleTranslateAnchor();
     PropertyValue<TranslateAnchorType> getCircleTranslateAnchor() const;
     void setCircleTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
 
+    static PropertyValue<CirclePitchScaleType> getDefaultCirclePitchScale();
     PropertyValue<CirclePitchScaleType> getCirclePitchScale() const;
     void setCirclePitchScale(PropertyValue<CirclePitchScaleType>, const optional<std::string>& klass = {});
 
diff --git a/include/mbgl/style/layers/fill_layer.hpp b/include/mbgl/style/layers/fill_layer.hpp
index e70d67f538..72bb7c498f 100644
--- a/include/mbgl/style/layers/fill_layer.hpp
+++ b/include/mbgl/style/layers/fill_layer.hpp
@@ -26,24 +26,31 @@ public:
 
     // Paint properties
 
+    static PropertyValue<bool> getDefaultFillAntialias();
     PropertyValue<bool> getFillAntialias() const;
     void setFillAntialias(PropertyValue<bool>, const optional<std::string>& klass = {});
 
+    static PropertyValue<float> getDefaultFillOpacity();
     PropertyValue<float> getFillOpacity() const;
     void setFillOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
 
+    static PropertyValue<Color> getDefaultFillColor();
     PropertyValue<Color> getFillColor() const;
     void setFillColor(PropertyValue<Color>, const optional<std::string>& klass = {});
 
+    static PropertyValue<Color> getDefaultFillOutlineColor();
     PropertyValue<Color> getFillOutlineColor() const;
     void setFillOutlineColor(PropertyValue<Color>, const optional<std::string>& klass = {});
 
+    static PropertyValue<std::array<float, 2>> getDefaultFillTranslate();
     PropertyValue<std::array<float, 2>> getFillTranslate() const;
     void setFillTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {});
 
+    static PropertyValue<TranslateAnchorType> getDefaultFillTranslateAnchor();
     PropertyValue<TranslateAnchorType> getFillTranslateAnchor() const;
     void setFillTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
 
+    static PropertyValue<std::string> getDefaultFillPattern();
     PropertyValue<std::string> getFillPattern() const;
     void setFillPattern(PropertyValue<std::string>, const optional<std::string>& klass = {});
 
diff --git a/include/mbgl/style/layers/layer.hpp.ejs b/include/mbgl/style/layers/layer.hpp.ejs
index aaae30287c..9d542b75b6 100644
--- a/include/mbgl/style/layers/layer.hpp.ejs
+++ b/include/mbgl/style/layers/layer.hpp.ejs
@@ -45,6 +45,7 @@ public:
     // Layout properties
 
 <% for (const property of layoutProperties) { -%>
+    static PropertyValue<<%- propertyType(property) %>> getDefault<%- camelize(property.name) %>();
     PropertyValue<<%- propertyType(property) %>> get<%- camelize(property.name) %>() const;
     void set<%- camelize(property.name) %>(PropertyValue<<%- propertyType(property) %>>);
 
@@ -53,6 +54,7 @@ public:
     // Paint properties
 
 <% for (const property of paintProperties) { -%>
+    static PropertyValue<<%- propertyType(property) %>> getDefault<%- camelize(property.name) %>();
     PropertyValue<<%- propertyType(property) %>> get<%- camelize(property.name) %>() const;
     void set<%- camelize(property.name) %>(PropertyValue<<%- propertyType(property) %>>, const optional<std::string>& klass = {});
 
diff --git a/include/mbgl/style/layers/line_layer.hpp b/include/mbgl/style/layers/line_layer.hpp
index abcb425b96..8549ad0a6c 100644
--- a/include/mbgl/style/layers/line_layer.hpp
+++ b/include/mbgl/style/layers/line_layer.hpp
@@ -28,47 +28,61 @@ public:
 
     // Layout properties
 
+    static PropertyValue<LineCapType> getDefaultLineCap();
     PropertyValue<LineCapType> getLineCap() const;
     void setLineCap(PropertyValue<LineCapType>);
 
+    static PropertyValue<LineJoinType> getDefaultLineJoin();
     PropertyValue<LineJoinType> getLineJoin() const;
     void setLineJoin(PropertyValue<LineJoinType>);
 
+    static PropertyValue<float> getDefaultLineMiterLimit();
     PropertyValue<float> getLineMiterLimit() const;
     void setLineMiterLimit(PropertyValue<float>);
 
+    static PropertyValue<float> getDefaultLineRoundLimit();
     PropertyValue<float> getLineRoundLimit() const;
     void setLineRoundLimit(PropertyValue<float>);
 
     // Paint properties
 
+    static PropertyValue<float> getDefaultLineOpacity();
     PropertyValue<float> getLineOpacity() const;
     void setLineOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
 
+    static PropertyValue<Color> getDefaultLineColor();
     PropertyValue<Color> getLineColor() const;
     void setLineColor(PropertyValue<Color>, const optional<std::string>& klass = {});
 
+    static PropertyValue<std::array<float, 2>> getDefaultLineTranslate();
     PropertyValue<std::array<float, 2>> getLineTranslate() const;
     void setLineTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {});
 
+    static PropertyValue<TranslateAnchorType> getDefaultLineTranslateAnchor();
     PropertyValue<TranslateAnchorType> getLineTranslateAnchor() const;
     void setLineTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
 
+    static PropertyValue<float> getDefaultLineWidth();
     PropertyValue<float> getLineWidth() const;
     void setLineWidth(PropertyValue<float>, const optional<std::string>& klass = {});
 
+    static PropertyValue<float> getDefaultLineGapWidth();
     PropertyValue<float> getLineGapWidth() const;
     void setLineGapWidth(PropertyValue<float>, const optional<std::string>& klass = {});
 
+    static PropertyValue<float> getDefaultLineOffset();
     PropertyValue<float> getLineOffset() const;
     void setLineOffset(PropertyValue<float>, const optional<std::string>& klass = {});
 
+    static PropertyValue<float> getDefaultLineBlur();
     PropertyValue<float> getLineBlur() const;
     void setLineBlur(PropertyValue<float>, const optional<std::string>& klass = {});
 
+    static PropertyValue<std::vector<float>> getDefaultLineDasharray();
     PropertyValue<std::vector<float>> getLineDasharray() const;
     void setLineDasharray(PropertyValue<std::vector<float>>, const optional<std::string>& klass = {});
 
+    static PropertyValue<std::string> getDefaultLinePattern();
     PropertyValue<std::string> getLinePattern() const;
     void setLinePattern(PropertyValue<std::string>, const optional<std::string>& klass = {});
 
diff --git a/include/mbgl/style/layers/raster_layer.hpp b/include/mbgl/style/layers/raster_layer.hpp
index dea0c26bf3..c5479bd2ab 100644
--- a/include/mbgl/style/layers/raster_layer.hpp
+++ b/include/mbgl/style/layers/raster_layer.hpp
@@ -21,24 +21,31 @@ public:
 
     // Paint properties
 
+    static PropertyValue<float> getDefaultRasterOpacity();
     PropertyValue<float> getRasterOpacity() const;
     void setRasterOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
 
+    static PropertyValue<float> getDefaultRasterHueRotate();
     PropertyValue<float> getRasterHueRotate() const;
     void setRasterHueRotate(PropertyValue<float>, const optional<std::string>& klass = {});
 
+    static PropertyValue<float> getDefaultRasterBrightnessMin();
     PropertyValue<float> getRasterBrightnessMin() const;
     void setRasterBrightnessMin(PropertyValue<float>, const optional<std::string>& klass = {});
 
+    static PropertyValue<float> getDefaultRasterBrightnessMax();
     PropertyValue<float> getRasterBrightnessMax() const;
     void setRasterBrightnessMax(PropertyValue<float>, const optional<std::string>& klass = {});
 
+    static PropertyValue<float> getDefaultRasterSaturation();
     PropertyValue<float> getRasterSaturation() const;
     void setRasterSaturation(PropertyValue<float>, const optional<std::string>& klass = {});
 
+    static PropertyValue<float> getDefaultRasterContrast();
     PropertyValue<float> getRasterContrast() const;
     void setRasterContrast(PropertyValue<float>, const optional<std::string>& klass = {});
 
+    static PropertyValue<float> getDefaultRasterFadeDuration();
     PropertyValue<float> getRasterFadeDuration() const;
     void setRasterFadeDuration(PropertyValue<float>, const optional<std::string>& klass = {});
 
diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp
index 77b63d9b91..5d1882fd4b 100644
--- a/include/mbgl/style/layers/symbol_layer.hpp
+++ b/include/mbgl/style/layers/symbol_layer.hpp
@@ -28,149 +28,197 @@ public:
 
     // Layout properties
 
+    static PropertyValue<SymbolPlacementType> getDefaultSymbolPlacement();
     PropertyValue<SymbolPlacementType> getSymbolPlacement() const;
     void setSymbolPlacement(PropertyValue<SymbolPlacementType>);
 
+    static PropertyValue<float> getDefaultSymbolSpacing();
     PropertyValue<float> getSymbolSpacing() const;
     void setSymbolSpacing(PropertyValue<float>);
 
+    static PropertyValue<bool> getDefaultSymbolAvoidEdges();
     PropertyValue<bool> getSymbolAvoidEdges() const;
     void setSymbolAvoidEdges(PropertyValue<bool>);
 
+    static PropertyValue<bool> getDefaultIconAllowOverlap();
     PropertyValue<bool> getIconAllowOverlap() const;
     void setIconAllowOverlap(PropertyValue<bool>);
 
+    static PropertyValue<bool> getDefaultIconIgnorePlacement();
     PropertyValue<bool> getIconIgnorePlacement() const;
     void setIconIgnorePlacement(PropertyValue<bool>);
 
+    static PropertyValue<bool> getDefaultIconOptional();
     PropertyValue<bool> getIconOptional() const;
     void setIconOptional(PropertyValue<bool>);
 
+    static PropertyValue<AlignmentType> getDefaultIconRotationAlignment();
     PropertyValue<AlignmentType> getIconRotationAlignment() const;
     void setIconRotationAlignment(PropertyValue<AlignmentType>);
 
+    static PropertyValue<float> getDefaultIconSize();
     PropertyValue<float> getIconSize() const;
     void setIconSize(PropertyValue<float>);
 
+    static PropertyValue<IconTextFitType> getDefaultIconTextFit();
     PropertyValue<IconTextFitType> getIconTextFit() const;
     void setIconTextFit(PropertyValue<IconTextFitType>);
 
+    static PropertyValue<std::array<float, 4>> getDefaultIconTextFitPadding();
     PropertyValue<std::array<float, 4>> getIconTextFitPadding() const;
     void setIconTextFitPadding(PropertyValue<std::array<float, 4>>);
 
+    static PropertyValue<std::string> getDefaultIconImage();
     PropertyValue<std::string> getIconImage() const;
     void setIconImage(PropertyValue<std::string>);
 
+    static PropertyValue<float> getDefaultIconRotate();
     PropertyValue<float> getIconRotate() const;
     void setIconRotate(PropertyValue<float>);
 
+    static PropertyValue<float> getDefaultIconPadding();
     PropertyValue<float> getIconPadding() const;
     void setIconPadding(PropertyValue<float>);
 
+    static PropertyValue<bool> getDefaultIconKeepUpright();
     PropertyValue<bool> getIconKeepUpright() const;
     void setIconKeepUpright(PropertyValue<bool>);
 
+    static PropertyValue<std::array<float, 2>> getDefaultIconOffset();
     PropertyValue<std::array<float, 2>> getIconOffset() const;
     void setIconOffset(PropertyValue<std::array<float, 2>>);
 
+    static PropertyValue<AlignmentType> getDefaultTextPitchAlignment();
     PropertyValue<AlignmentType> getTextPitchAlignment() const;
     void setTextPitchAlignment(PropertyValue<AlignmentType>);
 
+    static PropertyValue<AlignmentType> getDefaultTextRotationAlignment();
     PropertyValue<AlignmentType> getTextRotationAlignment() const;
     void setTextRotationAlignment(PropertyValue<AlignmentType>);
 
+    static PropertyValue<std::string> getDefaultTextField();
     PropertyValue<std::string> getTextField() const;
     void setTextField(PropertyValue<std::string>);
 
+    static PropertyValue<std::vector<std::string>> getDefaultTextFont();
     PropertyValue<std::vector<std::string>> getTextFont() const;
     void setTextFont(PropertyValue<std::vector<std::string>>);
 
+    static PropertyValue<float> getDefaultTextSize();
     PropertyValue<float> getTextSize() const;
     void setTextSize(PropertyValue<float>);
 
+    static PropertyValue<float> getDefaultTextMaxWidth();
     PropertyValue<float> getTextMaxWidth() const;
     void setTextMaxWidth(PropertyValue<float>);
 
+    static PropertyValue<float> getDefaultTextLineHeight();
     PropertyValue<float> getTextLineHeight() const;
     void setTextLineHeight(PropertyValue<float>);
 
+    static PropertyValue<float> getDefaultTextLetterSpacing();
     PropertyValue<float> getTextLetterSpacing() const;
     void setTextLetterSpacing(PropertyValue<float>);
 
+    static PropertyValue<TextJustifyType> getDefaultTextJustify();
     PropertyValue<TextJustifyType> getTextJustify() const;
     void setTextJustify(PropertyValue<TextJustifyType>);
 
+    static PropertyValue<TextAnchorType> getDefaultTextAnchor();
     PropertyValue<TextAnchorType> getTextAnchor() const;
     void setTextAnchor(PropertyValue<TextAnchorType>);
 
+    static PropertyValue<float> getDefaultTextMaxAngle();
     PropertyValue<float> getTextMaxAngle() const;
     void setTextMaxAngle(PropertyValue<float>);
 
+    static PropertyValue<float> getDefaultTextRotate();
     PropertyValue<float> getTextRotate() const;
     void setTextRotate(PropertyValue<float>);
 
+    static PropertyValue<float> getDefaultTextPadding();
     PropertyValue<float> getTextPadding() const;
     void setTextPadding(PropertyValue<float>);
 
+    static PropertyValue<bool> getDefaultTextKeepUpright();
     PropertyValue<bool> getTextKeepUpright() const;
     void setTextKeepUpright(PropertyValue<bool>);
 
+    static PropertyValue<TextTransformType> getDefaultTextTransform();
     PropertyValue<TextTransformType> getTextTransform() const;
     void setTextTransform(PropertyValue<TextTransformType>);
 
+    static PropertyValue<std::array<float, 2>> getDefaultTextOffset();
     PropertyValue<std::array<float, 2>> getTextOffset() const;
     void setTextOffset(PropertyValue<std::array<float, 2>>);
 
+    static PropertyValue<bool> getDefaultTextAllowOverlap();
     PropertyValue<bool> getTextAllowOverlap() const;
     void setTextAllowOverlap(PropertyValue<bool>);
 
+    static PropertyValue<bool> getDefaultTextIgnorePlacement();
     PropertyValue<bool> getTextIgnorePlacement() const;
     void setTextIgnorePlacement(PropertyValue<bool>);
 
+    static PropertyValue<bool> getDefaultTextOptional();
     PropertyValue<bool> getTextOptional() const;
     void setTextOptional(PropertyValue<bool>);
 
     // Paint properties
 
+    static PropertyValue<float> getDefaultIconOpacity();
     PropertyValue<float> getIconOpacity() const;
     void setIconOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
 
+    static PropertyValue<Color> getDefaultIconColor();
     PropertyValue<Color> getIconColor() const;
     void setIconColor(PropertyValue<Color>, const optional<std::string>& klass = {});
 
+    static PropertyValue<Color> getDefaultIconHaloColor();
     PropertyValue<Color> getIconHaloColor() const;
     void setIconHaloColor(PropertyValue<Color>, const optional<std::string>& klass = {});
 
+    static PropertyValue<float> getDefaultIconHaloWidth();
     PropertyValue<float> getIconHaloWidth() const;
     void setIconHaloWidth(PropertyValue<float>, const optional<std::string>& klass = {});
 
+    static PropertyValue<float> getDefaultIconHaloBlur();
     PropertyValue<float> getIconHaloBlur() const;
     void setIconHaloBlur(PropertyValue<float>, const optional<std::string>& klass = {});
 
+    static PropertyValue<std::array<float, 2>> getDefaultIconTranslate();
     PropertyValue<std::array<float, 2>> getIconTranslate() const;
     void setIconTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {});
 
+    static PropertyValue<TranslateAnchorType> getDefaultIconTranslateAnchor();
     PropertyValue<TranslateAnchorType> getIconTranslateAnchor() const;
     void setIconTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
 
+    static PropertyValue<float> getDefaultTextOpacity();
     PropertyValue<float> getTextOpacity() const;
     void setTextOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
 
+    static PropertyValue<Color> getDefaultTextColor();
     PropertyValue<Color> getTextColor() const;
     void setTextColor(PropertyValue<Color>, const optional<std::string>& klass = {});
 
+    static PropertyValue<Color> getDefaultTextHaloColor();
     PropertyValue<Color> getTextHaloColor() const;
     void setTextHaloColor(PropertyValue<Color>, const optional<std::string>& klass = {});
 
+    static PropertyValue<float> getDefaultTextHaloWidth();
     PropertyValue<float> getTextHaloWidth() const;
     void setTextHaloWidth(PropertyValue<float>, const optional<std::string>& klass = {});
 
+    static PropertyValue<float> getDefaultTextHaloBlur();
     PropertyValue<float> getTextHaloBlur() const;
     void setTextHaloBlur(PropertyValue<float>, const optional<std::string>& klass = {});
 
+    static PropertyValue<std::array<float, 2>> getDefaultTextTranslate();
     PropertyValue<std::array<float, 2>> getTextTranslate() const;
     void setTextTranslate(PropertyValue<std::array<float, 2>>, const optional<std::string>& klass = {});
 
+    static PropertyValue<TranslateAnchorType> getDefaultTextTranslateAnchor();
     PropertyValue<TranslateAnchorType> getTextTranslateAnchor() const;
     void setTextTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
 
-- 
cgit v1.2.1