root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-21 14:24:24 +02:00
Code Issues Projects Releases Activity

Separated map downloaders, added configurable connection timeouts

Browse Source
This commit is contained in:
Martin Tůma
2018-04-27 19:31:27 +02:00
parent 62962b5de2
commit 566f3185f9
19 changed files with 103 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/map/wmtsmap.cpp
View File

@ -23,8 +23,8 @@ bool WMTSMap::loadWMTS()
_bounds = wmts.bounds();
_zooms = wmts.zooms();
_projection = wmts.projection();
_tileLoader = TileLoader(wmts.tileUrl(), tilesDir(),
_setup.authorization());
_tileLoader->setUrl(wmts.tileUrl());
_tileLoader->setAuthorization(_setup.authorization());
if (_setup.coordinateSystem().axisOrder() == CoordinateSystem::Unknown)
_cs = _projection.coordinateSystem();
@ -45,12 +45,16 @@ WMTSMap::WMTSMap(const QString &name, const WMTS::Setup &setup, QObject *parent)
return;
}
_tileLoader = new TileLoader(this);
_tileLoader->setDir(tilesDir());
connect(_tileLoader, SIGNAL(finished()), this, SIGNAL(loaded()));
_valid = loadWMTS();
}
void WMTSMap::clearCache()
{
_tileLoader.clearCache();
_tileLoader->clearCache();
_zoom = 0;
if (!loadWMTS())
@ -87,23 +91,6 @@ void WMTSMap::updateTransform()
_transform = Transform(tl, br);
}
void WMTSMap::load()
{
connect(TileLoader::downloader(), SIGNAL(finished()), this,
SLOT(emitLoaded()));
}
void WMTSMap::unload()
{
disconnect(TileLoader::downloader(), SIGNAL(finished()), this,
SLOT(emitLoaded()));
}
void WMTSMap::emitLoaded()
{
emit loaded();
}
QRectF WMTSMap::bounds() const
{
const WMTS::Zoom &z = _zooms.at(_zoom);
@ -185,9 +172,9 @@ void WMTSMap::draw(QPainter *painter, const QRectF &rect)
tiles.append(Tile(QPoint(i, j), z.id()));
if (_block)
_tileLoader.loadTilesSync(tiles);
_tileLoader->loadTilesSync(tiles);
else
_tileLoader.loadTilesAsync(tiles);
_tileLoader->loadTilesAsync(tiles);
for (int i = 0; i < tiles.count(); i++) {
Tile &t = tiles[i];