From 33f14328c486daca461ed6f22ade1b50110af10c Mon Sep 17 00:00:00 2001 From: "Justin R. Miller" Date: Mon, 30 Mar 2015 22:30:06 -0700 Subject: [PATCH] move to actual NSURL type --- platform/ios/MGLMapView.mm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm index ec78d432e..4a55ada17 100644 --- a/platform/ios/MGLMapView.mm +++ b/platform/ios/MGLMapView.mm @@ -139,7 +139,7 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr; if (self && [self commonInit]) { if (accessToken) [self setAccessToken:accessToken]; - if (styleURL) [self setStyleURL:[styleURL absoluteString]]; + if (styleURL) [self setStyleURL:styleURL]; } return self; @@ -185,17 +185,17 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr; } } -- (void)setStyleURL:(NSString *)styleURLString +- (void)setStyleURL:(NSURL *)styleURL { - std::string styleURL([styleURLString UTF8String]); + std::string styleURLString([[styleURL absoluteString] UTF8String]); - if ( ! [[NSURL URLWithString:styleURLString] scheme]) + if ( ! [styleURL scheme]) { - mbglMap->setStyleURL(std::string("asset://") + styleURL); + mbglMap->setStyleURL(std::string("asset://") + styleURLString); } else { - mbglMap->setStyleURL(styleURL); + mbglMap->setStyleURL(styleURLString); } } @@ -1320,7 +1320,7 @@ CLLocationCoordinate2D latLngToCoordinate(mbgl::LatLng latLng) if (isHybrid) { styleName = [@"satellite-" stringByAppendingString:[styleName substringFromIndex:[hybridStylePrefix length]]]; } - [self setStyleURL:[NSString stringWithFormat:@"styles/%@.json", styleName]]; + [self setStyleURL:[NSURL URLWithString:[NSString stringWithFormat:@"styles/%@.json", styleName]]]; if (isHybrid) { [self setStyleClasses:@[@"contours", @"labels"]]; }