root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-20 22:04:23 +02:00
Code Issues Projects Releases Activity

Use the correct axis order defaults for WMS/WMTS maps

Browse Source
This commit is contained in:
Martin Tůma
2018-04-05 20:38:23 +02:00
parent 3aa1ab4b4c
commit 81b3a517f8
22 changed files with 2023 additions and 1906 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/map/mapsource.cpp
View File

@ -15,9 +15,20 @@
MapSource::Config::Config() : type(TMS), zooms(ZOOM_MIN, ZOOM_MAX),
bounds(Coordinates(BOUNDS_LEFT, BOUNDS_TOP), Coordinates(BOUNDS_RIGHT,
BOUNDS_BOTTOM)), format("image/png"), rest(false), yx(false) {}
BOUNDS_BOTTOM)), format("image/png"), axisOrder(Unknown), rest(false) {}
static AxisOrder axisOrder(QXmlStreamReader &reader)
{
QXmlStreamAttributes attr = reader.attributes();
if (attr.value("axis") == "yx")
return AxisOrder::YX;
else if (attr.value("axis") == "xy")
return AxisOrder::XY;
else
return AxisOrder::Unknown;
}
Range MapSource::zooms(QXmlStreamReader &reader)
{
const QXmlStreamAttributes &attr = reader.attributes();
@ -123,15 +134,14 @@ void MapSource::map(QXmlStreamReader &reader, Config &config)
} else if (reader.name() == "bounds") {
config.bounds = bounds(reader);
reader.skipCurrentElement();
} else if (reader.name() == "format") {
} else if (reader.name() == "format")
config.format = reader.readElementText();
} else if (reader.name() == "layer")
else if (reader.name() == "layer")
config.layer = reader.readElementText();
else if (reader.name() == "style")
config.style = reader.readElementText();
else if (reader.name() == "set") {
config.yx = (reader.attributes().value("axis") == "yx")
? true : false;
config.axisOrder = axisOrder(reader);
config.set = reader.readElementText();
} else if (reader.name() == "dimension") {
QXmlStreamAttributes attr = reader.attributes();
@ -141,8 +151,7 @@ void MapSource::map(QXmlStreamReader &reader, Config &config)
config.dimensions.append(QPair<QString, QString>(
attr.value("id").toString(), reader.readElementText()));
} else if (reader.name() == "crs") {
config.yx = (reader.attributes().value("axis") == "yx")
? true : false;
config.axisOrder = axisOrder(reader);
config.crs = reader.readElementText();
} else if (reader.name() == "authorization") {
QXmlStreamAttributes attr = reader.attributes();
@ -214,11 +223,11 @@ Map *MapSource::loadFile(const QString &path)
if (config.type == WMTS)
m = new WMTSMap(config.name, WMTS::Setup(config.url, config.layer,
config.set, config.style, config.format, config.rest, config.yx,
config.set, config.style, config.format, config.rest, config.axisOrder,
config.dimensions, config.authorization));
else if (config.type == WMS)
m = new WMSMap(config.name, WMS::Setup(config.url, config.layer,
config.style, config.format, config.crs, config.yx,
config.style, config.format, config.crs, config.axisOrder,
config.authorization));
else
m = new OnlineMap(config.name, config.url, config.zooms, config.bounds);