root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-30 22:51:16 +01:00
Code Issues Projects Releases Activity

Added error checking

Browse Source
This commit is contained in:
Martin Tůma 2018-02-24 11:40:54 +01:00
parent 6e95d484cd
commit fa3e6d8550
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/map/wmts.cpp
View File

@ -243,6 +243,8 @@ bool WMTS::getCapabilities(const QString &url, const QString &file)
bool WMTS::load(const QString &file, const QString &url, const QString &layer, bool WMTS::load(const QString &file, const QString &url, const QString &layer,
const QString &set) const QString &set)
{ {
QMap<QString, Zoom>::const_iterator it;
if (!QFileInfo(file).exists()) if (!QFileInfo(file).exists())
if (!getCapabilities(url, file)) if (!getCapabilities(url, file))
return false; return false;
@ -257,6 +259,12 @@ bool WMTS::load(const QString &file, const QString &url, const QString &layer,
_errorString = "No tile matrix found"; _errorString = "No tile matrix found";
return false; return false;
} }
for (it = _zooms.constBegin(); it != _zooms.constEnd(); ++it) {
if (!it->isValid()) {
_errorString = it->id + ": invalid tile matrix definition";
return false;
}
}
return true; return true;
} }

4
src/map/wmts.h
View File

@ -20,8 +20,12 @@ public:
QSize matrix; QSize matrix;
QRect limits; QRect limits;
Zoom() : scaleDenominator(0) {}
bool operator<(const Zoom &other) const bool operator<(const Zoom &other) const
{return this->scaleDenominator > other.scaleDenominator;} {return this->scaleDenominator > other.scaleDenominator;}
bool isValid() const
{return scaleDenominator > 0 && !id.isEmpty() && tile.isValid()
&& matrix.isValid();}
}; };
bool load(const QString &path, const QString &url, const QString &layer, bool load(const QString &path, const QString &url, const QString &layer,