SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

PIQt now provide PICout << operators for Qt types

Browse Source 
MapView::setTileObsoleteTime() method. You can set maximum lifetime for tile, after that it will be redownloaded
This commit is contained in:
Пелипенко Иван
2024-09-28 09:15:25 +03:00
parent 2eacbfbfc1
commit dd4695780d
7 changed files with 128 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libs/map/mapview.cpp
View File

@@ -92,10 +92,18 @@ void MapView::setCachePath(const QString & p) {
}
void collectDownloadIndeces(OSMTileCache * cache, QQueue<OSM::TileIndex> & indeces, OSM::TileIndex index, int target_zoom_level, bool only_new) {
void MapView::setTileObsoleteTime(int secs) {
cache->setTileObsoleteTime(secs);
}
void collectDownloadIndeces(OSMTileCache * cache,
QQueue<OSM::TileIndex> & indeces,
OSM::TileIndex index,
int target_zoom_level,
bool only_new) {
if (only_new) {
if (!cache->isTileFileExists(index))
indeces << index;
if (!cache->isTileFileExists(index)) indeces << index;
} else
indeces << index;
if (index.z >= target_zoom_level) return;
@@ -205,7 +213,7 @@ void MapView::mouseMoveEvent(QMouseEvent * e) {
}
}
if (e->buttons() == Qt::RightButton) {
auto dp = e->pos() - press_point;
auto dp = e->pos() - press_point;
press_point = e->pos();
zoom(1. - dp.y() / 50., zoom_anchor);
}

2
libs/map/mapview.h
View File

@@ -61,6 +61,8 @@ public:
QString cachePath() const;
void setCachePath(const QString & p);
void setTileObsoleteTime(int secs);
void downloadCurrentView(int target_zoom_level = 17, bool only_new = true);
protected:

11
libs/map/osm_tile_cache.cpp
View File

@@ -31,8 +31,10 @@ void OSMTileCache::tileDownloaded(OSM::TileIndex index, const QPixmap & pixmap)
OSM::TilePixmap OSMTileCache::getTile(OSM::TileIndex index, QRectF & rect_src) {
OSM::TilePixmap ret = getTileFromCache(index);
if (ret.isEmpty()) {
if (ret.isEmpty() || ret.obsolete) {
parent->downloader->queueTile(index);
}
if (ret.isEmpty()) {
QVector<QPointF> offsets;
while (index.z >= 0) {
index.z--;
@@ -81,10 +83,15 @@ OSM::TilePixmap OSMTileCache::getTileFromCache(OSM::TileIndex index) {
if (cache_dir.exists(hashdir)) {
QString hashname = hashdir + "/" + index.hashName();
if (cache_dir.exists(hashname)) {
ret.pixmap.load(cache_dir.absoluteFilePath(hashname), "png");
QString fname = cache_dir.absoluteFilePath(hashname);
ret.pixmap.load(fname, "png");
tile = new OSM::TilePixmap();
tile->index = index;
tile->pixmap = ret.pixmap;
if (secs_obsolete > 0) {
int secs_old = QFileInfo(fname).lastModified().secsTo(QDateTime::currentDateTime());
ret.obsolete = secs_old >= secs_obsolete;
}
tile_cache.insert(tile->index.hash(), tile, tile->pixmapBytes());
return ret;
}

2
libs/map/osm_tile_cache_p.h
View File

@@ -46,6 +46,7 @@ public:
add_size_b = mb * 1024 * 1024;
updateCacheSize();
}
void setTileObsoleteTime(int secs) { secs_obsolete = secs; }
void tileDownloaded(OSM::TileIndex index, const QPixmap & pixmap);
OSM::TilePixmap getTile(OSM::TileIndex index, QRectF & rect_src);
@@ -67,6 +68,7 @@ private:
QDir cache_dir;
QWaitCondition cond;
QMutex cond_mutex;
int secs_obsolete = -1;
int fixed_size_b = 0, add_size_b = 0;
QQueue<OSM::TilePixmap> queue;
QCache<quint64, OSM::TilePixmap> tile_cache;

1
libs/map/osm_types_p.h
View File

@@ -36,6 +36,7 @@ struct TileIndex {
struct TilePixmap {
TileIndex index;
QPixmap pixmap;
bool obsolete = false;
bool isEmpty() const;
int pixmapBytes() const;
};