summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2018-10-02 16:19:15 -0700
committerBruno de Oliveira Abinader <bruno@mapbox.com>2018-10-03 10:19:17 -0700
commitf3c8b92286ad82ce39d400023155ab8bfee1b9a5 (patch)
treed24e752e50dba8fd297bcc6181793d597bc678de /src
parentb8578cd13e7647c2ae7be4e42e2b5feddac6ab19 (diff)
downloadqtlocation-mapboxgl-f3c8b92286ad82ce39d400023155ab8bfee1b9a5.tar.gz
[core] Read style's transition from parser
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/style/parser.hpp3
-rw-r--r--src/mbgl/style/style_impl.cpp3
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/style/parser.hpp b/src/mbgl/style/parser.hpp
index 401b5ff513..ec7be038fb 100644
--- a/src/mbgl/style/parser.hpp
+++ b/src/mbgl/style/parser.hpp
@@ -4,6 +4,7 @@
#include <mbgl/style/source.hpp>
#include <mbgl/style/light.hpp>
+#include <mbgl/util/constants.hpp>
#include <mbgl/util/rapidjson.hpp>
#include <mbgl/util/font_stack.hpp>
#include <mbgl/util/geo.hpp>
@@ -32,7 +33,7 @@ public:
std::vector<std::unique_ptr<Source>> sources;
std::vector<std::unique_ptr<Layer>> layers;
- TransitionOptions transition;
+ TransitionOptions transition { { util::DEFAULT_TRANSITION_DURATION } };
Light light;
std::string name;
diff --git a/src/mbgl/style/style_impl.cpp b/src/mbgl/style/style_impl.cpp
index 0c7f924917..5c9edc789f 100644
--- a/src/mbgl/style/style_impl.cpp
+++ b/src/mbgl/style/style_impl.cpp
@@ -92,8 +92,7 @@ void Style::Impl::parse(const std::string& json_) {
layers.clear();
images.clear();
- transitionOptions = {};
- transitionOptions.duration = util::DEFAULT_TRANSITION_DURATION;
+ transitionOptions = parser.transition;
for (auto& source : parser.sources) {
addSource(std::move(source));