diff options
author | Fabian Guerra <fabian.guerra@mapbox.com> | 2019-01-07 14:40:11 -0600 |
---|---|---|
committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2019-01-07 14:40:11 -0600 |
commit | f85c79068d0c05cde7afcf36b06757e41e4945c5 (patch) | |
tree | a00dbc5baefc80b5b090f171bf5444184847400b | |
parent | 9e3a64970f161cbc10043766c51a13136753d158 (diff) | |
download | qtlocation-mapboxgl-f85c79068d0c05cde7afcf36b06757e41e4945c5.tar.gz |
[ios, macos] Rename enablePlacementTransitions to performsPlacementTransitions.
-rw-r--r-- | platform/darwin/src/MGLStyle.h | 2 | ||||
-rw-r--r-- | platform/darwin/src/MGLStyle.mm | 6 | ||||
-rw-r--r-- | platform/darwin/test/MGLStyleTests.mm | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/platform/darwin/src/MGLStyle.h b/platform/darwin/src/MGLStyle.h index 547b7ccee5..4972524c95 100644 --- a/platform/darwin/src/MGLStyle.h +++ b/platform/darwin/src/MGLStyle.h @@ -275,7 +275,7 @@ MGL_EXPORT The default value of this property is `YES`. */ -@property (nonatomic, assign) BOOL enablePlacementTransitions; +@property (nonatomic, assign) BOOL performsPlacementTransitions; /** Returns a source with the given identifier in the current style. diff --git a/platform/darwin/src/MGLStyle.mm b/platform/darwin/src/MGLStyle.mm index 82fed5e922..5768a7aaa7 100644 --- a/platform/darwin/src/MGLStyle.mm +++ b/platform/darwin/src/MGLStyle.mm @@ -534,14 +534,14 @@ static_assert(6 == mbgl::util::default_styles::numOrderedStyles, return MGLTransitionFromOptions(transitionOptions); } -- (void)setEnablePlacementTransitions:(BOOL)enablePlacementTransitions +- (void)setPerformsPlacementTransitions:(BOOL)performsPlacementTransitions { mbgl::style::TransitionOptions transitionOptions = self.rawStyle->getTransitionOptions(); - transitionOptions.enablePlacementTransitions = static_cast<bool>(enablePlacementTransitions); + transitionOptions.enablePlacementTransitions = static_cast<bool>(performsPlacementTransitions); self.rawStyle->setTransitionOptions(transitionOptions); } -- (BOOL)enablePlacementTransitions +- (BOOL)performsPlacementTransitions { mbgl::style::TransitionOptions transitionOptions = self.rawStyle->getTransitionOptions(); return transitionOptions.enablePlacementTransitions; diff --git a/platform/darwin/test/MGLStyleTests.mm b/platform/darwin/test/MGLStyleTests.mm index ff075f63a6..7aaf70a80a 100644 --- a/platform/darwin/test/MGLStyleTests.mm +++ b/platform/darwin/test/MGLStyleTests.mm @@ -482,12 +482,12 @@ XCTAssert(self.style.transition.duration == transitionTest.duration); } -- (void)testEnablePlacementTransition +- (void)testPerformsPlacementTransitions { - XCTAssertTrue(self.style.enablePlacementTransitions, @"The default value for enabling placement transitions should be YES."); + XCTAssertTrue(self.style.performsPlacementTransitions, @"The default value for enabling placement transitions should be YES."); - self.style.enablePlacementTransitions = NO; - XCTAssertFalse(self.style.enablePlacementTransitions, @"Enabling placement transitions should be NO."); + self.style.performsPlacementTransitions = NO; + XCTAssertFalse(self.style.performsPlacementTransitions, @"Enabling placement transitions should be NO."); } @end |