[core] Add DefaultFileSource::mergeRegions API and CLI support in the mbgl-offline tool.

1 files changed, 12 insertions, 1 deletions

diff --git a/platform/default/default_file_source.cpp b/platform/default/default_file_source.cpp
index 93f10eea72..99e5c4dff3 100644
--- a/platform/default/default_file_source.cpp
+++ b/platform/default/default_file_source.cpp
@@ -55,6 +55,11 @@ public:
         callback(offlineDatabase->createRegion(definition, metadata));
     }
 
+    void mergeOfflineRegions(const std::string& sideDatabasePath,
+                             std::function<void (expected<OfflineRegions, std::exception_ptr>)> callback) {
+        callback(offlineDatabase->mergeDatabase(sideDatabasePath));
+     }
+
     void updateMetadata(const int64_t regionID,
                       const OfflineRegionMetadata& metadata,
                       std::function<void (expected<OfflineRegionMetadata, std::exception_ptr>)> callback) {
@@ -258,9 +263,15 @@ void DefaultFileSource::createOfflineRegion(const OfflineRegionDefinition& defin
     impl->actor().invoke(&Impl::createRegion, definition, metadata, callback);
 }
 
+void DefaultFileSource::mergeOfflineRegions(const std::string& sideDatabasePath,
+                                            std::function<void (expected<OfflineRegions, std::exception_ptr>)> callback) {
+    impl->actor().invoke(&Impl::mergeOfflineRegions, sideDatabasePath, callback);
+}
+
 void DefaultFileSource::updateOfflineMetadata(const int64_t regionID,
                                             const OfflineRegionMetadata& metadata,
-                                            std::function<void (expected<OfflineRegionMetadata, std::exception_ptr>)> callback) {
+                                            std::function<void (expected<OfflineRegionMetadata,
+                                             std::exception_ptr>)> callback) {
     impl->actor().invoke(&Impl::updateMetadata, regionID, metadata, callback);
 }