1 files changed, 49 insertions, 2 deletions
diff --git a/src/mbgl/layer/symbol_layer.hpp b/src/mbgl/layer/symbol_layer.hpp
index 4fb6623742..3871d7a2d4 100644
--- a/src/mbgl/layer/symbol_layer.hpp
+++ b/src/mbgl/layer/symbol_layer.hpp
@@ -4,10 +4,57 @@
 #include <mbgl/style/style_layer.hpp>
 #include <mbgl/style/style_properties.hpp>
 #include <mbgl/style/paint_properties_map.hpp>
-#include <mbgl/style/class_properties.hpp>
+#include <mbgl/style/layout_property.hpp>
 
 namespace mbgl {
 
+class SymbolLayoutProperties {
+public:
+    LayoutProperty<PlacementType> placement = PlacementType::Point;
+    LayoutProperty<float> spacing = 250.0f;
+    LayoutProperty<bool> avoidEdges = false;
+
+    class IconProperties {
+    public:
+        LayoutProperty<bool> allowOverlap = false;
+        LayoutProperty<bool> ignorePlacement = false;
+        LayoutProperty<bool> optional = false;
+        LayoutProperty<RotationAlignmentType> rotationAlignment = RotationAlignmentType::Viewport;
+        LayoutProperty<float> size = 1.0f;
+        LayoutProperty<std::string> image = { "" };
+        LayoutProperty<float> rotate = 0.0f;
+        LayoutProperty<float> padding = 2.0f;
+        LayoutProperty<bool> keepUpright = false;
+        LayoutProperty<std::array<float, 2>> offset = { {{ 0, 0 }} };
+    } icon;
+
+    class TextProperties {
+    public:
+        LayoutProperty<RotationAlignmentType> rotationAlignment = RotationAlignmentType::Viewport;
+        LayoutProperty<std::string> field = { "" };
+        LayoutProperty<std::string> font = { "Open Sans Regular, Arial Unicode MS Regular" };
+        LayoutProperty<float> size = 16.0f;
+        LayoutProperty<float> maxWidth = 15.0f /* em */;
+        LayoutProperty<float> lineHeight = 1.2f /* em */;
+        LayoutProperty<float> letterSpacing = 0.0f /* em */;
+        LayoutProperty<TextJustifyType> justify = TextJustifyType::Center;
+        LayoutProperty<TextAnchorType> anchor = TextAnchorType::Center;
+        LayoutProperty<float> maxAngle = 45.0f /* degrees */;
+        LayoutProperty<float> rotate = 0.0f;
+        LayoutProperty<float> padding = 2.0f;
+        LayoutProperty<bool> keepUpright = true;
+        LayoutProperty<TextTransformType> transform = TextTransformType::None;
+        LayoutProperty<std::array<float, 2>> offset = { {{ 0, 0 }} };
+        LayoutProperty<bool> allowOverlap = false;
+        LayoutProperty<bool> ignorePlacement = false;
+        LayoutProperty<bool> optional = false;
+    } text;
+
+    // Special case.
+    float iconMaxSize = 1.0f;
+    float textMaxSize = 16.0f;
+};
+
 class SymbolLayer : public StyleLayer {
 public:
     std::unique_ptr<StyleLayer> clone() const override;
@@ -22,7 +69,7 @@ public:
 
     bool hasTransitions() const override;
 
-    ClassProperties layout;
+    SymbolLayoutProperties layout;
     PaintPropertiesMap paints;
 
     SymbolPaintProperties properties;