From 4a5dc37245d23805d13865f5ef9c5f26e539a9ca Mon Sep 17 00:00:00 2001
From: Molly Lloyd <molly@mapbox.com>
Date: Thu, 14 Jun 2018 14:35:39 -0700
Subject: [core] Implement CrossFadedDataDrivenProperty to add support for
 feature expressions in `*-pattern` properties

---
 src/mbgl/renderer/cross_faded_property_evaluator.cpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'src/mbgl/renderer/cross_faded_property_evaluator.cpp')

diff --git a/src/mbgl/renderer/cross_faded_property_evaluator.cpp b/src/mbgl/renderer/cross_faded_property_evaluator.cpp
index 9a7af8636c..7be9c2bcf5 100644
--- a/src/mbgl/renderer/cross_faded_property_evaluator.cpp
+++ b/src/mbgl/renderer/cross_faded_property_evaluator.cpp
@@ -25,16 +25,9 @@ Faded<T> CrossFadedPropertyEvaluator<T>::operator()(const style::PropertyExpress
 template <typename T>
 Faded<T> CrossFadedPropertyEvaluator<T>::calculate(const T& min, const T& mid, const T& max) const {
     const float z = parameters.z;
-    const float fraction = z - std::floor(z);
-    const std::chrono::duration<float> d = parameters.defaultFadeDuration;
-    const float t =
-        d != std::chrono::duration<float>::zero()
-            ? std::min((parameters.now - parameters.zoomHistory.lastIntegerZoomTime) / d, 1.0f)
-            : 1.0f;
-
     return z > parameters.zoomHistory.lastIntegerZoom
-        ? Faded<T> { min, mid, 2.0f, 1.0f, fraction + (1.0f - fraction) * t }
-        : Faded<T> { max, mid, 0.5f, 1.0f, 1 - (1 - t) * fraction };
+        ? Faded<T> { min, mid }
+        : Faded<T> { max, mid };
 }
 
 template class CrossFadedPropertyEvaluator<std::string>;
-- 
cgit v1.2.1