diff options
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/darwin/asset_root.mm | 2 | ||||
| -rw-r--r-- | platform/ios/MGLMapView.mm | 6 | ||||
| -rw-r--r-- | platform/ios/NSBundle+MGLAdditions.m | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/platform/darwin/asset_root.mm b/platform/darwin/asset_root.mm index 4dc6b58dc2..f47f5d36d1 100644 --- a/platform/darwin/asset_root.mm +++ b/platform/darwin/asset_root.mm @@ -14,7 +14,7 @@ namespace platform { // Returns the path to the root folder of the application. const std::string &assetRoot() { static const std::string root = []() -> std::string { - NSString *path = [[NSBundle bundleForClass:[MGLApplicationRootBundleCanary class]] pathForResource:@"MapboxGL" ofType:@"bundle"]; + NSString *path = [[NSBundle bundleForClass:[MGLApplicationRootBundleCanary class]] pathForResource:@"Mapbox" ofType:@"bundle"]; if (!path) { path = [[[NSBundle mainBundle] resourceURL] path]; } diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm index 6b826ab0db..391763b945 100644 --- a/platform/ios/MGLMapView.mm +++ b/platform/ios/MGLMapView.mm @@ -20,7 +20,7 @@ #include <mbgl/util/constants.hpp> #include <mbgl/util/image.hpp> -#import "MapboxGL.h" +#import "Mapbox.h" #import "NSBundle+MGLAdditions.h" #import "NSString+MGLAdditions.h" @@ -278,7 +278,7 @@ std::chrono::steady_clock::duration secondsAsDuration(float duration) [self addSubview:_attributionButton]; _attributionButtonConstraints = [NSMutableArray array]; - _attributionSheet = [[UIActionSheet alloc] initWithTitle:@"Mapbox GL for iOS" + _attributionSheet = [[UIActionSheet alloc] initWithTitle:@"Mapbox for iOS" delegate:self cancelButtonTitle:@"Cancel" destructiveButtonTitle:nil @@ -2768,7 +2768,7 @@ CLLocationCoordinate2D MGLLocationCoordinate2DFromLatLng(mbgl::LatLng latLng) if (!path) { [NSException raise:@"Resource not found" format: - @"The resource named “%@” could not be found in the Mapbox GL resource bundle.", name]; + @"The resource named “%@” could not be found in the Mapbox resource bundle.", name]; } return path; diff --git a/platform/ios/NSBundle+MGLAdditions.m b/platform/ios/NSBundle+MGLAdditions.m index b0ecf4656e..d8ba7dacc4 100644 --- a/platform/ios/NSBundle+MGLAdditions.m +++ b/platform/ios/NSBundle+MGLAdditions.m @@ -6,7 +6,7 @@ + (NSString *)mgl_resourceBundlePath { - NSString *resourceBundlePath = [[NSBundle bundleForClass:[MGLMapView class]] pathForResource:@"MapboxGL" ofType:@"bundle"]; + NSString *resourceBundlePath = [[NSBundle bundleForClass:[MGLMapView class]] pathForResource:@"Mapbox" ofType:@"bundle"]; if ( ! resourceBundlePath) resourceBundlePath = [[NSBundle mainBundle] bundlePath]; |