root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-28 05:34:47 +01:00
Code Issues Projects Releases Activity

Code cleanup

Browse Source
This commit is contained in:
Martin Tůma 2018-04-27 23:08:44 +02:00
parent 2b0989438a
commit 266a1d037e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/wmsmap.cpp
View File

@ -87,7 +87,6 @@ bool WMSMap::loadWMS()
_tl = _projection.ll2xy(wms.boundingBox().topLeft()); _tl = _projection.ll2xy(wms.boundingBox().topLeft());
_br = _projection.ll2xy(wms.boundingBox().bottomRight()); _br = _projection.ll2xy(wms.boundingBox().bottomRight());
_tileLoader->setUrl(tileUrl(wms.version())); _tileLoader->setUrl(tileUrl(wms.version()));
_tileLoader->setAuthorization(_setup.authorization());
if (wms.version() >= "1.3.0") { if (wms.version() >= "1.3.0") {
if (_setup.coordinateSystem().axisOrder() == CoordinateSystem::Unknown) if (_setup.coordinateSystem().axisOrder() == CoordinateSystem::Unknown)
@ -114,6 +113,7 @@ WMSMap::WMSMap(const QString &name, const WMS::Setup &setup, QObject *parent)
_tileLoader = new TileLoader(this); _tileLoader = new TileLoader(this);
_tileLoader->setDir(tilesDir()); _tileLoader->setDir(tilesDir());
_tileLoader->setAuthorization(_setup.authorization());
connect(_tileLoader, SIGNAL(finished()), this, SIGNAL(loaded())); connect(_tileLoader, SIGNAL(finished()), this, SIGNAL(loaded()));
_valid = loadWMS(); _valid = loadWMS();

2
src/map/wmtsmap.cpp
View File

@ -24,7 +24,6 @@ bool WMTSMap::loadWMTS()
_zooms = wmts.zooms(); _zooms = wmts.zooms();
_projection = wmts.projection(); _projection = wmts.projection();
_tileLoader->setUrl(wmts.tileUrl()); _tileLoader->setUrl(wmts.tileUrl());
_tileLoader->setAuthorization(_setup.authorization());
if (_setup.coordinateSystem().axisOrder() == CoordinateSystem::Unknown) if (_setup.coordinateSystem().axisOrder() == CoordinateSystem::Unknown)
_cs = _projection.coordinateSystem(); _cs = _projection.coordinateSystem();
@ -47,6 +46,7 @@ WMTSMap::WMTSMap(const QString &name, const WMTS::Setup &setup, QObject *parent)
_tileLoader = new TileLoader(this); _tileLoader = new TileLoader(this);
_tileLoader->setDir(tilesDir()); _tileLoader->setDir(tilesDir());
_tileLoader->setAuthorization(_setup.authorization());
connect(_tileLoader, SIGNAL(finished()), this, SIGNAL(loaded())); connect(_tileLoader, SIGNAL(finished()), this, SIGNAL(loaded()));
_valid = loadWMTS(); _valid = loadWMTS();