summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmkiley <jordan.kiley@mapbox.com>2019-07-15 16:16:14 -0700
committerjmkiley <jordan.kiley@mapbox.com>2019-07-15 16:16:14 -0700
commitb13020f356a37e924baa9f7a70af33c69e92c704 (patch)
treef4d5bc14db5e668dd0db893da1a79ca729caccdb
parent46544ce7e5da3f106aa6fd7d5cfa3a01604f0269 (diff)
downloadqtlocation-mapboxgl-b13020f356a37e924baa9f7a70af33c69e92c704.tar.gz
[ios] added two MGLErrorDomain types
-rw-r--r--platform/darwin/src/MGLOfflineStorage.mm14
-rw-r--r--platform/darwin/src/MGLTypes.h6
2 files changed, 11 insertions, 9 deletions
diff --git a/platform/darwin/src/MGLOfflineStorage.mm b/platform/darwin/src/MGLOfflineStorage.mm
index dc51666d0a..78daa09c7a 100644
--- a/platform/darwin/src/MGLOfflineStorage.mm
+++ b/platform/darwin/src/MGLOfflineStorage.mm
@@ -340,7 +340,7 @@ const MGLExceptionName MGLUnsupportedRegionTypeException = @"MGLUnsupportedRegio
NSMutableArray *packs;
if (!result) {
NSString *description = [NSString stringWithFormat:NSLocalizedStringWithDefaultValue(@"ADD_FILE_CONTENTS_FAILED_DESC", @"Foundation", nil, @"Unable to add offline packs from the file at %@.", @"User-friendly error description"), filePath];
- error = [NSError errorWithDomain:MGLErrorDomain code:9 userInfo:@{
+ error = [NSError errorWithDomain:MGLErrorDomain code:10 userInfo:@{
NSLocalizedDescriptionKey: description,
NSLocalizedFailureReasonErrorKey: @(mbgl::util::toString(result.error()).c_str())
}];
@@ -400,7 +400,7 @@ const MGLExceptionName MGLUnsupportedRegionTypeException = @"MGLUnsupportedRegio
NSError *error;
if (!mbglOfflineRegion) {
NSString *errorDescription = @(mbgl::util::toString(mbglOfflineRegion.error()).c_str());
- error = [NSError errorWithDomain:MGLErrorDomain code:9 userInfo:errorDescription ? @{
+ error = [NSError errorWithDomain:MGLErrorDomain code:10 userInfo:errorDescription ? @{
NSLocalizedDescriptionKey: errorDescription,
} : nil];
}
@@ -433,7 +433,7 @@ const MGLExceptionName MGLUnsupportedRegionTypeException = @"MGLUnsupportedRegio
_mbglFileSource->deleteOfflineRegion(std::move(*mbglOfflineRegion), [&, completion](std::exception_ptr exception) {
NSError *error;
if (exception) {
- error = [NSError errorWithDomain:MGLErrorDomain code:9 userInfo:@{
+ error = [NSError errorWithDomain:MGLErrorDomain code:10 userInfo:@{
NSLocalizedDescriptionKey: @(mbgl::util::toString(exception).c_str()),
}];
}
@@ -456,7 +456,7 @@ const MGLExceptionName MGLUnsupportedRegionTypeException = @"MGLUnsupportedRegio
_mbglFileSource->invalidateOfflineRegion(region, [&](std::exception_ptr exception) {
if (exception) {
- error = [NSError errorWithDomain:MGLErrorDomain code:9 userInfo:@{
+ error = [NSError errorWithDomain:MGLErrorDomain code:10 userInfo:@{
NSLocalizedDescriptionKey: @(mbgl::util::toString(exception).c_str()),
}];
}
@@ -513,7 +513,7 @@ const MGLExceptionName MGLUnsupportedRegionTypeException = @"MGLUnsupportedRegio
_mbglFileSource->setMaximumAmbientCacheSize(cacheSize, [&, completion](std::exception_ptr exception) {
NSError *error;
if (exception) {
- error = [NSError errorWithDomain:MGLErrorDomain code:9 userInfo:@{
+ error = [NSError errorWithDomain:MGLErrorDomain code:10 userInfo:@{
NSLocalizedDescriptionKey: @(mbgl::util::toString(exception).c_str()),
}];
}
@@ -530,7 +530,7 @@ const MGLExceptionName MGLUnsupportedRegionTypeException = @"MGLUnsupportedRegio
NSError *error;
if (exception) {
// Convert std::exception_ptr to an NSError.
- error = [NSError errorWithDomain:MGLErrorDomain code:9 userInfo:@{
+ error = [NSError errorWithDomain:MGLErrorDomain code:10 userInfo:@{
NSLocalizedDescriptionKey: @(mbgl::util::toString(exception).c_str()),
}];
}
@@ -546,7 +546,7 @@ const MGLExceptionName MGLUnsupportedRegionTypeException = @"MGLUnsupportedRegio
_mbglFileSource->clearAmbientCache([&, completion](std::exception_ptr exception){
NSError *error;
if (exception) {
- error = [NSError errorWithDomain:MGLErrorDomain code:9 userInfo:@{
+ error = [NSError errorWithDomain:MGLErrorDomain code:10 userInfo:@{
NSLocalizedDescriptionKey: @(mbgl::util::toString(exception).c_str()),
}];
}
diff --git a/platform/darwin/src/MGLTypes.h b/platform/darwin/src/MGLTypes.h
index 7e95847e66..e20155a6e8 100644
--- a/platform/darwin/src/MGLTypes.h
+++ b/platform/darwin/src/MGLTypes.h
@@ -54,8 +54,10 @@ typedef NS_ENUM(NSInteger, MGLErrorCode) {
MGLErrorCodeSourceIsInUseCannotRemove = 7,
/** Source is in use and cannot be removed */
MGLErrorCodeSourceIdentifierMismatch = 8,
- /** An error occurred while accessing or modifying the offline database */
- MGLErrorCodeOfflineDatabase = 9
+ /** An error occurred while accessing the offline storage database */
+ MGLErrorCodeAccessingOfflineStorageFailed = 9,
+ /** An error occurred while modifying the offline storage database */
+ MGLErrorCodeModifyingOfflineStorageFailed = 10
};
/** Options for enabling debugging features in an `MGLMapView` instance. */