QtLocationPlugin: Split CacheWorker & CacheDatabase

Author: HTRamsey

src/QGCApplication.h

@@ -101,6 +101,9 @@ class QGCApplication : public QApplication
     /// Although public, these methods are internal and should only be called by UnitTest code
     QQmlApplicationEngine *qmlAppEngine() const { return _qmlAppEngine; }
 
+    /// Get current language
+    QLocale getCurrentLanguage() const { return _locale; }
+
 signals:
     void languageChanged(const QLocale &locale);
 
@@ -109,9 +112,6 @@ public slots:
 
     void qmlAttemptWindowClose();
 
-    /// Get current language
-    QLocale getCurrentLanguage() const { return _locale; }
-
     /// Show non-modal vehicle message to the user
     void showCriticalVehicleMessage(const QString &message);
 

src/QtLocationPlugin/CMakeLists.txt

@@ -27,6 +27,8 @@ qt_add_plugin(QGCLocation
     QGCMapUrlEngine.cpp
     QGCMapUrlEngine.h
     QGCTile.h
+    QGCTileCacheDatabase.cpp
+    QGCTileCacheDatabase.h
     QGCTileCacheWorker.cpp
     QGCTileCacheWorker.h
     QGCTileSet.h
@@ -44,10 +46,6 @@ qt_add_plugin(QGCLocation
     QGeoTileFetcherQGC.h
 )
 
-if(IOS)
-    target_compile_definitions(QGCLocation PRIVATE QGC_NO_GOOGLE_MAPS)
-endif()
-
 target_link_libraries(QGCLocation
     PRIVATE
         Qt6::Positioning

src/QtLocationPlugin/QGCMapEngineManager.cc

@@ -397,22 +397,21 @@ bool QGCMapEngineManager::exportSets(const QString &path)
         return false;
     }
 
-    QList<QGCCachedTileSet*> sets;
-
+    QList<quint64> setIDs;
     for (qsizetype i = 0; i < _tileSets->count(); i++) {
-        QGCCachedTileSet* const set = qobject_cast<QGCCachedTileSet*>(_tileSets->get(i));
+        const QGCCachedTileSet *set = qobject_cast<const QGCCachedTileSet*>(_tileSets->get(i));
         if (set->selected()) {
-            sets.append(set);
+            setIDs.append(set->id());
         }
     }
 
-    if (sets.isEmpty()) {
+    if (setIDs.isEmpty()) {
         return false;
     }
 
     setImportAction(ImportAction::ActionExporting);
 
-    QGCExportTileTask *task = new QGCExportTileTask(sets, path);
+    QGCExportTileTask *task = new QGCExportTileTask(setIDs, path);
     (void) connect(task, &QGCExportTileTask::actionCompleted, this, &QGCMapEngineManager::_actionCompleted);
     (void) connect(task, &QGCExportTileTask::actionProgress, this, &QGCMapEngineManager::_actionProgressHandler);
     (void) connect(task, &QGCMapTask::error, this, &QGCMapEngineManager::taskError);

src/QtLocationPlugin/QGCMapTasks.h

@@ -324,14 +324,14 @@ class QGCExportTileTask : public QGCMapTask
     Q_OBJECT
 
 public:
-    explicit QGCExportTileTask(const QList<QGCCachedTileSet*> &sets, const QString &path, QObject *parent = nullptr)
+    explicit QGCExportTileTask(const QList<quint64> &setIDs, const QString &path, QObject *parent = nullptr)
         : QGCMapTask(TaskType::taskExport, parent)
-        , m_sets(sets)
+        , m_setIDs(setIDs)
         , m_path(path)
     {}
     ~QGCExportTileTask() = default;
 
-    QList<QGCCachedTileSet*> sets() const { return m_sets; }
+    const QList<quint64>& setIDs() const { return m_setIDs; }
     QString path() const { return m_path; }
 
     void setExportCompleted()
@@ -349,7 +349,7 @@ class QGCExportTileTask : public QGCMapTask
     void actionProgress(int percentage);
 
 private:
-    const QList<QGCCachedTileSet*> m_sets;
+    const QList<quint64> m_setIDs;
     const QString m_path;
 };
 

src/QtLocationPlugin/QGCMapUrlEngine.cpp

@@ -22,13 +22,12 @@
 QGC_LOGGING_CATEGORY(QGCMapUrlEngineLog, "qgc.qtlocationplugin.qgcmapurlengine")
 
 const QList<SharedMapProvider> UrlFactory::_providers = {
-#ifndef QGC_NO_GOOGLE_MAPS
     std::make_shared<GoogleStreetMapProvider>(),
     std::make_shared<GoogleSatelliteMapProvider>(),
     std::make_shared<GoogleTerrainMapProvider>(),
     std::make_shared<GoogleHybridMapProvider>(),
     std::make_shared<GoogleLabelsMapProvider>(),
-#endif
+
     std::make_shared<BingRoadMapProvider>(),
     std::make_shared<BingSatelliteMapProvider>(),
     std::make_shared<BingHybridMapProvider>(),