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

Fixed broken map sources parsing

Browse Source
This commit is contained in:
Martin Tůma 2018-12-08 02:27:27 +01:00
parent 5b21d550af
commit 9f0fcdc13e
2 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/map/mapsource.cpp
View File

@ -112,11 +112,47 @@ RectC MapSource::bounds(QXmlStreamReader &reader)
return RectC(Coordinates(left, top), Coordinates(right, bottom)); return RectC(Coordinates(left, top), Coordinates(right, bottom));
} }
void MapSource::tile(QXmlStreamReader &reader, Config &config)
{
QXmlStreamAttributes attr = reader.attributes();
bool ok;
if (attr.hasAttribute("size")) {
int size = attr.value("size").toString().toInt(&ok);
if (!ok || size < 0) {
reader.raiseError("Invalid tile size");
return;
} else
config.tileSize = size;
}
if (attr.hasAttribute("type")) {
if (attr.value("type") == "raster")
config.scalable = false;
else if (attr.value("type") == "vector")
config.scalable = true;
else {
reader.raiseError("Invalid tile type");
return;
}
}
if (attr.hasAttribute("pixelRatio")) {
#ifdef ENABLE_HIDPI
qreal ratio = attr.value("pixelRatio").toString().toDouble(&ok);
if (!ok || ratio < 0) {
reader.raiseError("Invalid tile pixelRatio");
return;
} else
config.tileRatio = ratio;
#else // ENABLE_HIDPI
reader.raiseError("HiDPI maps not supported");
#endif // ENABLE_HIDPI
}
}
void MapSource::map(QXmlStreamReader &reader, Config &config) void MapSource::map(QXmlStreamReader &reader, Config &config)
{ {
const QXmlStreamAttributes &attr = reader.attributes(); const QXmlStreamAttributes &attr = reader.attributes();
QStringRef type = attr.value("type"); QStringRef type = attr.value("type");
bool res;
if (type == "WMTS") if (type == "WMTS")
config.type = WMTS; config.type = WMTS;
@ -172,48 +208,18 @@ void MapSource::map(QXmlStreamReader &reader, Config &config)
} else if (reader.name() == "tilePixelRatio") { } else if (reader.name() == "tilePixelRatio") {
// Legacy tilePixelRatio tag support // Legacy tilePixelRatio tag support
#ifdef ENABLE_HIDPI #ifdef ENABLE_HIDPI
qreal val = reader.readElementText().toDouble(&res); bool ok;
if (!res) qreal ratio = reader.readElementText().toDouble(&ok);
if (!ok || ratio <= 0)
reader.raiseError("Invalid tilePixelRatio"); reader.raiseError("Invalid tilePixelRatio");
else else
config.tileRatio = val; config.tileRatio = ratio;
#else // ENABLE_HIDPI #else // ENABLE_HIDPI
reader.raiseError("HiDPI maps not supported"); reader.raiseError("HiDPI maps not supported");
#endif // ENABLE_HIDPI #endif // ENABLE_HIDPI
} else if (reader.name() == "tile") { } else if (reader.name() == "tile") {
QXmlStreamAttributes attr = reader.attributes(); tile(reader, config);
reader.skipCurrentElement();
if (attr.hasAttribute("size")) {
int size = attr.value("size").toString().toInt(&res);
if (!res || size < 0) {
reader.raiseError("Invalid tile size");
return;
} else
config.tileSize = size;
}
if (attr.hasAttribute("type")) {
if (attr.value("type") == "raster")
config.scalable = false;
else if (attr.value("type") == "vector")
config.scalable = true;
else {
reader.raiseError("Invalid tile type");
return;
}
}
if (attr.hasAttribute("pixelRatio")) {
#ifdef ENABLE_HIDPI
qreal ratio = attr.value("pixelRatio").toString().toDouble(&res);
if (!res || ratio < 0) {
reader.raiseError("Invalid tile pixelRatio");
return;
} else
config.tileRatio = ratio;
#else // ENABLE_HIDPI
reader.raiseError("HiDPI maps not supported");
#endif // ENABLE_HIDPI
}
} else } else
reader.skipCurrentElement(); reader.skipCurrentElement();
} }

1
src/map/mapsource.h
View File

@ -49,6 +49,7 @@ private:
static RectC bounds(QXmlStreamReader &reader); static RectC bounds(QXmlStreamReader &reader);
static Range zooms(QXmlStreamReader &reader); static Range zooms(QXmlStreamReader &reader);
static void map(QXmlStreamReader &reader, Config &config); static void map(QXmlStreamReader &reader, Config &config);
static void tile(QXmlStreamReader &reader, Config &config);
}; };
#endif // MAPSOURCE_H #endif // MAPSOURCE_H