[core] Remove MapData::defaultTransitionDelay

5 files changed, 9 insertions, 38 deletions

diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index e99abef9f9..70d42e4c4a 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -557,15 +557,6 @@ Duration Map::getDefaultTransitionDuration() const {
     return data->getDefaultTransitionDuration();
 }
 
-void Map::setDefaultTransitionDelay(const Duration& delay) {
-    data->setDefaultTransitionDelay(delay);
-    update(Update::DefaultTransition);
-}
-
-Duration Map::getDefaultTransitionDelay() const {
-    return data->getDefaultTransitionDelay();
-}
-
 void Map::setSourceTileCacheSize(size_t size) {
     context->invoke(&MapContext::setSourceTileCacheSize, size);
 }
diff --git a/src/mbgl/map/map_data.hpp b/src/mbgl/map/map_data.hpp
index da905f4a89..2aa52dd874 100644
--- a/src/mbgl/map/map_data.hpp
+++ b/src/mbgl/map/map_data.hpp
@@ -26,8 +26,7 @@ public:
         , annotationManager(pixelRatio)
         , animationTime(Duration::zero())
         , defaultFadeDuration(mode_ == MapMode::Continuous ? Milliseconds(300) : Duration::zero())
-        , defaultTransitionDuration(Duration::zero())
-        , defaultTransitionDelay(Duration::zero()) {
+        , defaultTransitionDuration(Duration::zero()) {
         assert(pixelRatio > 0);
     }
 
@@ -90,18 +89,6 @@ public:
         defaultTransitionDuration = duration;
     }
 
-    inline Duration getDefaultTransitionDelay() const {
-        return defaultTransitionDelay;
-    }
-
-    inline void setDefaultTransitionDelay(const Duration& delay) {
-        if (mode == MapMode::Still) {
-            return;
-        }
-
-        defaultTransitionDelay = delay;
-    }
-
     util::exclusive<AnnotationManager> getAnnotationManager() {
         return util::exclusive<AnnotationManager>(
             &annotationManager,
@@ -121,7 +108,6 @@ private:
     std::atomic<Duration> animationTime;
     std::atomic<Duration> defaultFadeDuration;
     std::atomic<Duration> defaultTransitionDuration;
-    std::atomic<Duration> defaultTransitionDelay;
 
 // TODO: make private
 public:
diff --git a/src/mbgl/style/paint_property.hpp b/src/mbgl/style/paint_property.hpp
index 930f12c992..18cf0192aa 100644
--- a/src/mbgl/style/paint_property.hpp
+++ b/src/mbgl/style/paint_property.hpp
@@ -65,8 +65,8 @@ public:
     }
 
     void cascade(const StyleCascadeParameters& parameters) {
-        Duration delay = *parameters.defaultTransition.delay;
-        Duration duration = *parameters.defaultTransition.duration;
+        Duration delay = *parameters.userDefinedTransition.delay;
+        Duration duration = *parameters.userDefinedTransition.duration;
 
         for (auto classID : parameters.classes) {
             if (values.find(classID) == values.end())
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index e4e483346c..0035e344ba 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -180,10 +180,11 @@ void Style::cascade() {
     classIDs.push_back(ClassID::Default);
     classIDs.push_back(ClassID::Fallback);
 
-    StyleCascadeParameters parameters(classIDs,
-                                      data.getAnimationTime(),
-                                      PropertyTransition { data.getDefaultTransitionDuration(),
-                                                           data.getDefaultTransitionDelay() });
+    const StyleCascadeParameters parameters {
+        classIDs,
+        data.getAnimationTime(),
+        PropertyTransition { data.getDefaultTransitionDuration(), Duration::zero() }
+    };
 
     for (const auto& layer : layers) {
         layer->cascade(parameters);
diff --git a/src/mbgl/style/style_cascade_parameters.hpp b/src/mbgl/style/style_cascade_parameters.hpp
index f801aa52c9..041d793068 100644
--- a/src/mbgl/style/style_cascade_parameters.hpp
+++ b/src/mbgl/style/style_cascade_parameters.hpp
@@ -12,16 +12,9 @@ class PropertyTransition;
 
 class StyleCascadeParameters {
 public:
-    StyleCascadeParameters(const std::vector<ClassID>& classes_,
-                           const TimePoint& now_,
-                           const PropertyTransition& defaultTransition_)
-        : classes(classes_),
-          now(now_),
-          defaultTransition(defaultTransition_) {}
-
     std::vector<ClassID> classes;
     TimePoint now;
-    PropertyTransition defaultTransition;
+    PropertyTransition userDefinedTransition;
 };
 
 } // namespace mbgl