root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 11:45:53 +01:00
Code Issues Projects Releases Activity

Added missing WMS 1.1 ScaleHint handling

Browse Source
This commit is contained in:
Martin Tůma 2020-02-29 13:47:27 +01:00
parent 92deaaaf2b
commit 9dd4e117f6
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/map/wms.cpp
View File

@ -1,3 +1,4 @@
#include <cmath>
#include <QFileInfo> #include <QFileInfo>
#include <QEventLoop> #include <QEventLoop>
#include <QXmlStreamReader> #include <QXmlStreamReader>
@ -7,6 +8,11 @@
#include "wms.h" #include "wms.h"
static inline double hint2denominator(double h)
{
return sqrt((h * h) / 2.0) / 0.28e-3;
}
WMS::CTX::CTX(const Setup &setup) : setup(setup), formatSupported(false) WMS::CTX::CTX(const Setup &setup) : setup(setup), formatSupported(false)
{ {
QStringList ll = setup.layer().split(','); QStringList ll = setup.layer().split(',');
@ -97,7 +103,13 @@ void WMS::layer(QXmlStreamReader &reader, CTX &ctx,
CRSs.append(reader.readElementText()); CRSs.append(reader.readElementText());
else if (reader.name() == "Style") else if (reader.name() == "Style")
styles.append(style(reader)); styles.append(style(reader));
else if (reader.name() == "MinScaleDenominator") { else if (reader.name() == "ScaleHint") {
QXmlStreamAttributes attr = reader.attributes();
double minHint = attr.value("min").toString().toDouble();
double maxHint = attr.value("max").toString().toDouble();
scaleDenominator.setMin(hint2denominator(minHint));
scaleDenominator.setMax(hint2denominator(maxHint));
} else if (reader.name() == "MinScaleDenominator") {
double sd = reader.readElementText().toDouble(); double sd = reader.readElementText().toDouble();
if (sd > 0) if (sd > 0)
scaleDenominator.setMin(sd); scaleDenominator.setMin(sd);