[core] Add support for data-driven styling

1 files changed, 6 insertions, 7 deletions

diff --git a/src/mbgl/text/shaping.cpp b/src/mbgl/text/shaping.cpp
index 062066aaf4..b43ba0220c 100644
--- a/src/mbgl/text/shaping.cpp
+++ b/src/mbgl/text/shaping.cpp
@@ -1,19 +1,18 @@
 #include <mbgl/text/shaping.hpp>
-#include <mbgl/style/layers/symbol_layer_properties.hpp>
+#include <mbgl/layout/symbol_feature.hpp>
 
 namespace mbgl {
 
-using namespace style;
-
-PositionedIcon shapeIcon(const SpriteAtlasElement& image, const SymbolLayoutProperties::Evaluated& layout) {
-    float dx = layout.get<IconOffset>()[0];
-    float dy = layout.get<IconOffset>()[1];
+PositionedIcon shapeIcon(const SpriteAtlasElement& image,
+                         const SymbolFeature& feature) {
+    float dx = feature.iconOffset[0];
+    float dy = feature.iconOffset[1];
     float x1 = dx - image.spriteImage->getWidth() / 2.0f;
     float x2 = x1 + image.spriteImage->getWidth();
     float y1 = dy - image.spriteImage->getHeight() / 2.0f;
     float y2 = y1 + image.spriteImage->getHeight();
 
-    return PositionedIcon(image, y1, y2, x1, x2);
+    return PositionedIcon(image, y1, y2, x1, x2, feature.iconRotation);
 }
 
 } // namespace mbgl