diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2015-11-20 00:13:44 -0800 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2015-11-20 10:44:12 -0800 |
commit | b3dbdb389ff712ace00857e3e72894f0bb3afe3a (patch) | |
tree | 006da1f49848767ca6d3bcd92376e0b1f2d38357 /platform/darwin | |
parent | 566b108248b0b69a61d5e0c0efe3b7fda550e590 (diff) | |
download | qtlocation-mapboxgl-b3dbdb389ff712ace00857e3e72894f0bb3afe3a.tar.gz |
[iOS] Set application root as asset root
As of #2746, we no longer bundle any styles with the SDK, so the asset: URL scheme is unused. Instead, point asset: to the application root for developer convenience and consistency with the Android and default asset roots. Also fixed an issue that prevented relative URLs from being treated as asset: URLs.
Fixes #1208, fixes #3050.
Diffstat (limited to 'platform/darwin')
-rw-r--r-- | platform/darwin/asset_root.mm | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/platform/darwin/asset_root.mm b/platform/darwin/asset_root.mm index f47f5d36d1..a4a3d13c88 100644 --- a/platform/darwin/asset_root.mm +++ b/platform/darwin/asset_root.mm @@ -2,24 +2,13 @@ #include <mbgl/platform/platform.hpp> -@interface MGLApplicationRootBundleCanary : NSObject -@end - -@implementation MGLApplicationRootBundleCanary -@end - namespace mbgl { 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:@"Mapbox" ofType:@"bundle"]; - if (!path) { - path = [[[NSBundle mainBundle] resourceURL] path]; - } - return {[path cStringUsingEncoding : NSUTF8StringEncoding], - [path lengthOfBytesUsingEncoding:NSUTF8StringEncoding]}; + return [[[[NSBundle mainBundle] resourceURL] path] UTF8String]; }(); return root; } |