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/MGLStyleValue_Private.h | |
parent | 3e413de1506e3c97f37741cd6eb987b684dd38b3 (diff) | |
download | qtlocation-mapboxgl-98984ef2926dbd1cc6876880ac99cfa737f74a1c.tar.gz |
[ios, macos] Fix MGLTransition struct creation.
Diffstat (limited to 'platform/darwin/src/MGLStyleValue_Private.h')
-rw-r--r-- | platform/darwin/src/MGLStyleValue_Private.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/platform/darwin/src/MGLStyleValue_Private.h b/platform/darwin/src/MGLStyleValue_Private.h index cc1950bfb8..84d7ccccec 100644 --- a/platform/darwin/src/MGLStyleValue_Private.h +++ b/platform/darwin/src/MGLStyleValue_Private.h @@ -5,12 +5,14 @@ #import "NSValue+MGLStyleAttributeAdditions.h" #import "NSValue+MGLAdditions.h" #import "NSExpression+MGLPrivateAdditions.h" +#import "NSDate+MGLAdditions.h" #import "MGLTypes.h" #import "MGLConversion.h" #include <mbgl/style/conversion/color_ramp_property_value.hpp> #include <mbgl/style/conversion/property_value.hpp> #include <mbgl/style/conversion/position.hpp> +#import <mbgl/style/transition_options.hpp> #import <mbgl/style/types.hpp> #import <mbgl/util/enum.hpp> @@ -30,6 +32,19 @@ namespace mbgl { } } +NS_INLINE MGLTransition MGLTransitionFromOptions(const mbgl::style::TransitionOptions& options) { + MGLTransition transition; + transition.duration = MGLTimeIntervalFromDuration(options.duration.value_or(mbgl::Duration::zero())); + transition.delay = MGLTimeIntervalFromDuration(options.delay.value_or(mbgl::Duration::zero())); + + return transition; +} + +NS_INLINE mbgl::style::TransitionOptions MGLOptionsFromTransition(MGLTransition transition) { + mbgl::style::TransitionOptions options { { MGLDurationFromTimeInterval(transition.duration) }, { MGLDurationFromTimeInterval(transition.delay) } }; + return options; +} + id MGLJSONObjectFromMBGLExpression(const mbgl::style::expression::Expression &mbglExpression); template <typename MBGLType, typename ObjCType, typename MBGLElement = MBGLType, typename ObjCEnum = ObjCType> |