diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-06-22 18:01:15 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-06-26 16:32:21 +0300 |
| commit | 1ed059a15bb06da136c7c3251158bcb42e954583 (patch) | |
| tree | f3c86a477c23a52b522553dfbee32ee6acb93925 /platform/darwin | |
| parent | aefa8cb5512a8db401f0eb7568cfc64cecb6b30a (diff) | |
| download | qtlocation-mapboxgl-1ed059a15bb06da136c7c3251158bcb42e954583.tar.gz | |
[darwin] Use ResourceTransform for setting URL transform callbacks
Diffstat (limited to 'platform/darwin')
| -rw-r--r-- | platform/darwin/src/MGLOfflineStorage.mm | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/platform/darwin/src/MGLOfflineStorage.mm b/platform/darwin/src/MGLOfflineStorage.mm index 040b36f8be..2ddfa649e9 100644 --- a/platform/darwin/src/MGLOfflineStorage.mm +++ b/platform/darwin/src/MGLOfflineStorage.mm @@ -10,8 +10,13 @@ #import "NSBundle+MGLAdditions.h" #import "NSValue+MGLAdditions.h" +#include <mbgl/actor/actor.hpp> +#include <mbgl/storage/resource_transform.hpp> +#include <mbgl/util/run_loop.hpp> #include <mbgl/util/string.hpp> +#include <memory> + static NSString * const MGLOfflineStorageFileName = @"cache.db"; static NSString * const MGLOfflineStorageFileName3_2_0_beta_1 = @"offline.db"; @@ -36,7 +41,9 @@ NSString * const MGLOfflinePackMaximumCountUserInfoKey = MGLOfflinePackUserInfoK @end -@implementation MGLOfflineStorage +@implementation MGLOfflineStorage { + std::unique_ptr<mbgl::Actor<mbgl::ResourceTransform>> _mbglResourceTransform; +} + (instancetype)sharedOfflineStorage { static dispatch_once_t onceToken; @@ -74,7 +81,7 @@ NSString * const MGLOfflinePackMaximumCountUserInfoKey = MGLOfflinePackUserInfoK - (void)setDelegate:(id<MGLOfflineStorageDelegate>)newValue { _delegate = newValue; if ([self.delegate respondsToSelector:@selector(offlineStorage:URLForResourceOfKind:withURL:)]) { - _mbglFileSource->setResourceTransform([offlineStorage = self](auto kind_, std::string&& url_) -> std::string { + _mbglResourceTransform = std::make_unique<mbgl::Actor<mbgl::ResourceTransform>>(*mbgl::util::RunLoop::Get(), [offlineStorage = self](auto kind_, const std::string&& url_) -> std::string { NSURL* url = [NSURL URLWithString:[[NSString alloc] initWithBytes:url_.data() length:url_.length() @@ -112,8 +119,11 @@ NSString * const MGLOfflinePackMaximumCountUserInfoKey = MGLOfflinePackUserInfoK withURL:url]; return url.absoluteString.UTF8String; }); + + _mbglFileSource->setResourceTransform(_mbglResourceTransform->self()); } else { - _mbglFileSource->setResourceTransform(nullptr); + _mbglResourceTransform.reset(); + _mbglFileSource->setResourceTransform({}); } } |