diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-09-12 08:03:08 +0100 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-09-13 12:38:59 +0300 |
commit | beb67fb7b2119fbda8cf2906bdcc67aa7d7fad65 (patch) | |
tree | 49a7f1f42d184aeff192bc3c24e95a0612d715a0 /src/mbgl/map/map.cpp | |
parent | 0cc062a5fd1f9ed63f688dbb802be252c04d917f (diff) | |
download | qtlocation-mapboxgl-beb67fb7b2119fbda8cf2906bdcc67aa7d7fad65.tar.gz |
[core] Separate transition options accessors from class API
Now the style class transition options have its own getter/setter, which
persists for each style until a new style is set.
Diffstat (limited to 'src/mbgl/map/map.cpp')
-rw-r--r-- | src/mbgl/map/map.cpp | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index e7bb2bd7f4..56be99d8fc 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -896,25 +896,38 @@ bool Map::isFullyLoaded() const { return impl->style ? impl->style->isLoaded() : false; } -void Map::addClass(const std::string& className, const TransitionOptions& properties) { - if (impl->style && impl->style->addClass(className, properties)) { +void Map::addClass(const std::string& className) { + if (impl->style && impl->style->addClass(className)) { update(Update::Classes); } } -void Map::removeClass(const std::string& className, const TransitionOptions& properties) { - if (impl->style && impl->style->removeClass(className, properties)) { +void Map::removeClass(const std::string& className) { + if (impl->style && impl->style->removeClass(className)) { update(Update::Classes); } } -void Map::setClasses(const std::vector<std::string>& classNames, const TransitionOptions& properties) { +void Map::setClasses(const std::vector<std::string>& classNames) { if (impl->style) { - impl->style->setClasses(classNames, properties); + impl->style->setClasses(classNames); update(Update::Classes); } } +style::TransitionOptions Map::getTransitionOptions() const { + if (impl->style) { + return impl->style->getTransitionOptions(); + } + return {}; +} + +void Map::setTransitionOptions(const style::TransitionOptions& options) { + if (impl->style) { + impl->style->setTransitionOptions(options); + } +} + bool Map::hasClass(const std::string& className) const { return impl->style ? impl->style->hasClass(className) : false; } |