1 files changed, 3 insertions, 29 deletions
diff --git a/include/mbgl/style/style_properties.hpp b/include/mbgl/style/style_properties.hpp
index 9575347be3..35ea97781b 100644
--- a/include/mbgl/style/style_properties.hpp
+++ b/include/mbgl/style/style_properties.hpp
@@ -19,7 +19,7 @@ struct FillProperties {
     Color fill_color = {{ 0, 0, 0, 1 }};
     Color stroke_color = {{ 0, 0, 0, -1 }};
     std::array<float, 2> translate = {{ 0, 0 }};
-    TranslateAnchorType translateAnchor = TranslateAnchorType::Default;
+    TranslateAnchorType translateAnchor = TranslateAnchorType::Map;
     std::string image;
 
     inline bool isVisible() const {
@@ -32,7 +32,7 @@ struct LineProperties {
     float opacity = 1.0f;
     Color color = {{ 0, 0, 0, 1 }};
     std::array<float, 2> translate = {{ 0, 0 }};
-    TranslateAnchorType translateAnchor = TranslateAnchorType::Default;
+    TranslateAnchorType translateAnchor = TranslateAnchorType::Map;
     float width = 1;
     float offset = 0;
     float blur = 0;
@@ -44,31 +44,6 @@ struct LineProperties {
     }
 };
 
-struct IconProperties {
-    inline IconProperties() {}
-    float opacity = 1.0f;
-    float rotate = 0.0f;
-    RotateAnchorType rotate_anchor = RotateAnchorType::Default;
-
-    inline bool isVisible() const {
-        return opacity > 0;
-    }
-};
-
-struct TextProperties {
-    inline TextProperties() {}
-    float opacity = 1.0f;
-    float size = 12.0f;
-    Color color = {{ 0, 0, 0, 1 }};
-    Color halo_color = {{ 1, 1, 1, 0.75 }};
-    float halo_width = 0.25f;
-    float halo_blur = 1.0f;
-
-    inline bool isVisible() const {
-        return opacity > 0 && (color[3] > 0 || halo_color[3] > 0) && size > 0;
-    }
-};
-
 struct SymbolProperties {
     inline SymbolProperties() {}
 
@@ -133,8 +108,7 @@ struct BackgroundProperties {
 typedef util::variant<
     FillProperties,
     LineProperties,
-    IconProperties,
-    TextProperties,
+    SymbolProperties,
     CompositeProperties,
     RasterProperties,
     BackgroundProperties,