From eed023829efcf7df9ba596a6095bb1b86719fc42 Mon Sep 17 00:00:00 2001 From: jmkiley Date: Wed, 14 Jun 2017 12:37:05 -0700 Subject: [ios, macos] transiton -> transition --- platform/darwin/src/MGLLight.h | 4 ++-- platform/darwin/src/MGLLight.mm | 8 ++++---- platform/darwin/test/MGLLightTest.mm | 20 ++++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/platform/darwin/src/MGLLight.h b/platform/darwin/src/MGLLight.h index 6dd24712e2..f03afc0189 100644 --- a/platform/darwin/src/MGLLight.h +++ b/platform/darwin/src/MGLLight.h @@ -80,7 +80,7 @@ MGL_EXPORT /** Values describing animated transitions to `position` property. */ -@property (nonatomic) MGLTransition positionTransiton; +@property (nonatomic) MGLTransition positionTransition; #if TARGET_OS_IPHONE @@ -103,7 +103,7 @@ MGL_EXPORT /** Values describing animated transitions to `color` property. */ -@property (nonatomic) MGLTransition colorTransiton; +@property (nonatomic) MGLTransition colorTransition; /** 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().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().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().toInterpolatablePropertyValue(self.position); mbglLight.setPosition(position); - mbglLight.setPositionTransition(MGLOptionsFromTransition(self.positionTransiton)); + mbglLight.setPositionTransition(MGLOptionsFromTransition(self.positionTransition)); auto color = MGLStyleValueTransformer().toInterpolatablePropertyValue(self.color); mbglLight.setColor(color); - mbglLight.setColorTransition(MGLOptionsFromTransition(self.colorTransiton)); + mbglLight.setColorTransition(MGLOptionsFromTransition(self.colorTransition)); auto intensity = MGLStyleValueTransformer().toInterpolatablePropertyValue(self.intensity); mbglLight.setIntensity(intensity); diff --git a/platform/darwin/test/MGLLightTest.mm b/platform/darwin/test/MGLLightTest.mm index 2c3d1c7bd1..5431bea983 100644 --- a/platform/darwin/test/MGLLightTest.mm +++ b/platform/darwin/test/MGLLightTest.mm @@ -74,8 +74,8 @@ XCTAssert(defaultPosition.radial == positionValue.MGLSphericalPositionValue.radial); XCTAssert(defaultPosition.azimuthal == positionValue.MGLSphericalPositionValue.azimuthal); XCTAssert(defaultPosition.polar == positionValue.MGLSphericalPositionValue.polar); - XCTAssertEqual(mglLight.positionTransiton.delay, defaultTransition.delay); - XCTAssertEqual(mglLight.positionTransiton.duration, defaultTransition.duration); + XCTAssertEqual(mglLight.positionTransition.delay, defaultTransition.delay); + XCTAssertEqual(mglLight.positionTransition.duration, defaultTransition.duration); auto lightFromMGLlight = [mglLight mbglLight]; @@ -87,7 +87,7 @@ defaultPosition = MGLSphericalPositionMake(6, 180, 90); MGLStyleValue *positionStyleValue = [MGLStyleValue valueWithRawValue:[NSValue valueWithMGLSphericalPosition:defaultPosition]]; mglLight.position = positionStyleValue; - mglLight.positionTransiton = transition; + mglLight.positionTransition = transition; NSAssert([mglLight.position isKindOfClass:[MGLConstantStyleValue class]], @"mglLight.position isn’t a MGLConstantStyleValue."); positionValue = ((MGLConstantStyleValue *)mglLight.position).rawValue; @@ -95,8 +95,8 @@ XCTAssert(defaultPosition.radial == positionValue.MGLSphericalPositionValue.radial); XCTAssert(defaultPosition.azimuthal == positionValue.MGLSphericalPositionValue.azimuthal); XCTAssert(defaultPosition.polar == positionValue.MGLSphericalPositionValue.polar); - XCTAssertEqual(mglLight.positionTransiton.delay, transition.delay); - XCTAssertEqual(mglLight.positionTransiton.duration, transition.duration); + XCTAssertEqual(mglLight.positionTransition.delay, transition.delay); + XCTAssertEqual(mglLight.positionTransition.duration, transition.duration); lightFromMGLlight = [mglLight mbglLight]; @@ -124,8 +124,8 @@ XCTAssert(color.r == colorComponents[0] && color.g == colorComponents[1] && color.b == colorComponents[2] && color.a == colorComponents[3]); - XCTAssertEqual(mglLight.colorTransiton.delay, defaultTransition.delay); - XCTAssertEqual(mglLight.colorTransiton.duration, defaultTransition.duration); + XCTAssertEqual(mglLight.colorTransition.delay, defaultTransition.delay); + XCTAssertEqual(mglLight.colorTransition.duration, defaultTransition.duration); auto lightFromMGLlight = [mglLight mbglLight]; @@ -136,14 +136,14 @@ MGLStyleValue *colorStyleValue = [MGLStyleValue valueWithRawValue:[MGLColor blackColor]]; mglLight.color = colorStyleValue; - mglLight.colorTransiton = transition; + mglLight.colorTransition = transition; NSAssert([mglLight.color isKindOfClass:[MGLConstantStyleValue class]], @"mglLight.color isn’t a MGLConstantStyleValue."); colorValue = ((MGLConstantStyleValue *)mglLight.color).rawValue; XCTAssertEqual([MGLColor blackColor], colorValue); - XCTAssertEqual(mglLight.colorTransiton.delay, transition.delay); - XCTAssertEqual(mglLight.colorTransiton.duration, transition.duration); + XCTAssertEqual(mglLight.colorTransition.delay, transition.delay); + XCTAssertEqual(mglLight.colorTransition.duration, transition.duration); mbgl::style::PropertyValue colorProperty = { { 0, 0, 0, 1 } }; light.setColor(colorProperty); -- cgit v1.2.1