Skip to content

Q
qgroundcontrol
Unverified Commit 2af0422b authored by Gus Grubba's avatar Gus Grubba Committed by GitHub
Browse files
Options

Merge pull request #6000 from mavlink/offlineMapTiles 

Offline map fixes
parents 70d6ccb0 1db0adaf
Show whitespace changes
Inline Side-by-side
Showing with 133 additions and 97 deletions
src/QtLocationPlugin/QGCTileCacheWorker.cpp
View file @ 2af0422b
...@@ -607,19 +607,26 @@ QGCCacheWorker::_deleteTileSet(QGCMapTask* mtask) ...@@ -607,19 +607,26 @@ QGCCacheWorker::_deleteTileSet(QGCMapTask* mtask)
return; return;
} }
QGCDeleteTileSetTask* task = static_cast<QGCDeleteTileSetTask*>(mtask); QGCDeleteTileSetTask* task = static_cast<QGCDeleteTileSetTask*>(mtask);
_deleteTileSet(task->setID());
task->setTileSetDeleted();
}
//-----------------------------------------------------------------------------
void
QGCCacheWorker::_deleteTileSet(qulonglong id)
{
QSqlQuery query(*_db); QSqlQuery query(*_db);
QString s; QString s;
//-- Only delete tiles unique to this set //-- Only delete tiles unique to this set
s = QString("DELETE FROM Tiles WHERE tileID IN (SELECT A.tileID FROM SetTiles A JOIN SetTiles B ON A.tileID = B.tileID WHERE B.setID = %1 GROUP BY A.tileID HAVING COUNT(A.tileID) = 1)").arg(task->setID()); s = QString("DELETE FROM Tiles WHERE tileID IN (SELECT A.tileID FROM SetTiles A JOIN SetTiles B ON A.tileID = B.tileID WHERE B.setID = %1 GROUP BY A.tileID HAVING COUNT(A.tileID) = 1)").arg(id);
query.exec(s); query.exec(s);
s = QString("DELETE FROM TilesDownload WHERE setID = %1").arg(task->setID()); s = QString("DELETE FROM TilesDownload WHERE setID = %1").arg(id);
query.exec(s); query.exec(s);
s = QString("DELETE FROM TileSets WHERE setID = %1").arg(task->setID()); s = QString("DELETE FROM TileSets WHERE setID = %1").arg(id);
query.exec(s); query.exec(s);
s = QString("DELETE FROM SetTiles WHERE setID = %1").arg(task->setID()); s = QString("DELETE FROM SetTiles WHERE setID = %1").arg(id);
query.exec(s); query.exec(s);
_updateTotals(); _updateTotals();
task->setTileSetDeleted();
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
...@@ -700,17 +707,16 @@ QGCCacheWorker::_importSets(QGCMapTask* mtask) ...@@ -700,17 +707,16 @@ QGCCacheWorker::_importSets(QGCMapTask* mtask)
//-- Prepare progress report //-- Prepare progress report
quint64 tileCount = 0; quint64 tileCount = 0;
quint64 currentCount = 0; quint64 currentCount = 0;
int lastProgress = -1;
QString s; QString s;
s = QString("SELECT COUNT(tileID) FROM Tiles"); s = QString("SELECT COUNT(tileID) FROM Tiles");
if(query.exec(s)) { if(query.exec(s)) {
if(query.next()) { if(query.next()) {
//-- Total number of tiles in imported database
tileCount = query.value(0).toULongLong(); tileCount = query.value(0).toULongLong();
} }
} }
if(!tileCount) { if(tileCount) {
qWarning() << "No tiles found in imported database";
tileCount = 1; //-- Let it run through
}
//-- Iterate Tile Sets //-- Iterate Tile Sets
s = QString("SELECT * FROM TileSets ORDER BY defaultSet DESC, name ASC"); s = QString("SELECT * FROM TileSets ORDER BY defaultSet DESC, name ASC");
if(query.exec(s)) { if(query.exec(s)) {
...@@ -731,17 +737,18 @@ QGCCacheWorker::_importSets(QGCMapTask* mtask) ...@@ -731,17 +737,18 @@ QGCCacheWorker::_importSets(QGCMapTask* mtask)
//-- If not default set, create new one //-- If not default set, create new one
if(!defaultSet) { if(!defaultSet) {
//-- Check if we have this tile set already //-- Check if we have this tile set already
if(_findTileSetID(name, insertSetID)) {
int testCount = 0; int testCount = 0;
//-- Set with this name already exists. Make name unique.
while (true) { while (true) {
QString testName; QString testName;
testName.sprintf("%s %03d", name.toLatin1().data(), ++testCount); testName.sprintf("%s %02d", name.toLatin1().data(), ++testCount);
if(!_findTileSetID(testName, insertSetID) || testCount > 99) { if(!_findTileSetID(testName, insertSetID) || testCount > 99) {
if(testCount > 1) {
name = testName; name = testName;
}
break; break;
} }
} }
}
//-- Create new set //-- Create new set
QSqlQuery cQuery(*_db); QSqlQuery cQuery(*_db);
cQuery.prepare("INSERT INTO TileSets(" cQuery.prepare("INSERT INTO TileSets("
...@@ -772,8 +779,11 @@ QGCCacheWorker::_importSets(QGCMapTask* mtask) ...@@ -772,8 +779,11 @@ QGCCacheWorker::_importSets(QGCMapTask* mtask)
QSqlQuery subQuery(*dbImport); QSqlQuery subQuery(*dbImport);
QString sb = QString("SELECT * FROM Tiles WHERE tileID IN (SELECT A.tileID FROM SetTiles A JOIN SetTiles B ON A.tileID = B.tileID WHERE B.setID = %1 GROUP BY A.tileID HAVING COUNT(A.tileID) = 1)").arg(setID); QString sb = QString("SELECT * FROM Tiles WHERE tileID IN (SELECT A.tileID FROM SetTiles A JOIN SetTiles B ON A.tileID = B.tileID WHERE B.setID = %1 GROUP BY A.tileID HAVING COUNT(A.tileID) = 1)").arg(setID);
if(subQuery.exec(sb)) { if(subQuery.exec(sb)) {
quint64 tilesFound = 0;
quint64 tilesSaved = 0;
_db->transaction(); _db->transaction();
while(subQuery.next()) { while(subQuery.next()) {
tilesFound++;
QString hash = subQuery.value("hash").toString(); QString hash = subQuery.value("hash").toString();
QString format = subQuery.value("format").toString(); QString format = subQuery.value("format").toString();
QByteArray img = subQuery.value("tile").toByteArray(); QByteArray img = subQuery.value("tile").toByteArray();
...@@ -787,16 +797,25 @@ QGCCacheWorker::_importSets(QGCMapTask* mtask) ...@@ -787,16 +797,25 @@ QGCCacheWorker::_importSets(QGCMapTask* mtask)
cQuery.addBindValue(type); cQuery.addBindValue(type);
cQuery.addBindValue(QDateTime::currentDateTime().toTime_t()); cQuery.addBindValue(QDateTime::currentDateTime().toTime_t());
if(cQuery.exec()) { if(cQuery.exec()) {
tilesSaved++;
quint64 importTileID = cQuery.lastInsertId().toULongLong(); quint64 importTileID = cQuery.lastInsertId().toULongLong();
QString s = QString("INSERT INTO SetTiles(tileID, setID) VALUES(%1, %2)").arg(importTileID).arg(insertSetID); QString s = QString("INSERT INTO SetTiles(tileID, setID) VALUES(%1, %2)").arg(importTileID).arg(insertSetID);
cQuery.prepare(s); cQuery.prepare(s);
cQuery.exec(); cQuery.exec();
currentCount++; currentCount++;
task->setProgress((int)((double)currentCount / (double)tileCount * 100.0)); if(tileCount) {
int progress = (int)((double)currentCount / (double)tileCount * 100.0);
//-- Avoid calling this if (int) progress hasn't changed.
if(lastProgress != progress) {
lastProgress = progress;
task->setProgress(progress);
}
}
} }
} }
_db->commit(); _db->commit();
//-- Update tile count if(tilesSaved) {
//-- Update tile count (if any added)
s = QString("SELECT COUNT(size) FROM Tiles A INNER JOIN SetTiles B on A.tileID = B.tileID WHERE B.setID = %1").arg(insertSetID); s = QString("SELECT COUNT(size) FROM Tiles A INNER JOIN SetTiles B on A.tileID = B.tileID WHERE B.setID = %1").arg(insertSetID);
if(cQuery.exec(s)) { if(cQuery.exec(s)) {
if(cQuery.next()) { if(cQuery.next()) {
...@@ -806,12 +825,28 @@ QGCCacheWorker::_importSets(QGCMapTask* mtask) ...@@ -806,12 +825,28 @@ QGCCacheWorker::_importSets(QGCMapTask* mtask)
} }
} }
} }
qint64 uniqueTiles = tilesFound - tilesSaved;
if((quint64)uniqueTiles < tileCount) {
tileCount -= uniqueTiles;
} else {
tileCount = 0;
}
//-- If there was nothing new in this set, remove it.
if(!tilesSaved && !defaultSet) {
qCDebug(QGCTileCacheLog) << "No unique tiles in" << name << "Removing it.";
_deleteTileSet(insertSetID);
}
}
} }
} else { } else {
task->setError("No tile set in database"); task->setError("No tile set in database");
} }
}
delete dbImport; delete dbImport;
QSqlDatabase::removeDatabase(kExportSession); QSqlDatabase::removeDatabase(kExportSession);
if(!tileCount) {
task->setError("No unique tiles in imported database");
}
} else { } else {
task->setError("Error opening import database"); task->setError("Error opening import database");
} }
......
src/QtLocationPlugin/QGCTileCacheWorker.h
View file @ 2af0422b
...@@ -76,6 +76,7 @@ private: ...@@ -76,6 +76,7 @@ private:
bool _createDB (QSqlDatabase *db, bool createDefault = true); bool _createDB (QSqlDatabase *db, bool createDefault = true);
quint64 _getDefaultTileSet (); quint64 _getDefaultTileSet ();
void _updateTotals (); void _updateTotals ();
void _deleteTileSet (qulonglong id);
signals: signals:
void updateTotals (quint32 totaltiles, quint64 totalsize, quint32 defaulttiles, quint64 defaultsize); void updateTotals (quint32 totaltiles, quint64 totalsize, quint32 defaulttiles, quint64 defaultsize);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment