[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.

2 files changed, 3 insertions, 14 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;
 }
diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm
index f06e648d23..646e02cc7b 100644
--- a/platform/ios/MGLMapView.mm
+++ b/platform/ios/MGLMapView.mm
@@ -192,8 +192,8 @@ std::chrono::steady_clock::duration durationInSeconds(float duration)
 
     if ( ! [styleURL scheme])
     {
-        // Assume a relative path into the developer’s bundle.
-        styleURL = [[NSBundle mainBundle] URLForResource:styleURL.path withExtension:nil];
+        // Assume a relative path into the application bundle.
+        styleURL = [NSURL URLWithString:[@"asset://" stringByAppendingString:[styleURL absoluteString]]];
     }
 
     _mbglMap->setStyleURL([[styleURL absoluteString] UTF8String]);