diff options
author | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-12-03 14:21:15 -0800 |
---|---|---|
committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-12-03 14:21:15 -0800 |
commit | c1a332667433713c587bcde350b297fada053209 (patch) | |
tree | 8a897b3205c5a6c8a4d847eac6b569913d02db0d /platform/darwin/src/MGLHeatmapStyleLayer.mm | |
parent | 8bc362e3a2836cfa96ef14a41a0e882a1d08e881 (diff) | |
download | qtlocation-mapboxgl-upstream/fabian-transition-13408.tar.gz |
[ios, macos] Add enablePlacementTransitions to MGLTransition.upstream/fabian-transition-13408
Diffstat (limited to 'platform/darwin/src/MGLHeatmapStyleLayer.mm')
-rw-r--r-- | platform/darwin/src/MGLHeatmapStyleLayer.mm | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/platform/darwin/src/MGLHeatmapStyleLayer.mm b/platform/darwin/src/MGLHeatmapStyleLayer.mm index a3816c0fdd..414e2366aa 100644 --- a/platform/darwin/src/MGLHeatmapStyleLayer.mm +++ b/platform/darwin/src/MGLHeatmapStyleLayer.mm @@ -113,19 +113,15 @@ MGLAssertStyleLayerIsValid(); MGLLogDebug(@"Setting heatmapIntensityTransition: %@", MGLStringFromMGLTransition(transition)); - mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; - self.rawLayer->setHeatmapIntensityTransition(options); + self.rawLayer->setHeatmapIntensityTransition(MGLOptionsFromTransition(transition)); } - (MGLTransition)heatmapIntensityTransition { MGLAssertStyleLayerIsValid(); mbgl::style::TransitionOptions transitionOptions = self.rawLayer->getHeatmapIntensityTransition(); - 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)setHeatmapOpacity:(NSExpression *)heatmapOpacity { @@ -150,19 +146,15 @@ MGLAssertStyleLayerIsValid(); MGLLogDebug(@"Setting heatmapOpacityTransition: %@", MGLStringFromMGLTransition(transition)); - mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; - self.rawLayer->setHeatmapOpacityTransition(options); + self.rawLayer->setHeatmapOpacityTransition(MGLOptionsFromTransition(transition)); } - (MGLTransition)heatmapOpacityTransition { MGLAssertStyleLayerIsValid(); mbgl::style::TransitionOptions transitionOptions = self.rawLayer->getHeatmapOpacityTransition(); - 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)setHeatmapRadius:(NSExpression *)heatmapRadius { @@ -187,19 +179,15 @@ MGLAssertStyleLayerIsValid(); MGLLogDebug(@"Setting heatmapRadiusTransition: %@", MGLStringFromMGLTransition(transition)); - mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; - self.rawLayer->setHeatmapRadiusTransition(options); + self.rawLayer->setHeatmapRadiusTransition(MGLOptionsFromTransition(transition)); } - (MGLTransition)heatmapRadiusTransition { MGLAssertStyleLayerIsValid(); mbgl::style::TransitionOptions transitionOptions = self.rawLayer->getHeatmapRadiusTransition(); - 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)setHeatmapWeight:(NSExpression *)heatmapWeight { |