diff options
author | jmkiley <jordan.kiley@mapbox.com> | 2017-06-14 12:37:05 -0700 |
---|---|---|
committer | jmkiley <jordan.kiley@mapbox.com> | 2017-06-14 12:37:05 -0700 |
commit | eed023829efcf7df9ba596a6095bb1b86719fc42 (patch) | |
tree | da7e7648c8e386f28195341c9fc2cf703b319fb7 /platform/darwin/src/MGLLight.mm | |
parent | df3af9738962d377b0b269347a9d91f2173da7e5 (diff) | |
download | qtlocation-mapboxgl-eed023829efcf7df9ba596a6095bb1b86719fc42.tar.gz |
[ios, macos] transiton -> transitionupstream/jmkiley-position
Diffstat (limited to 'platform/darwin/src/MGLLight.mm')
-rw-r--r-- | platform/darwin/src/MGLLight.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/darwin/src/MGLLight.mm b/platform/darwin/src/MGLLight.mm index 262fad3b07..18528a738f 100644 --- a/platform/darwin/src/MGLLight.mm +++ b/platform/darwin/src/MGLLight.mm @@ -59,7 +59,7 @@ NS_INLINE mbgl::style::TransitionOptions MGLOptionsFromTransition(MGLTransition _position = MGLStyleValueTransformer<mbgl::style::Position, NSValue *>().toStyleValue(positionValue); } - _positionTransiton = MGLTransitionFromOptions(mbglLight->getPositionTransition()); + _positionTransition = MGLTransitionFromOptions(mbglLight->getPositionTransition()); auto colorValue = mbglLight->getColor(); if (colorValue.isUndefined()) { @@ -68,7 +68,7 @@ NS_INLINE mbgl::style::TransitionOptions MGLOptionsFromTransition(MGLTransition _color = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toStyleValue(colorValue); } - _colorTransiton = MGLTransitionFromOptions(mbglLight->getColorTransition()); + _colorTransition = MGLTransitionFromOptions(mbglLight->getColorTransition()); auto intensityValue = mbglLight->getIntensity(); if (intensityValue.isUndefined()) { @@ -95,12 +95,12 @@ NS_INLINE mbgl::style::TransitionOptions MGLOptionsFromTransition(MGLTransition auto position = MGLStyleValueTransformer<mbgl::style::Position, NSValue *>().toInterpolatablePropertyValue(self.position); mbglLight.setPosition(position); - mbglLight.setPositionTransition(MGLOptionsFromTransition(self.positionTransiton)); + mbglLight.setPositionTransition(MGLOptionsFromTransition(self.positionTransition)); auto color = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toInterpolatablePropertyValue(self.color); mbglLight.setColor(color); - mbglLight.setColorTransition(MGLOptionsFromTransition(self.colorTransiton)); + mbglLight.setColorTransition(MGLOptionsFromTransition(self.colorTransition)); auto intensity = MGLStyleValueTransformer<float, NSNumber *>().toInterpolatablePropertyValue(self.intensity); mbglLight.setIntensity(intensity); |