summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Rex <julian.rex@gmail.com>2019-03-21 14:47:34 -0400
committerGitHub <noreply@github.com>2019-03-21 14:47:34 -0400
commit7f629b4ab53e3252b8fcd687e15b976aaaf9e47e (patch)
tree8c1c51b54c64674e34241db131d652f56ee6ae9a
parent5782cf55b044c9878d3d904552482f5e5c71589d (diff)
downloadqtlocation-mapboxgl-7f629b4ab53e3252b8fcd687e15b976aaaf9e47e.tar.gz
[core] Change definition of "complete" so offline packs created before #11055 can complete. (CP #14188) (#14190)
-rw-r--r--include/mbgl/storage/offline.hpp2
-rw-r--r--platform/ios/CHANGELOG.md1
-rw-r--r--platform/macos/CHANGELOG.md4
3 files changed, 6 insertions, 1 deletions
diff --git a/include/mbgl/storage/offline.hpp b/include/mbgl/storage/offline.hpp
index b3d258a7e3..f884c8b465 100644
--- a/include/mbgl/storage/offline.hpp
+++ b/include/mbgl/storage/offline.hpp
@@ -153,7 +153,7 @@ public:
bool requiredResourceCountIsPrecise = false;
bool complete() const {
- return completedResourceCount == requiredResourceCount;
+ return completedResourceCount >= requiredResourceCount;
}
};
diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md
index a1ab7c949a..7d5818d311 100644
--- a/platform/ios/CHANGELOG.md
+++ b/platform/ios/CHANGELOG.md
@@ -9,6 +9,7 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT
* Fixed an issue that caused `MGL_FUNCTION` to ignore multiple formatting parameters when passed a `format` function as parameter. ([#14064](https://github.com/mapbox/mapbox-gl-native/pull/14064))
* Added a Galician localization. ([#14095](https://github.com/mapbox/mapbox-gl-native/pull/14095))
* Added `mgl_attributed:` expression operator, which concatenate `MGLAttributedExpression` objects for specifying rich text in the `MGLSymbolStyleLayer.text` property. ([#14094](https://github.com/mapbox/mapbox-gl-native/pull/14094))
+* Fixed a bug that caused offline packs created prior to v4.0.0 (introduced in [#11055](https://github.com/mapbox/mapbox-gl-native/pull/11055)) to be marked as `MGLOfflinePackStateInactive`. ([#14188](https://github.com/mapbox/mapbox-gl-native/pull/14188))
### User interaction
diff --git a/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md
index 2542f57d95..0c6fd89b56 100644
--- a/platform/macos/CHANGELOG.md
+++ b/platform/macos/CHANGELOG.md
@@ -11,6 +11,10 @@
* Fixed an issue that caused `MGL_FUNCTION` to ignore multiple formatting parameters when passed a `format` function as parameter. ([#14064](https://github.com/mapbox/mapbox-gl-native/pull/14064))
* Added `mgl_attributed:` expression operator, which concatenate `MGLAttributedExpression` objects for specifying rich text in the `MGLSymbolStyleLayer.text` property. ([#14094](https://github.com/mapbox/mapbox-gl-native/pull/14094))
+### Offline
+
+* Fixed a bug that caused offline packs created prior to v0.7.0 (introduced in [#11055](https://github.com/mapbox/mapbox-gl-native/pull/11055)) to be marked as `MGLOfflinePackStateInactive`. ([#14188](https://github.com/mapbox/mapbox-gl-native/pull/14188))
+
### Annotations
* Fixed a bug with `MGLMapView.visibleAnnotations` that resulted in incorrect results and performance degradation. ([#13745](https://github.com/mapbox/mapbox-gl-native/pull/13745))