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/MGLHillshadeStyleLayer.mm | |
parent | 3e413de1506e3c97f37741cd6eb987b684dd38b3 (diff) | |
download | qtlocation-mapboxgl-98984ef2926dbd1cc6876880ac99cfa737f74a1c.tar.gz |
[ios, macos] Fix MGLTransition struct creation.
Diffstat (limited to 'platform/darwin/src/MGLHillshadeStyleLayer.mm')
-rw-r--r-- | platform/darwin/src/MGLHillshadeStyleLayer.mm | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/platform/darwin/src/MGLHillshadeStyleLayer.mm b/platform/darwin/src/MGLHillshadeStyleLayer.mm index 95620b139d..6bb167d43d 100644 --- a/platform/darwin/src/MGLHillshadeStyleLayer.mm +++ b/platform/darwin/src/MGLHillshadeStyleLayer.mm @@ -74,19 +74,15 @@ namespace mbgl { MGLAssertStyleLayerIsValid(); MGLLogDebug(@"Setting hillshadeAccentColorTransition: %@", MGLStringFromMGLTransition(transition)); - mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; - self.rawLayer->setHillshadeAccentColorTransition(options); + self.rawLayer->setHillshadeAccentColorTransition(MGLOptionsFromTransition(transition)); } - (MGLTransition)hillshadeAccentColorTransition { MGLAssertStyleLayerIsValid(); mbgl::style::TransitionOptions transitionOptions = self.rawLayer->getHillshadeAccentColorTransition(); - MGLTransition transition; - transition.duration = MGLTimeIntervalFromDuration(transitionOptions.duration.value_or(mbgl::Duration::zero())); - transition.delay = MGLTimeIntervalFromDuration(transitionOptions.delay.value_or(mbgl::Duration::zero())); - return transition; + return MGLTransitionFromOptions(transitionOptions); } - (void)setHillshadeExaggeration:(NSExpression *)hillshadeExaggeration { @@ -111,19 +107,15 @@ namespace mbgl { MGLAssertStyleLayerIsValid(); MGLLogDebug(@"Setting hillshadeExaggerationTransition: %@", MGLStringFromMGLTransition(transition)); - mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; - self.rawLayer->setHillshadeExaggerationTransition(options); + self.rawLayer->setHillshadeExaggerationTransition(MGLOptionsFromTransition(transition)); } - (MGLTransition)hillshadeExaggerationTransition { MGLAssertStyleLayerIsValid(); mbgl::style::TransitionOptions transitionOptions = self.rawLayer->getHillshadeExaggerationTransition(); - MGLTransition transition; - transition.duration = MGLTimeIntervalFromDuration(transitionOptions.duration.value_or(mbgl::Duration::zero())); - transition.delay = MGLTimeIntervalFromDuration(transitionOptions.delay.value_or(mbgl::Duration::zero())); - return transition; + return MGLTransitionFromOptions(transitionOptions); } - (void)setHillshadeHighlightColor:(NSExpression *)hillshadeHighlightColor { @@ -148,19 +140,15 @@ namespace mbgl { MGLAssertStyleLayerIsValid(); MGLLogDebug(@"Setting hillshadeHighlightColorTransition: %@", MGLStringFromMGLTransition(transition)); - mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; - self.rawLayer->setHillshadeHighlightColorTransition(options); + self.rawLayer->setHillshadeHighlightColorTransition(MGLOptionsFromTransition(transition)); } - (MGLTransition)hillshadeHighlightColorTransition { MGLAssertStyleLayerIsValid(); mbgl::style::TransitionOptions transitionOptions = self.rawLayer->getHillshadeHighlightColorTransition(); - MGLTransition transition; - transition.duration = MGLTimeIntervalFromDuration(transitionOptions.duration.value_or(mbgl::Duration::zero())); - transition.delay = MGLTimeIntervalFromDuration(transitionOptions.delay.value_or(mbgl::Duration::zero())); - return transition; + return MGLTransitionFromOptions(transitionOptions); } - (void)setHillshadeIlluminationAnchor:(NSExpression *)hillshadeIlluminationAnchor { @@ -221,19 +209,15 @@ namespace mbgl { MGLAssertStyleLayerIsValid(); MGLLogDebug(@"Setting hillshadeShadowColorTransition: %@", MGLStringFromMGLTransition(transition)); - mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; - self.rawLayer->setHillshadeShadowColorTransition(options); + self.rawLayer->setHillshadeShadowColorTransition(MGLOptionsFromTransition(transition)); } - (MGLTransition)hillshadeShadowColorTransition { MGLAssertStyleLayerIsValid(); mbgl::style::TransitionOptions transitionOptions = self.rawLayer->getHillshadeShadowColorTransition(); - MGLTransition transition; - transition.duration = MGLTimeIntervalFromDuration(transitionOptions.duration.value_or(mbgl::Duration::zero())); - transition.delay = MGLTimeIntervalFromDuration(transitionOptions.delay.value_or(mbgl::Duration::zero())); - return transition; + return MGLTransitionFromOptions(transitionOptions); } @end |