Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

iOS setAppliedStyleClasses -> setStyleClasses #1000

Merged
merged 1 commit into from
Mar 13, 2015
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions platform/ios/MGLMapView.mm
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,7 @@ - (void)useBundledStyleNamed:(NSString *)styleName
}
[self setStyleURL:[NSString stringWithFormat:@"styles/%@.json", styleName]];
if (isHybrid) {
[self setAppliedStyleClasses:@[@"contours", @"labels"]];
[self setStyleClasses:@[@"contours", @"labels"]];
}
}

Expand Down Expand Up @@ -1031,12 +1031,12 @@ - (NSArray *)getAppliedStyleClasses
return returnArray;
}

- (void)setAppliedStyleClasses:(NSArray *)appliedClasses
- (void)setStyleClasses:(NSArray *)appliedClasses
{
[self setAppliedStyleClasses:appliedClasses transitionDuration:0];
[self setStyleClasses:appliedClasses transitionDuration:0];
}

- (void)setAppliedStyleClasses:(NSArray *)appliedClasses transitionDuration:(NSTimeInterval)transitionDuration
- (void)setStyleClasses:(NSArray *)appliedClasses transitionDuration:(NSTimeInterval)transitionDuration
{
std::vector<std::string> newAppliedClasses;

Expand Down