diff options
Diffstat (limited to 'platform/darwin/src/MGLCircleStyleLayer.mm')
-rw-r--r-- | platform/darwin/src/MGLCircleStyleLayer.mm | 64 |
1 files changed, 16 insertions, 48 deletions
diff --git a/platform/darwin/src/MGLCircleStyleLayer.mm b/platform/darwin/src/MGLCircleStyleLayer.mm index 83113d6027..6f82d85ce1 100644 --- a/platform/darwin/src/MGLCircleStyleLayer.mm +++ b/platform/darwin/src/MGLCircleStyleLayer.mm @@ -115,19 +115,15 @@ namespace mbgl { MGLAssertStyleLayerIsValid(); MGLLogDebug(@"Setting circleBlurTransition: %@", MGLStringFromMGLTransition(transition)); - mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; - self.rawLayer->setCircleBlurTransition(options); + self.rawLayer->setCircleBlurTransition(MGLOptionsFromTransition(transition)); } - (MGLTransition)circleBlurTransition { MGLAssertStyleLayerIsValid(); mbgl::style::TransitionOptions transitionOptions = self.rawLayer->getCircleBlurTransition(); - 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)setCircleColor:(NSExpression *)circleColor { @@ -152,19 +148,15 @@ namespace mbgl { MGLAssertStyleLayerIsValid(); MGLLogDebug(@"Setting circleColorTransition: %@", MGLStringFromMGLTransition(transition)); - mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; - self.rawLayer->setCircleColorTransition(options); + self.rawLayer->setCircleColorTransition(MGLOptionsFromTransition(transition)); } - (MGLTransition)circleColorTransition { MGLAssertStyleLayerIsValid(); mbgl::style::TransitionOptions transitionOptions = self.rawLayer->getCircleColorTransition(); - 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)setCircleOpacity:(NSExpression *)circleOpacity { @@ -189,19 +181,15 @@ namespace mbgl { MGLAssertStyleLayerIsValid(); MGLLogDebug(@"Setting circleOpacityTransition: %@", MGLStringFromMGLTransition(transition)); - mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; - self.rawLayer->setCircleOpacityTransition(options); + self.rawLayer->setCircleOpacityTransition(MGLOptionsFromTransition(transition)); } - (MGLTransition)circleOpacityTransition { MGLAssertStyleLayerIsValid(); mbgl::style::TransitionOptions transitionOptions = self.rawLayer->getCircleOpacityTransition(); - 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)setCirclePitchAlignment:(NSExpression *)circlePitchAlignment { @@ -244,19 +232,15 @@ namespace mbgl { MGLAssertStyleLayerIsValid(); MGLLogDebug(@"Setting circleRadiusTransition: %@", MGLStringFromMGLTransition(transition)); - mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; - self.rawLayer->setCircleRadiusTransition(options); + self.rawLayer->setCircleRadiusTransition(MGLOptionsFromTransition(transition)); } - (MGLTransition)circleRadiusTransition { MGLAssertStyleLayerIsValid(); mbgl::style::TransitionOptions transitionOptions = self.rawLayer->getCircleRadiusTransition(); - 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)setCircleScaleAlignment:(NSExpression *)circleScaleAlignment { @@ -306,19 +290,15 @@ namespace mbgl { MGLAssertStyleLayerIsValid(); MGLLogDebug(@"Setting circleStrokeColorTransition: %@", MGLStringFromMGLTransition(transition)); - mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; - self.rawLayer->setCircleStrokeColorTransition(options); + self.rawLayer->setCircleStrokeColorTransition(MGLOptionsFromTransition(transition)); } - (MGLTransition)circleStrokeColorTransition { MGLAssertStyleLayerIsValid(); mbgl::style::TransitionOptions transitionOptions = self.rawLayer->getCircleStrokeColorTransition(); - 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)setCircleStrokeOpacity:(NSExpression *)circleStrokeOpacity { @@ -343,19 +323,15 @@ namespace mbgl { MGLAssertStyleLayerIsValid(); MGLLogDebug(@"Setting circleStrokeOpacityTransition: %@", MGLStringFromMGLTransition(transition)); - mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; - self.rawLayer->setCircleStrokeOpacityTransition(options); + self.rawLayer->setCircleStrokeOpacityTransition(MGLOptionsFromTransition(transition)); } - (MGLTransition)circleStrokeOpacityTransition { MGLAssertStyleLayerIsValid(); mbgl::style::TransitionOptions transitionOptions = self.rawLayer->getCircleStrokeOpacityTransition(); - 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)setCircleStrokeWidth:(NSExpression *)circleStrokeWidth { @@ -380,19 +356,15 @@ namespace mbgl { MGLAssertStyleLayerIsValid(); MGLLogDebug(@"Setting circleStrokeWidthTransition: %@", MGLStringFromMGLTransition(transition)); - mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; - self.rawLayer->setCircleStrokeWidthTransition(options); + self.rawLayer->setCircleStrokeWidthTransition(MGLOptionsFromTransition(transition)); } - (MGLTransition)circleStrokeWidthTransition { MGLAssertStyleLayerIsValid(); mbgl::style::TransitionOptions transitionOptions = self.rawLayer->getCircleStrokeWidthTransition(); - 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)setCircleTranslation:(NSExpression *)circleTranslation { @@ -417,19 +389,15 @@ namespace mbgl { MGLAssertStyleLayerIsValid(); MGLLogDebug(@"Setting circleTranslationTransition: %@", MGLStringFromMGLTransition(transition)); - mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; - self.rawLayer->setCircleTranslateTransition(options); + self.rawLayer->setCircleTranslateTransition(MGLOptionsFromTransition(transition)); } - (MGLTransition)circleTranslationTransition { MGLAssertStyleLayerIsValid(); mbgl::style::TransitionOptions transitionOptions = self.rawLayer->getCircleTranslateTransition(); - 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)setCircleTranslate:(NSExpression *)circleTranslate { |