root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-01-31 09:05:14 +01:00
Code Issues Projects Releases Activity

Enable empty WMTS styles

Browse Source
This commit is contained in:
Martin Tůma 2019-02-15 20:32:53 +01:00
parent ec9d81c65a
commit 1444a88ad0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/map/wmts.cpp
View File

@ -179,7 +179,7 @@ void WMTS::layer(QXmlStreamReader &reader, CTX &ctx)
QString s = style(reader); QString s = style(reader);
if (isDefault) if (isDefault)
ctx.defaultStyle = s; ctx.defaultStyle = s;
if (!s.isEmpty() && s == ctx.setup.style()) if (s == ctx.setup.style())
ctx.hasStyle = true; ctx.hasStyle = true;
} else if (reader.name() == "Format") { } else if (reader.name() == "Format") {
if (reader.readElementText() == ctx.setup.format()) if (reader.readElementText() == ctx.setup.format())
@ -257,7 +257,8 @@ bool WMTS::parseCapabilities(const QString &path, CTX &ctx)
_errorString = ctx.setup.style() + ": style not provided"; _errorString = ctx.setup.style() + ": style not provided";
return false; return false;
} }
if (ctx.setup.style().isEmpty() && ctx.defaultStyle.isEmpty()) { if (!ctx.hasStyle && ctx.setup.style().isEmpty()
&& ctx.defaultStyle.isEmpty()) {
_errorString = "Default style not provided"; _errorString = "Default style not provided";
return false; return false;
} }