Fixes for Linux and Android

Fixing QmlObjectListModel usage bug

src/QtLocationPlugin/QGCMapEngine.cpp

@@ -114,7 +114,7 @@ destroyMapEngine()
 
 //-----------------------------------------------------------------------------
 QGCMapEngine::QGCMapEngine()
-    : _urlFactory(new UrlFactory::UrlFactory())
+    : _urlFactory(new UrlFactory())
 #ifdef WE_ARE_KOSHER
     //-- TODO: Get proper version
     #if defined Q_OS_MAC
@@ -173,6 +173,7 @@ QGCMapEngine::init()
     if(!_cachePath.isEmpty()) {
         _cacheFile = kDbFileName;
         _worker.setDatabaseFile(_cachePath + "/" + _cacheFile);
+        qDebug() << "Map Cache in:" << _cachePath << "/" << _cacheFile;
     } else {
         qCritical() << "Could not find suitable map cache directory.";
     }

src/QtLocationPlugin/QGCMapEngineData.h

@@ -42,9 +42,8 @@ This file is part of the QGROUNDCONTROL project
 class QGCCachedTileSet;
 
 //-----------------------------------------------------------------------------
-class QGCTile : public QObject
+class QGCTile
 {
-    Q_OBJECT
 public:
     QGCTile()
         : _x(0)
@@ -55,16 +54,6 @@ public:
     {
     }
 
-    QGCTile(const QGCTile& other)
-        : _x(other.x())
-        , _y(other.y())
-        , _z(other.z())
-        , _set(other.set())
-        , _hash(other.hash())
-        , _type(other.type())
-    {
-    }
-
     enum TyleState {
         StatePending = 0,
         StateDownloading,

src/QtLocationPlugin/QGCMapTileSet.cpp

@@ -115,8 +115,10 @@ QGCCachedTileSet::savedSizeStr()
 QString
 QGCCachedTileSet::downloadStatus()
 {
-    //-- Default size has no estimage. If complete, show only total size as well.
-    if(_defaultSet || _numTiles == _savedTiles) {
+    if(_defaultSet) {
+        return tilesSizeStr();
+    }
+    if(_numTiles == _savedTiles) {
         return savedSizeStr();
     } else {
         return savedSizeStr() + " / " + tilesSizeStr();
@@ -222,7 +224,7 @@ void QGCCachedTileSet::_prepareDownload()
             connect(reply, &QNetworkReply::finished, this, &QGCCachedTileSet::_networkReplyFinished);
             connect(reply, static_cast<void (QNetworkReply::*)(QNetworkReply::NetworkError)>(&QNetworkReply::error), this, &QGCCachedTileSet::_networkReplyError);
             _replies.insert(tile->hash(), reply);
-            tile->deleteLater();
+            delete tile;
             //-- Refill queue if running low
             if(!_batchRequested && !_noMoreTiles && _tilesToDownload.count() < (QGCMapEngine::concurrentDownloads(_type) * 10)) {
                 //-- Request new batch of tiles

src/QtLocationPlugin/QGCTileCacheWorker.cpp

@@ -352,9 +352,8 @@ QGCCacheWorker::_getTileSets(QGCMapTask* mtask)
 void
 QGCCacheWorker::_updateSetTotals(QGCCachedTileSet* set)
 {
-    _updateTotals();
     if(set->defaultSet()) {
-        //-- Default Set is already computed
+        _updateTotals();
         set->setSavedTiles(_totalCount);
         set->setSavedSize(_totalSize);
         set->setNumTiles(_defaultCount);
@@ -362,7 +361,6 @@ QGCCacheWorker::_updateSetTotals(QGCCachedTileSet* set)
         return;
     }
     QSqlQuery subquery(*_db);
-    //-- Count everythin for Default Set
     QString sq = QString("SELECT COUNT(size), SUM(size) FROM Tiles A INNER JOIN SetTiles B on A.tileID = B.tileID WHERE B.setID = %1").arg(set->id());
     if(subquery.exec(sq)) {
         if(subquery.next()) {

src/QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp

@@ -226,7 +226,9 @@ QGeoTiledMappingManagerEngineQGC::_setCache(const QVariantMap &parameters)
     QGeoTileCache* pTileCache = createTileCacheWithDir(cacheDir);
     if(pTileCache)
     {
-        pTileCache->setMaxDiskUsage(1);
+        //-- We're basically telling it to use 1kb of disk for cache. It doesn't like
+        //   values smaller than that and I could not find a way to make it NOT cache.
+        pTileCache->setMaxDiskUsage(1024);
         pTileCache->setMaxMemoryUsage(memLimit);
     }
 }

src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc

@@ -54,7 +54,7 @@ QGCMapEngineManager::QGCMapEngineManager(QGCApplication* app)
 //-----------------------------------------------------------------------------
 QGCMapEngineManager::~QGCMapEngineManager()
 {
-    //_clearTileSets();
+    _tileSets.clear();
 }
 
 //-----------------------------------------------------------------------------
@@ -120,7 +120,7 @@ void
 QGCMapEngineManager::loadTileSets()
 {
     if(_tileSets.count()) {
-        _clearTileSets();
+        _tileSets.clear();
         emit tileSetsChanged();
     }
     QGCFetchTileSetTask* task = new QGCFetchTileSetTask();
@@ -142,18 +142,6 @@ QGCMapEngineManager::_tileSetFetched(QGCCachedTileSet* tileSet)
     emit tileSetsChanged();
 }
 
-//-----------------------------------------------------------------------------
-void
-QGCMapEngineManager::_clearTileSets()
-{
-    while(_tileSets.count()) {
-        QGCCachedTileSet* tileSet = qobject_cast<QGCCachedTileSet*>(_tileSets[0]);
-        if(tileSet)
-            delete tileSet;
-        _tileSets.removeAt(0);
-    }
-}
-
 //-----------------------------------------------------------------------------
 void
 QGCMapEngineManager::startDownload(const QString& name, const QString& description, const QString& mapType, const QImage& image)

src/QtLocationPlugin/QMLControl/QGCMapEngineManager.h

@@ -123,7 +123,6 @@ private slots:
     void _resetCompleted        ();
 
 private:
-    void _clearTileSets         ();
     void _updateDiskFreeSpace   ();
 
 private: