1 files changed, 8 insertions, 6 deletions
diff --git a/src/mbgl/renderer/buckets/circle_bucket.cpp b/src/mbgl/renderer/buckets/circle_bucket.cpp
index 51da3eb892..c0d7b8c836 100644
--- a/src/mbgl/renderer/buckets/circle_bucket.cpp
+++ b/src/mbgl/renderer/buckets/circle_bucket.cpp
@@ -10,16 +10,18 @@ namespace mbgl {
 
 using namespace style;
 
-CircleBucket::CircleBucket(const BucketParameters& parameters, const std::vector<const RenderLayer*>& layers)
+CircleBucket::CircleBucket(std::map<std::string, CircleBucket::PossiblyEvaluatedPaintProperties> layerPaintProperties,
+                           const float zoom,
+                           MapMode mode_)
     : Bucket(LayerType::Circle),
-      mode(parameters.mode) {
-    for (const auto& layer : layers) {
+      mode(mode_) {
+    for (const auto& pair : layerPaintProperties) {
         paintPropertyBinders.emplace(
             std::piecewise_construct,
-            std::forward_as_tuple(layer->getID()),
+            std::forward_as_tuple(pair.first),
             std::forward_as_tuple(
-                toRenderCircleLayer(layer)->evaluated,
-                parameters.tileID.overscaledZ));
+                pair.second,
+                zoom));
     }
 }