diff options
| author | Fabian Guerra Soto <fabian.guerra@mapbox.com> | 2018-09-17 15:31:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-17 15:31:43 -0700 |
| commit | a938c3ef68af249bb3199bde2818436a0bff0952 (patch) | |
| tree | 5301a86ea2e9b0b46d2684334f36a97dfa99a521 /platform/default/mbgl | |
| parent | 153e97c8e7cd03cdd0e94cb5e17a2723f417d973 (diff) | |
| download | qtlocation-mapboxgl-a938c3ef68af249bb3199bde2818436a0bff0952.tar.gz | |
[ios, macos] Offline regions merge. (#12791)
* [ios, macos] Add offline regions merge.
* [ios, macos] Update changelogs.
* [ios, macos] Fix refreshing the offline packs after new content is added.
* [ios, macos] Update MGLOfflineStorage's add contents of file documentation.
* [ios, macos] Add MGLOfflineStorage test cases for adding file contents.
* [ios, macos] Add offline merge test database.
* [ios, macos] Add packs parameter to MGLBatchedOfflinePackAdditionCompletionHandler.
* [core] Fix a query mege duplication.
* [ios, macos] Remove unnecessary pack iteration.
* [ios, macos] Fix packs update KVO notifications.
* [ios, macos] Add localization strings.
* [core] Fix query readability.
* [ios, macos] Fix MGLOfflineStorageTest, cleanup the cache database after the test.
* [ios, macos] Fix offline packs, updating triggers a crash.
Diffstat (limited to 'platform/default/mbgl')
| -rw-r--r-- | platform/default/mbgl/storage/offline_database.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/default/mbgl/storage/offline_database.cpp b/platform/default/mbgl/storage/offline_database.cpp index 37490d2f6f..28c1359106 100644 --- a/platform/default/mbgl/storage/offline_database.cpp +++ b/platform/default/mbgl/storage/offline_database.cpp @@ -689,9 +689,9 @@ OfflineDatabase::mergeDatabase(const std::string& sideDatabasePath) { // clang-format off mapbox::sqlite::Query queryRegions{ getStatement( - "SELECT r.id, r.definition, r.description " + "SELECT DISTINCT r.id, r.definition, r.description " "FROM side.regions sr " - "JOIN regions r ON sr.definition = r.definition") }; + "JOIN regions r ON sr.definition = r.definition AND sr.description IS r.description") }; // clang-format on OfflineRegions result; |