diff options
| author | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-12-03 14:21:15 -0800 |
|---|---|---|
| committer | Fabian Guerra Soto <fabian.guerra@mapbox.com> | 2018-12-12 15:07:23 -0800 |
| commit | 98984ef2926dbd1cc6876880ac99cfa737f74a1c (patch) | |
| tree | b7477090547ce4a7e4e3bbd9fd93ced4a894f555 /platform/darwin/src/MGLStyle.mm | |
| parent | 3e413de1506e3c97f37741cd6eb987b684dd38b3 (diff) | |
| download | qtlocation-mapboxgl-98984ef2926dbd1cc6876880ac99cfa737f74a1c.tar.gz | |
[ios, macos] Fix MGLTransition struct creation.
Diffstat (limited to 'platform/darwin/src/MGLStyle.mm')
| -rw-r--r-- | platform/darwin/src/MGLStyle.mm | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/platform/darwin/src/MGLStyle.mm b/platform/darwin/src/MGLStyle.mm index b9acb4a235..df5f51102a 100644 --- a/platform/darwin/src/MGLStyle.mm +++ b/platform/darwin/src/MGLStyle.mm @@ -524,22 +524,14 @@ static_assert(6 == mbgl::util::default_styles::numOrderedStyles, - (void)setTransition:(MGLTransition)transition { - auto transitionOptions = self.rawStyle->getTransitionOptions(); - transitionOptions.duration = MGLDurationFromTimeInterval(transition.duration); - transitionOptions.delay = MGLDurationFromTimeInterval(transition.delay); - - self.rawStyle->setTransitionOptions(transitionOptions); + self.rawStyle->setTransitionOptions(MGLOptionsFromTransition(transition)); } - (MGLTransition)transition { - MGLTransition transition; const mbgl::style::TransitionOptions transitionOptions = self.rawStyle->getTransitionOptions(); - - transition.delay = MGLTimeIntervalFromDuration(transitionOptions.delay.value_or(mbgl::Duration::zero())); - transition.duration = MGLTimeIntervalFromDuration(transitionOptions.duration.value_or(mbgl::Duration::zero())); - return transition; + return MGLTransitionFromOptions(transitionOptions); } #pragma mark Style light |