root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-02-26 04:00:49 +01:00
Code Issues Projects Releases Activity

Added support for OziExplorer files with UTF8 BOMs

Browse Source
This commit is contained in:
Martin Tůma 2018-06-02 16:41:27 +02:00
parent 815cb6cb91
commit ec247d5d1d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/data/oziparsers.cpp
View File

@ -24,7 +24,8 @@ bool PLTParser::parse(QFile *file, QList<TrackData> &tracks,
QByteArray line = file->readLine(); QByteArray line = file->readLine();
if (_errorLine == 1) { if (_errorLine == 1) {
if (!line.trimmed().startsWith("OziExplorer Track Point File")) { QString fileType(QString::fromUtf8(line).trimmed());
if (!fileType.startsWith("OziExplorer Track Point File")) {
_errorString = "Not a PLT file"; _errorString = "Not a PLT file";
return false; return false;
} }
@ -107,7 +108,8 @@ bool RTEParser::parse(QFile *file, QList<TrackData> &tracks,
QByteArray line = file->readLine(); QByteArray line = file->readLine();
if (_errorLine == 1) { if (_errorLine == 1) {
if (!line.trimmed().startsWith("OziExplorer Route File")) { QString fileType(QString::fromUtf8(line).trimmed());
if (!fileType.startsWith("OziExplorer Route File")) {
_errorString = "Not a RTE file"; _errorString = "Not a RTE file";
return false; return false;
} }
@ -201,7 +203,8 @@ bool WPTParser::parse(QFile *file, QList<TrackData> &tracks,
QByteArray line = file->readLine(); QByteArray line = file->readLine();
if (_errorLine == 1) { if (_errorLine == 1) {
if (!line.trimmed().startsWith("OziExplorer Waypoint File")) { QString fileType(QString::fromUtf8(line).trimmed());
if (!fileType.startsWith("OziExplorer Waypoint File")) {
_errorString = "Not a WPT file"; _errorString = "Not a WPT file";
return false; return false;
} }

3
src/map/mapfile.cpp
View File

@ -26,7 +26,8 @@ int MapFile::parse(QIODevice &device, QList<CalibrationPoint> &points,
QByteArray line = device.readLine(); QByteArray line = device.readLine();
if (ln == 1) { if (ln == 1) {
if (!line.trimmed().startsWith("OziExplorer Map Data File")) QString fileType(QString::fromUtf8(line).trimmed());
if (!fileType.startsWith("OziExplorer Map Data File"))
return ln; return ln;
} else if (ln == 2) } else if (ln == 2)
_name = line.trimmed(); _name = line.trimmed();