summaryrefslogtreecommitdiff
path: root/platform/darwin/src/MGLOfflinePack.mm
diff options
context:
space:
mode:
authorAlexander Shalamov <alexander.shalamov@mapbox.com>2019-10-08 11:33:30 +0300
committerAlexander Shalamov <alexander.shalamov@mapbox.com>2020-01-10 23:17:39 +0200
commitec2a256d86ca9193c3bb34610dc31dfe8fa8b5b3 (patch)
tree9bcfce8106fc4280746908b6cbc5895b1c6cdb4f /platform/darwin/src/MGLOfflinePack.mm
parent2f4b35277cd9c1386064a784a5e2399768957ea4 (diff)
downloadqtlocation-mapboxgl-ec2a256d86ca9193c3bb34610dc31dfe8fa8b5b3.tar.gz
[darwin] Use new FileSourceManager interface
Diffstat (limited to 'platform/darwin/src/MGLOfflinePack.mm')
-rw-r--r--platform/darwin/src/MGLOfflinePack.mm16
1 files changed, 8 insertions, 8 deletions
diff --git a/platform/darwin/src/MGLOfflinePack.mm b/platform/darwin/src/MGLOfflinePack.mm
index 5f4ae9c838..edee549744 100644
--- a/platform/darwin/src/MGLOfflinePack.mm
+++ b/platform/darwin/src/MGLOfflinePack.mm
@@ -11,7 +11,7 @@
#import "NSValue+MGLAdditions.h"
#include <mbgl/map/map_options.hpp>
-#include <mbgl/storage/default_file_source.hpp>
+#include <mbgl/storage/database_file_source.hpp>
const MGLExceptionName MGLInvalidOfflinePackException = @"MGLInvalidOfflinePackException";
@@ -59,7 +59,7 @@ private:
@implementation MGLOfflinePack {
BOOL _isSuspending;
- std::shared_ptr<mbgl::DefaultFileSource> _mbglFileSource;
+ std::shared_ptr<mbgl::DatabaseFileSource> _mbglDatabaseFileSource;
}
- (instancetype)init {
@@ -76,8 +76,8 @@ private:
_mbglOfflineRegion = region;
_state = MGLOfflinePackStateUnknown;
- _mbglFileSource = [[MGLOfflineStorage sharedOfflineStorage] mbglFileSource];
- _mbglFileSource->setOfflineRegionObserver(*_mbglOfflineRegion, std::make_unique<MBGLOfflineRegionObserver>(self));
+ _mbglDatabaseFileSource = [[MGLOfflineStorage sharedOfflineStorage] mbglDatabaseFileSource];
+ _mbglDatabaseFileSource->setOfflineRegionObserver(*_mbglOfflineRegion, std::make_unique<MBGLOfflineRegionObserver>(self));
}
return self;
}
@@ -117,7 +117,7 @@ private:
self.state = MGLOfflinePackStateActive;
- _mbglFileSource->setOfflineRegionDownloadState(*_mbglOfflineRegion, mbgl::OfflineRegionDownloadState::Active);
+ _mbglDatabaseFileSource->setOfflineRegionDownloadState(*_mbglOfflineRegion, mbgl::OfflineRegionDownloadState::Active);
}
- (void)suspend {
@@ -129,7 +129,7 @@ private:
_isSuspending = YES;
}
- _mbglFileSource->setOfflineRegionDownloadState(*_mbglOfflineRegion, mbgl::OfflineRegionDownloadState::Inactive);
+ _mbglDatabaseFileSource->setOfflineRegionDownloadState(*_mbglOfflineRegion, mbgl::OfflineRegionDownloadState::Inactive);
}
- (void)invalidate {
@@ -140,7 +140,7 @@ private:
@synchronized (self) {
self.state = MGLOfflinePackStateInvalid;
if (self.mbglOfflineRegion) {
- _mbglFileSource->setOfflineRegionObserver(*self.mbglOfflineRegion, nullptr);
+ _mbglDatabaseFileSource->setOfflineRegionObserver(*self.mbglOfflineRegion, nullptr);
}
self.mbglOfflineRegion = nil;
}
@@ -169,7 +169,7 @@ private:
MGLAssertOfflinePackIsValid();
__weak MGLOfflinePack *weakSelf = self;
- _mbglFileSource->getOfflineRegionStatus(*_mbglOfflineRegion, [&, weakSelf](mbgl::expected<mbgl::OfflineRegionStatus, std::exception_ptr> status) {
+ _mbglDatabaseFileSource->getOfflineRegionStatus(*_mbglOfflineRegion, [&, weakSelf](mbgl::expected<mbgl::OfflineRegionStatus, std::exception_ptr> status) {
if (status) {
mbgl::OfflineRegionStatus checkedStatus = *status;
dispatch_async(dispatch_get_main_queue(), ^{