diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-11 15:00:56 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-13 13:40:31 -0800 |
commit | 5a7d2fd60ec4bd1639a1223ec5d2c54c534d0392 (patch) | |
tree | d37991995bd21955379e690b677fc288109aa2c1 /platform/osx | |
parent | 86c8446d3a4390ff6577d070ac8b5fa3ad3c5cd1 (diff) | |
download | qtlocation-mapboxgl-5a7d2fd60ec4bd1639a1223ec5d2c54c534d0392.tar.gz |
[core] Eliminate platform::assetRoot()
I regenerated assets.zip so that all file paths have an `assets/` prefix, as the Android AssetFileSource implementation asserts, and removed `TEST_DATA` from the paths.
Diffstat (limited to 'platform/osx')
-rw-r--r-- | platform/osx/src/MGLMapView.mm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/platform/osx/src/MGLMapView.mm b/platform/osx/src/MGLMapView.mm index 64aa592f7c..947dd41b17 100644 --- a/platform/osx/src/MGLMapView.mm +++ b/platform/osx/src/MGLMapView.mm @@ -246,7 +246,7 @@ public: error:nil]; NSURL *cacheURL = [cacheDirectoryURL URLByAppendingPathComponent:@"cache.db"]; NSString *cachePath = cacheURL ? cacheURL.path : @""; - _mbglFileSource = new mbgl::DefaultFileSource(cachePath.UTF8String); + _mbglFileSource = new mbgl::DefaultFileSource(cachePath.UTF8String, [[[[NSBundle mainBundle] resourceURL] path] UTF8String]); _mbglMap = new mbgl::Map(*_mbglView, *_mbglFileSource, mbgl::MapMode::Continuous); @@ -524,8 +524,7 @@ public: } if (![styleURL scheme]) { - // Assume a relative path into the application’s resource folder, - // defined in mbgl::platform::assetRoot(). + // Assume a relative path into the application’s resource folder. styleURL = [NSURL URLWithString:[@"asset://" stringByAppendingString:styleURL.absoluteString]]; } |