pass style into painter

2 files changed, 4 insertions, 7 deletions

diff --git a/src/map/map.cpp b/src/map/map.cpp
index 8470af8a45..6d716fea42 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -13,8 +13,8 @@ using namespace llmr;
 Map::Map(Settings& settings)
     : settings(settings),
       transform(),
-      painter(transform, settings),
       style(),
+      painter(transform, settings, style),
       min_zoom(0),
       max_zoom(14) {
 }
diff --git a/src/renderer/painter.cpp b/src/renderer/painter.cpp
index e899e81927..b3e1fee569 100644
--- a/src/renderer/painter.cpp
+++ b/src/renderer/painter.cpp
@@ -39,9 +39,10 @@ GLshort tile_border_vertices[] = {
     0, 0
 };
 
-Painter::Painter(Transform& transform, Settings& settings)
+Painter::Painter(Transform& transform, Settings& settings, Style& style)
     : transform(transform),
       settings(settings),
+      style(style),
       currentShader(NULL),
       fillShader(NULL),
       lineShader(NULL),
@@ -180,11 +181,7 @@ void Painter::render(const Tile::Ptr& tile) {
 }
 
 void Painter::renderFill(FillBucket& bucket, const std::string& layer_name) {
-    // TODO: obtain the correct style information for this layer
-    FillProperties properties;
-    properties.fill_color = {{ 0, 0, 1, 0.5 }};
-    properties.stroke_color = properties.fill_color;
-
+    const FillProperties& properties = style.computedFills[layer_name];
 
     // Draw the stencil mask.
     {