summaryrefslogtreecommitdiff
path: root/src/mbgl/style/expression/interpolate.cpp
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2018-03-29 12:55:29 -0700
committerMinh Nguyễn <mxn@1ec5.org>2018-03-29 19:36:09 -0700
commite29f8c15e8f34c8663311c3a5684f1698c8df4bb (patch)
tree50f8c88b58ef5c26c9ac6ab65c9bba71eb7dd1e4 /src/mbgl/style/expression/interpolate.cpp
parent23ccfce1765588511ce5055e20994894c6b2251e (diff)
downloadqtlocation-mapboxgl-e29f8c15e8f34c8663311c3a5684f1698c8df4bb.tar.gz
[core] Round-trip linear interpolators
Cherry-picked from c231191dbc6f055341fd25ce97309614dc52802f.
Diffstat (limited to 'src/mbgl/style/expression/interpolate.cpp')
-rw-r--r--src/mbgl/style/expression/interpolate.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mbgl/style/expression/interpolate.cpp b/src/mbgl/style/expression/interpolate.cpp
index 30b2cba81b..daad8523f2 100644
--- a/src/mbgl/style/expression/interpolate.cpp
+++ b/src/mbgl/style/expression/interpolate.cpp
@@ -223,7 +223,11 @@ mbgl::Value Interpolate<T>::serialize() const {
interpolator.match(
[&](const ExponentialInterpolator& exponential) {
- serialized.emplace_back(std::vector<mbgl::Value>{{ std::string("exponential"), exponential.base }});
+ if (exponential.base == 1) {
+ serialized.emplace_back(std::vector<mbgl::Value>{{ std::string("linear") }});
+ } else {
+ serialized.emplace_back(std::vector<mbgl::Value>{{ std::string("exponential"), exponential.base }});
+ }
},
[&](const CubicBezierInterpolator& cubicBezier) {
static const std::string cubicBezierTag("cubic-bezier");