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

Fixed map calibration

Browse Source
This commit is contained in:
Martin Tůma 2022-08-05 08:34:16 +02:00
parent 1b83f88b27
commit 0ef28cda0f
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/map/oruxmap.cpp
View File

@ -206,7 +206,7 @@ void OruxMap::calibrationPoints(QXmlStreamReader &reader, const QSize &size,
void OruxMap::mapCalibration(QXmlStreamReader &reader, int level) void OruxMap::mapCalibration(QXmlStreamReader &reader, int level)
{ {
int zoom; int zoom;
QSize tileSize, size; QSize tileSize, size, calibrationSize;
QString datum, projection; QString datum, projection;
QList<CalibrationPoint> points; QList<CalibrationPoint> points;
Projection proj; Projection proj;
@ -241,6 +241,8 @@ void OruxMap::mapCalibration(QXmlStreamReader &reader, int level)
tileSize = QSize(width, height); tileSize = QSize(width, height);
size = QSize(xMax * width, yMax * height); size = QSize(xMax * width, yMax * height);
calibrationSize = size;
GCS gcs(createGCS(datum)); GCS gcs(createGCS(datum));
if (!gcs.isValid()) { if (!gcs.isValid()) {
reader.raiseError(QString("%1: invalid/unknown datum") reader.raiseError(QString("%1: invalid/unknown datum")
@ -254,9 +256,22 @@ void OruxMap::mapCalibration(QXmlStreamReader &reader, int level)
return; return;
} }
reader.readElementText();
} else if (reader.name() == QLatin1String("MapDimensions")) {
int height, width;
QXmlStreamAttributes attr = reader.attributes();
if (!intAttr(reader, attr, "height", height))
return;
if (!intAttr(reader, attr, "width", width))
return;
calibrationSize = QSize(width, height);
reader.readElementText(); reader.readElementText();
} else if (reader.name() == QLatin1String("CalibrationPoints")) } else if (reader.name() == QLatin1String("CalibrationPoints"))
calibrationPoints(reader, size, points); calibrationPoints(reader, calibrationSize, points);
else else
reader.skipCurrentElement(); reader.skipCurrentElement();
} }