[core] Let placement transitions use the transition duration, if set, and allow disabling them entirely

1 files changed, 7 insertions, 3 deletions

diff --git a/include/mbgl/style/transition_options.hpp b/include/mbgl/style/transition_options.hpp
index 87a81717a0..9cb5c1f575 100644
--- a/include/mbgl/style/transition_options.hpp
+++ b/include/mbgl/style/transition_options.hpp
@@ -10,16 +10,20 @@ class TransitionOptions {
 public:
     optional<Duration> duration;
     optional<Duration> delay;
+    bool enablePlacementTransitions;
 
     TransitionOptions(optional<Duration> duration_ = {},
-                      optional<Duration> delay_ = {})
+                      optional<Duration> delay_ = {},
+                      bool enablePlacementTransitions_ = true)
         : duration(std::move(duration_)),
-          delay(std::move(delay_)) {}
+          delay(std::move(delay_)),
+          enablePlacementTransitions(enablePlacementTransitions_) {}
 
     TransitionOptions reverseMerge(const TransitionOptions& defaults) const {
         return {
             duration ? duration : defaults.duration,
-            delay ? delay : defaults.delay
+            delay ? delay : defaults.delay,
+            enablePlacementTransitions
         };
     }