root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-06-27 11:39:16 +02:00
Code Issues Projects Releases Activity

Added support for custom HTTP headers in map tile requests

Browse Source
This commit is contained in:
Martin Tůma
2023-05-13 15:01:35 +02:00
parent ddc7eb7149
commit d0cea97c90
17 changed files with 69 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/map/mapsource.cpp
View File

@ -189,14 +189,22 @@ void MapSource::map(QXmlStreamReader &reader, Config &config)
else
config.dimensions.append(KV<QString, QString>
(attr.value("id").toString(), reader.readElementText()));
} else if (reader.name() == QLatin1String("header")) {
QXmlStreamAttributes attr = reader.attributes();
if (!attr.hasAttribute("name"))
reader.raiseError("Missing header name");
else
config.headers.append(HTTPHeader(
attr.value("name").toString().toLatin1(),
reader.readElementText().toLatin1()));
} else if (reader.name() == QLatin1String("crs")) {
config.coordinateSystem = coordinateSystem(reader);
config.crs = reader.readElementText();
} else if (reader.name() == QLatin1String("authorization")) {
QXmlStreamAttributes attr = reader.attributes();
config.authorization = Authorization(
attr.value("username").toString(),
Authorization auth(attr.value("username").toString(),
attr.value("password").toString());
config.headers.append(auth.header());
reader.skipCurrentElement();
} else if (reader.name() == QLatin1String("tile")) {
tile(reader, config);
@ -252,24 +260,24 @@ Map *MapSource::create(const QString &path, bool *isDir)
case WMTS:
return new WMTSMap(path, config.name, WMTS::Setup(config.url,
config.layer, config.set, config.style, config.format, config.rest,
config.coordinateSystem, config.dimensions, config.authorization),
config.coordinateSystem, config.dimensions, config.headers),
config.tileRatio);
case WMS:
return new WMSMap(path, config.name, WMS::Setup(config.url,
config.layer, config.style, config.format, config.crs,
config.coordinateSystem, config.dimensions, config.authorization),
config.coordinateSystem, config.dimensions, config.headers),
config.tileSize);
case TMS:
return new OnlineMap(path, config.name, config.url, config.zooms,
config.bounds, config.tileRatio, config.authorization,
config.bounds, config.tileRatio, config.headers,
config.tileSize, config.scalable, true, false);
case OSM:
return new OnlineMap(path, config.name, config.url, config.zooms,
config.bounds, config.tileRatio, config.authorization,
config.bounds, config.tileRatio, config.headers,
config.tileSize, config.scalable, false, false);
case QuadTiles:
return new OnlineMap(path, config.name, config.url, config.zooms,
config.bounds, config.tileRatio, config.authorization,
config.bounds, config.tileRatio, config.headers,
config.tileSize, config.scalable, false, true);
default:
return new InvalidMap(path, "Invalid map type");

2
src/map/mapsource.h
View File

@ -40,7 +40,7 @@ private:
CoordinateSystem coordinateSystem;
bool rest;
QList<KV<QString, QString> > dimensions;
Authorization authorization;
QList<HTTPHeader> headers;
qreal tileRatio;
int tileSize;
bool scalable;

4
src/map/onlinemap.cpp
View File

@ -10,7 +10,7 @@
OnlineMap::OnlineMap(const QString &fileName, const QString &name,
const QString &url, const Range &zooms, const RectC &bounds, qreal tileRatio,
const Authorization &authorization, int tileSize, bool scalable, bool invertY,
const QList<HTTPHeader> &headers, int tileSize, bool scalable, bool invertY,
bool quadTiles, QObject *parent)
: Map(fileName, parent), _name(name), _zooms(zooms), _bounds(bounds),
_zoom(_zooms.max()), _tileSize(tileSize), _mapRatio(1.0),
@ -19,7 +19,7 @@ OnlineMap::OnlineMap(const QString &fileName, const QString &name,
_tileLoader = new TileLoader(QDir(ProgramPaths::tilesDir()).filePath(_name),
this);
_tileLoader->setUrl(url);
_tileLoader->setAuthorization(authorization);
_tileLoader->setHeaders(headers);
_tileLoader->setQuadTiles(quadTiles);
connect(_tileLoader, &TileLoader::finished, this, &OnlineMap::tilesLoaded);
}

2
src/map/onlinemap.h
View File

@ -13,7 +13,7 @@ class OnlineMap : public Map
public:
OnlineMap(const QString &fileName, const QString &name, const QString &url,
const Range &zooms, const RectC &bounds, qreal tileRatio,
const Authorization &authorization, int tileSize, bool scalable,
const QList<HTTPHeader> &headers, int tileSize, bool scalable,
bool invertY, bool quadTiles, QObject *parent = 0);
QString name() const {return _name;}

4
src/map/tileloader.cpp
View File

@ -88,7 +88,7 @@ void TileLoader::loadTilesAsync(QVector<FetchTile> &list)
}
if (!dl.empty())
_downloader->get(dl, _authorization);
_downloader->get(dl, _headers);
QFuture<void> future = QtConcurrent::map(imgs, &TileImage::load);
future.waitForFinished();
@ -130,7 +130,7 @@ void TileLoader::loadTilesSync(QVector<FetchTile> &list)
if (!dl.empty()) {
QEventLoop wait;
connect(_downloader, &Downloader::finished, &wait, &QEventLoop::quit);
if (_downloader->get(dl, _authorization))
if (_downloader->get(dl, _headers))
wait.exec();
for (int i = 0; i < tl.size(); i++) {

5
src/map/tileloader.h
View File

@ -14,8 +14,7 @@ public:
TileLoader(const QString &dir, QObject *parent = 0);
void setUrl(const QString &url) {_url = url;}
void setAuthorization(const Authorization &authorization)
{_authorization = authorization;}
void setHeaders(const QList<HTTPHeader> &headers) {_headers = headers;}
void setScaledSize(int size);
void setQuadTiles(bool quadTiles) {_quadTiles = quadTiles;}
@ -33,7 +32,7 @@ private:
Downloader *_downloader;
QString _url;
QString _dir;
Authorization _authorization;
QList<HTTPHeader> _headers;
int _scaledSize;
bool _quadTiles;
};

2
src/map/wms.cpp
View File

@ -345,7 +345,7 @@ WMS::WMS(const QString &file, const WMS::Setup &setup, QObject *parent)
QList<Download> dl;
dl.append(Download(url, _path));
_valid = downloader->get(dl, _setup.authorization());
_valid = downloader->get(dl, _setup.headers());
} else {
_ready = true;
_valid = parseCapabilities();

8
src/map/wms.h
View File

@ -23,13 +23,13 @@ public:
Setup(const QString &url, const QString &layer, const QString &style,
const QString &format, const QString &crs, const CoordinateSystem &cs,
const QList<KV<QString, QString> > &dimensions,
const Authorization &authorization = Authorization())
const QList<HTTPHeader> &headers)
: _url(url), _layer(layer), _style(style), _format(format),
_crs(crs), _cs(cs), _dimensions(dimensions),
_authorization(authorization) {}
_headers(headers) {}
const QString &url() const {return _url;}
const Authorization &authorization() const {return _authorization;}
const QList<HTTPHeader> &headers() const {return _headers;}
const QString &layer() const {return _layer;}
const QString &style() const {return _style;}
const QString &format() const {return _format;}
@ -46,7 +46,7 @@ public:
QString _crs;
CoordinateSystem _cs;
QList<KV<QString, QString> > _dimensions;
Authorization _authorization;
QList<HTTPHeader> _headers;
};

2
src/map/wmsmap.cpp
View File

@ -74,7 +74,7 @@ WMSMap::WMSMap(const QString &fileName, const QString &name,
QString tilesDir(QDir(ProgramPaths::tilesDir()).filePath(_name));
_tileLoader = new TileLoader(tilesDir, this);
_tileLoader->setAuthorization(setup.authorization());
_tileLoader->setHeaders(setup.headers());
connect(_tileLoader, &TileLoader::finished, this, &WMSMap::tilesLoaded);
_wms = new WMS(QDir(tilesDir).filePath(CAPABILITIES_FILE), setup, this);

2
src/map/wmts.cpp
View File

@ -361,7 +361,7 @@ WMTS::WMTS(const QString &file, const WMTS::Setup &setup, QObject *parent)
QList<Download> dl;
dl.append(Download(url.toString(), _path));
_valid = downloader->get(dl, _setup.authorization());
_valid = downloader->get(dl, _setup.headers());
} else {
_ready = true;
_valid = init();

8
src/map/wmts.h
View File

@ -27,13 +27,13 @@ public:
const QString &style, const QString &format, bool rest,
const CoordinateSystem &cs,
const QList<KV<QString, QString> > &dimensions,
const Authorization &authorization = Authorization())
const QList<HTTPHeader> &headers)
: _url(url), _layer(layer), _set(set), _style(style),
_format(format), _rest(rest), _cs(cs), _dimensions(dimensions),
_authorization(authorization) {}
_headers(headers) {}
const QString &url() const {return _url;}
const Authorization &authorization() const {return _authorization;}
const QList<HTTPHeader> &headers() const {return _headers;}
const QString &layer() const {return _layer;}
const QString &set() const {return _set;}
const QString &style() const {return _style;}
@ -52,7 +52,7 @@ public:
bool _rest;
CoordinateSystem _cs;
QList<KV<QString, QString> > _dimensions;
Authorization _authorization;
QList<HTTPHeader> _headers;
};
class Zoom

2
src/map/wmtsmap.cpp
View File

@ -20,7 +20,7 @@ WMTSMap::WMTSMap(const QString &fileName, const QString &name,
QString tilesDir(QDir(ProgramPaths::tilesDir()).filePath(_name));
_tileLoader = new TileLoader(tilesDir, this);
_tileLoader->setAuthorization(setup.authorization());
_tileLoader->setHeaders(setup.headers());
connect(_tileLoader, &TileLoader::finished, this, &WMTSMap::tilesLoaded);
_wmts = new WMTS(QDir(tilesDir).filePath(CAPABILITIES_FILE), setup, this);