summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin R. Miller <incanus@users.noreply.github.com>2015-03-13 09:10:27 -0700
committerJustin R. Miller <incanus@users.noreply.github.com>2015-03-13 09:10:27 -0700
commitc36522e2a0481eaa0960f45f59ac3b023846b3e0 (patch)
tree21ca5aa1caa824b878faee17c1590af25b3d54fb
parent069505fe7567bc9656d7922a56c9118431e45a37 (diff)
parentbcc4c9e78d790d1b71f56b3cc2e64d1b7f64b975 (diff)
downloadqtlocation-mapboxgl-c36522e2a0481eaa0960f45f59ac3b023846b3e0.tar.gz
Merge pull request #1000 from mapbox/ios-set-classes
iOS setAppliedStyleClasses -> setStyleClasses
-rw-r--r--platform/ios/MGLMapView.mm8
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm
index 3f49d3e6db..0d530ca1cf 100644
--- a/platform/ios/MGLMapView.mm
+++ b/platform/ios/MGLMapView.mm
@@ -972,7 +972,7 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
}
[self setStyleURL:[NSString stringWithFormat:@"styles/%@.json", styleName]];
if (isHybrid) {
- [self setAppliedStyleClasses:@[@"contours", @"labels"]];
+ [self setStyleClasses:@[@"contours", @"labels"]];
}
}
@@ -1031,12 +1031,12 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
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;