From 0c0064c050396eae8dad92e5097692537405704a Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 19 Dec 2016 17:10:51 -0800
Subject: [core] Get rid of user-specified refs

---
 src/mbgl/style/layers/symbol_layer_properties.hpp | 34 +++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'src/mbgl/style/layers/symbol_layer_properties.hpp')

diff --git a/src/mbgl/style/layers/symbol_layer_properties.hpp b/src/mbgl/style/layers/symbol_layer_properties.hpp
index 8b72c4347a..f5fd6ce3df 100644
--- a/src/mbgl/style/layers/symbol_layer_properties.hpp
+++ b/src/mbgl/style/layers/symbol_layer_properties.hpp
@@ -10,138 +10,172 @@ namespace mbgl {
 namespace style {
 
 struct SymbolPlacement : LayoutProperty<SymbolPlacementType> {
+    static constexpr const char * key = "symbol-placement";
     static SymbolPlacementType defaultValue() { return SymbolPlacementType::Point; }
 };
 
 struct SymbolSpacing : LayoutProperty<float> {
+    static constexpr const char * key = "symbol-spacing";
     static float defaultValue() { return 250; }
 };
 
 struct SymbolAvoidEdges : LayoutProperty<bool> {
+    static constexpr const char * key = "symbol-avoid-edges";
     static bool defaultValue() { return false; }
 };
 
 struct IconAllowOverlap : LayoutProperty<bool> {
+    static constexpr const char * key = "icon-allow-overlap";
     static bool defaultValue() { return false; }
 };
 
 struct IconIgnorePlacement : LayoutProperty<bool> {
+    static constexpr const char * key = "icon-ignore-placement";
     static bool defaultValue() { return false; }
 };
 
 struct IconOptional : LayoutProperty<bool> {
+    static constexpr const char * key = "icon-optional";
     static bool defaultValue() { return false; }
 };
 
 struct IconRotationAlignment : LayoutProperty<AlignmentType> {
+    static constexpr const char * key = "icon-rotation-alignment";
     static AlignmentType defaultValue() { return AlignmentType::Auto; }
 };
 
 struct IconSize : LayoutProperty<float> {
+    static constexpr const char * key = "icon-size";
     static float defaultValue() { return 1; }
 };
 
 struct IconTextFit : LayoutProperty<IconTextFitType> {
+    static constexpr const char * key = "icon-text-fit";
     static IconTextFitType defaultValue() { return IconTextFitType::None; }
 };
 
 struct IconTextFitPadding : LayoutProperty<std::array<float, 4>> {
+    static constexpr const char * key = "icon-text-fit-padding";
     static std::array<float, 4> defaultValue() { return {{ 0, 0, 0, 0 }}; }
 };
 
 struct IconImage : LayoutProperty<std::string> {
+    static constexpr const char * key = "icon-image";
     static std::string defaultValue() { return ""; }
 };
 
 struct IconRotate : LayoutProperty<float> {
+    static constexpr const char * key = "icon-rotate";
     static float defaultValue() { return 0; }
 };
 
 struct IconPadding : LayoutProperty<float> {
+    static constexpr const char * key = "icon-padding";
     static float defaultValue() { return 2; }
 };
 
 struct IconKeepUpright : LayoutProperty<bool> {
+    static constexpr const char * key = "icon-keep-upright";
     static bool defaultValue() { return false; }
 };
 
 struct IconOffset : LayoutProperty<std::array<float, 2>> {
+    static constexpr const char * key = "icon-offset";
     static std::array<float, 2> defaultValue() { return {{ 0, 0 }}; }
 };
 
 struct TextPitchAlignment : LayoutProperty<AlignmentType> {
+    static constexpr const char * key = "text-pitch-alignment";
     static AlignmentType defaultValue() { return AlignmentType::Auto; }
 };
 
 struct TextRotationAlignment : LayoutProperty<AlignmentType> {
+    static constexpr const char * key = "text-rotation-alignment";
     static AlignmentType defaultValue() { return AlignmentType::Auto; }
 };
 
 struct TextField : LayoutProperty<std::string> {
+    static constexpr const char * key = "text-field";
     static std::string defaultValue() { return ""; }
 };
 
 struct TextFont : LayoutProperty<std::vector<std::string>> {
+    static constexpr const char * key = "text-font";
     static std::vector<std::string> defaultValue() { return { "Open Sans Regular", "Arial Unicode MS Regular" }; }
 };
 
 struct TextSize : LayoutProperty<float> {
+    static constexpr const char * key = "text-size";
     static float defaultValue() { return 16; }
 };
 
 struct TextMaxWidth : LayoutProperty<float> {
+    static constexpr const char * key = "text-max-width";
     static float defaultValue() { return 10; }
 };
 
 struct TextLineHeight : LayoutProperty<float> {
+    static constexpr const char * key = "text-line-height";
     static float defaultValue() { return 1.2; }
 };
 
 struct TextLetterSpacing : LayoutProperty<float> {
+    static constexpr const char * key = "text-letter-spacing";
     static float defaultValue() { return 0; }
 };
 
 struct TextJustify : LayoutProperty<TextJustifyType> {
+    static constexpr const char * key = "text-justify";
     static TextJustifyType defaultValue() { return TextJustifyType::Center; }
 };
 
 struct TextAnchor : LayoutProperty<TextAnchorType> {
+    static constexpr const char * key = "text-anchor";
     static TextAnchorType defaultValue() { return TextAnchorType::Center; }
 };
 
 struct TextMaxAngle : LayoutProperty<float> {
+    static constexpr const char * key = "text-max-angle";
     static float defaultValue() { return 45; }
 };
 
 struct TextRotate : LayoutProperty<float> {
+    static constexpr const char * key = "text-rotate";
     static float defaultValue() { return 0; }
 };
 
 struct TextPadding : LayoutProperty<float> {
+    static constexpr const char * key = "text-padding";
     static float defaultValue() { return 2; }
 };
 
 struct TextKeepUpright : LayoutProperty<bool> {
+    static constexpr const char * key = "text-keep-upright";
     static bool defaultValue() { return true; }
 };
 
 struct TextTransform : LayoutProperty<TextTransformType> {
+    static constexpr const char * key = "text-transform";
     static TextTransformType defaultValue() { return TextTransformType::None; }
 };
 
 struct TextOffset : LayoutProperty<std::array<float, 2>> {
+    static constexpr const char * key = "text-offset";
     static std::array<float, 2> defaultValue() { return {{ 0, 0 }}; }
 };
 
 struct TextAllowOverlap : LayoutProperty<bool> {
+    static constexpr const char * key = "text-allow-overlap";
     static bool defaultValue() { return false; }
 };
 
 struct TextIgnorePlacement : LayoutProperty<bool> {
+    static constexpr const char * key = "text-ignore-placement";
     static bool defaultValue() { return false; }
 };
 
 struct TextOptional : LayoutProperty<bool> {
+    static constexpr const char * key = "text-optional";
     static bool defaultValue() { return false; }
 };
 
-- 
cgit v1.2.1