root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-02-07 12:05:14 +01:00
Code Issues Projects Releases Activity

Do not depend on a specific Style/StyleMap element order

Browse Source
This commit is contained in:
Martin Tůma 2022-10-03 00:36:38 +02:00
parent 3b1a4f2ccb
commit 76b0e9ac2f
2 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/data/kmlparser.cpp
View File

@ -525,7 +525,7 @@ void KMLParser::multiTrack(TrackData &t)
} }
void KMLParser::photoOverlay(const Ctx &ctx, QVector<Waypoint> &waypoints, void KMLParser::photoOverlay(const Ctx &ctx, QVector<Waypoint> &waypoints,
PointStyleMap &pointStyles) PointStyleMap &pointStyles, QMap<QString, QString> &map)
{ {
QString img, id; QString img, id;
Waypoint w; Waypoint w;
@ -548,7 +548,7 @@ void KMLParser::photoOverlay(const Ctx &ctx, QVector<Waypoint> &waypoints,
style(ctx.dir, pointStyles, unused, unused2); style(ctx.dir, pointStyles, unused, unused2);
id = QString(); id = QString();
} else if (_reader.name() == QLatin1String("StyleMap")) } else if (_reader.name() == QLatin1String("StyleMap"))
styleMap(pointStyles, unused, unused2); styleMap(map);
else if (_reader.name() == QLatin1String("Icon")) else if (_reader.name() == QLatin1String("Icon"))
img = icon(); img = icon();
else if (_reader.name() == QLatin1String("Point")) else if (_reader.name() == QLatin1String("Point"))
@ -560,7 +560,11 @@ void KMLParser::photoOverlay(const Ctx &ctx, QVector<Waypoint> &waypoints,
} }
if (!w.coordinates().isNull()) { if (!w.coordinates().isNull()) {
w.setStyle(pointStyles.value(id)); PointStyleMap::iterator pit = pointStyles.find(id);
if (pit == pointStyles.end())
pit = pointStyles.find(map.value(id));
w.setStyle(pit == pointStyles.end()
? PointStyle(QColor(0x55, 0x55, 0x55)) : *pit);
img.replace(re, "0"); img.replace(re, "0");
if (!QUrl(img).scheme().isEmpty()) if (!QUrl(img).scheme().isEmpty())
@ -611,7 +615,8 @@ void KMLParser::multiGeometry(QList<TrackData> &tracks, QList<Area> &areas,
void KMLParser::placemark(const Ctx &ctx, QList<TrackData> &tracks, void KMLParser::placemark(const Ctx &ctx, QList<TrackData> &tracks,
QList<Area> &areas, QVector<Waypoint> &waypoints, PointStyleMap &pointStyles, QList<Area> &areas, QVector<Waypoint> &waypoints, PointStyleMap &pointStyles,
PolygonStyleMap &polyStyles, LineStyleMap &lineStyles) PolygonStyleMap &polyStyles, LineStyleMap &lineStyles,
QMap<QString, QString> &map)
{ {
QString name, desc, phone, address, id; QString name, desc, phone, address, id;
QDateTime timestamp; QDateTime timestamp;
@ -634,7 +639,7 @@ void KMLParser::placemark(const Ctx &ctx, QList<TrackData> &tracks,
style(ctx.dir, pointStyles, polyStyles, lineStyles); style(ctx.dir, pointStyles, polyStyles, lineStyles);
id = QString(); id = QString();
} else if (_reader.name() == QLatin1String("StyleMap")) } else if (_reader.name() == QLatin1String("StyleMap"))
styleMap(pointStyles, polyStyles, lineStyles); styleMap(map);
else if (_reader.name() == QLatin1String("MultiGeometry")) else if (_reader.name() == QLatin1String("MultiGeometry"))
multiGeometry(tracks, areas, waypoints); multiGeometry(tracks, areas, waypoints);
else if (_reader.name() == QLatin1String("Point")) { else if (_reader.name() == QLatin1String("Point")) {
@ -662,8 +667,14 @@ void KMLParser::placemark(const Ctx &ctx, QList<TrackData> &tracks,
} }
PointStyleMap::iterator pit = pointStyles.find(id); PointStyleMap::iterator pit = pointStyles.find(id);
if (pit == pointStyles.end())
pit = pointStyles.find(map.value(id));
LineStyleMap::iterator lit = lineStyles.find(id); LineStyleMap::iterator lit = lineStyles.find(id);
if (lit == lineStyles.end())
lit = lineStyles.find(map.value(id));
PolygonStyleMap::iterator ait = polyStyles.find(id); PolygonStyleMap::iterator ait = polyStyles.find(id);
if (ait == polyStyles.end())
ait = polyStyles.find(map.value(id));
for (int i = wptIdx; i < waypoints.size(); i++) { for (int i = wptIdx; i < waypoints.size(); i++) {
Waypoint &w = waypoints[i]; Waypoint &w = waypoints[i];
@ -782,8 +793,7 @@ void KMLParser::lineStyle(const QString &id, LineStyleMap &styles)
styles.insert(id, LineStyle(c, width)); styles.insert(id, LineStyle(c, width));
} }
void KMLParser::styleMapPair(const QString &id, PointStyleMap &pointStyles, void KMLParser::styleMapPair(const QString &id, QMap<QString, QString> &map)
PolygonStyleMap &polyStyles, LineStyleMap &lineStyles)
{ {
QString key, url; QString key, url;
@ -796,21 +806,17 @@ void KMLParser::styleMapPair(const QString &id, PointStyleMap &pointStyles,
_reader.skipCurrentElement(); _reader.skipCurrentElement();
} }
if (key == "normal") { if (key == "normal")
pointStyles.insert(id, pointStyles.value(url)); map.insert(id, url);
polyStyles.insert(id, polyStyles.value(url));
lineStyles.insert(id, lineStyles.value(url));
}
} }
void KMLParser::styleMap(PointStyleMap &pointStyles, void KMLParser::styleMap(QMap<QString, QString> &map)
PolygonStyleMap &polyStyles, LineStyleMap &lineStyles)
{ {
QString id = _reader.attributes().value("id").toString(); QString id = _reader.attributes().value("id").toString();
while (_reader.readNextStartElement()) { while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("Pair")) if (_reader.name() == QLatin1String("Pair"))
styleMapPair(id, pointStyles, polyStyles, lineStyles); styleMapPair(id, map);
else else
_reader.skipCurrentElement(); _reader.skipCurrentElement();
} }
@ -836,19 +842,19 @@ void KMLParser::style(const QDir &dir, PointStyleMap &pointStyles,
void KMLParser::folder(const Ctx &ctx, QList<TrackData> &tracks, void KMLParser::folder(const Ctx &ctx, QList<TrackData> &tracks,
QList<Area> &areas, QVector<Waypoint> &waypoints, QList<Area> &areas, QVector<Waypoint> &waypoints,
PointStyleMap &pointStyles, PolygonStyleMap &polyStyles, PointStyleMap &pointStyles, PolygonStyleMap &polyStyles,
LineStyleMap &lineStyles) LineStyleMap &lineStyles, QMap<QString, QString> &map)
{ {
while (_reader.readNextStartElement()) { while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("Document")) if (_reader.name() == QLatin1String("Document"))
document(ctx, tracks, areas, waypoints); document(ctx, tracks, areas, waypoints);
else if (_reader.name() == QLatin1String("Folder")) else if (_reader.name() == QLatin1String("Folder"))
folder(ctx, tracks, areas, waypoints, pointStyles, polyStyles, folder(ctx, tracks, areas, waypoints, pointStyles, polyStyles,
lineStyles); lineStyles, map);
else if (_reader.name() == QLatin1String("Placemark")) else if (_reader.name() == QLatin1String("Placemark"))
placemark(ctx, tracks, areas, waypoints, pointStyles, polyStyles, placemark(ctx, tracks, areas, waypoints, pointStyles, polyStyles,
lineStyles); lineStyles, map);
else if (_reader.name() == QLatin1String("PhotoOverlay")) else if (_reader.name() == QLatin1String("PhotoOverlay"))
photoOverlay(ctx, waypoints, pointStyles); photoOverlay(ctx, waypoints, pointStyles, map);
else else
_reader.skipCurrentElement(); _reader.skipCurrentElement();
} }
@ -860,22 +866,23 @@ void KMLParser::document(const Ctx &ctx, QList<TrackData> &tracks,
PointStyleMap pointStyles; PointStyleMap pointStyles;
PolygonStyleMap polyStyles; PolygonStyleMap polyStyles;
LineStyleMap lineStyles; LineStyleMap lineStyles;
QMap<QString, QString> map;
while (_reader.readNextStartElement()) { while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("Document")) if (_reader.name() == QLatin1String("Document"))
document(ctx, tracks, areas, waypoints); document(ctx, tracks, areas, waypoints);
else if (_reader.name() == QLatin1String("Folder")) else if (_reader.name() == QLatin1String("Folder"))
folder(ctx, tracks, areas, waypoints, pointStyles, polyStyles, folder(ctx, tracks, areas, waypoints, pointStyles, polyStyles,
lineStyles); lineStyles, map);
else if (_reader.name() == QLatin1String("Placemark")) else if (_reader.name() == QLatin1String("Placemark"))
placemark(ctx, tracks, areas, waypoints, pointStyles, polyStyles, placemark(ctx, tracks, areas, waypoints, pointStyles, polyStyles,
lineStyles); lineStyles, map);
else if (_reader.name() == QLatin1String("PhotoOverlay")) else if (_reader.name() == QLatin1String("PhotoOverlay"))
photoOverlay(ctx, waypoints, pointStyles); photoOverlay(ctx, waypoints, pointStyles, map);
else if (_reader.name() == QLatin1String("Style")) else if (_reader.name() == QLatin1String("Style"))
style(ctx.dir, pointStyles, polyStyles, lineStyles); style(ctx.dir, pointStyles, polyStyles, lineStyles);
else if (_reader.name() == QLatin1String("StyleMap")) else if (_reader.name() == QLatin1String("StyleMap"))
styleMap(pointStyles, polyStyles, lineStyles); styleMap(map);
else else
_reader.skipCurrentElement(); _reader.skipCurrentElement();
} }
@ -887,18 +894,19 @@ void KMLParser::kml(const Ctx &ctx, QList<TrackData> &tracks,
PointStyleMap pointStyles; PointStyleMap pointStyles;
PolygonStyleMap polyStyles; PolygonStyleMap polyStyles;
LineStyleMap lineStyles; LineStyleMap lineStyles;
QMap<QString, QString> map;
while (_reader.readNextStartElement()) { while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("Document")) if (_reader.name() == QLatin1String("Document"))
document(ctx, tracks, areas, waypoints); document(ctx, tracks, areas, waypoints);
else if (_reader.name() == QLatin1String("Folder")) else if (_reader.name() == QLatin1String("Folder"))
folder(ctx, tracks, areas, waypoints, pointStyles, polyStyles, folder(ctx, tracks, areas, waypoints, pointStyles, polyStyles,
lineStyles); lineStyles, map);
else if (_reader.name() == QLatin1String("Placemark")) else if (_reader.name() == QLatin1String("Placemark"))
placemark(ctx, tracks, areas, waypoints, pointStyles, polyStyles, placemark(ctx, tracks, areas, waypoints, pointStyles, polyStyles,
lineStyles); lineStyles, map);
else if (_reader.name() == QLatin1String("PhotoOverlay")) else if (_reader.name() == QLatin1String("PhotoOverlay"))
photoOverlay(ctx, waypoints, pointStyles); photoOverlay(ctx, waypoints, pointStyles, map);
else else
_reader.skipCurrentElement(); _reader.skipCurrentElement();
} }

14
src/data/kmlparser.h
View File

@ -34,14 +34,16 @@ private:
QVector<Waypoint> &waypoints); QVector<Waypoint> &waypoints);
void folder(const Ctx &ctx, QList<TrackData> &tracks, QList<Area> &areas, void folder(const Ctx &ctx, QList<TrackData> &tracks, QList<Area> &areas,
QVector<Waypoint> &waypoints, PointStyleMap &pointStyles, QVector<Waypoint> &waypoints, PointStyleMap &pointStyles,
PolygonStyleMap &polyStyles, LineStyleMap &lineStyles); PolygonStyleMap &polyStyles, LineStyleMap &lineStyles,
QMap<QString, QString> &map);
void placemark(const Ctx &ctx, QList<TrackData> &tracks, QList<Area> &areas, void placemark(const Ctx &ctx, QList<TrackData> &tracks, QList<Area> &areas,
QVector<Waypoint> &waypoints, PointStyleMap &pointStyles, QVector<Waypoint> &waypoints, PointStyleMap &pointStyles,
PolygonStyleMap &polyStyles, LineStyleMap &lineStyles); PolygonStyleMap &polyStyles, LineStyleMap &lineStyles,
QMap<QString, QString> &map);
void multiGeometry(QList<TrackData> &tracks, QList<Area> &areas, void multiGeometry(QList<TrackData> &tracks, QList<Area> &areas,
QVector<Waypoint> &waypoints); QVector<Waypoint> &waypoints);
void photoOverlay(const Ctx &ctx, QVector<Waypoint> &waypoints, void photoOverlay(const Ctx &ctx, QVector<Waypoint> &waypoints,
PointStyleMap &pointStyles); PointStyleMap &pointStyles, QMap<QString, QString> &map);
void track(SegmentData &segment); void track(SegmentData &segment);
void multiTrack(TrackData &t); void multiTrack(TrackData &t);
void lineString(SegmentData &segment); void lineString(SegmentData &segment);
@ -68,10 +70,8 @@ private:
QString styleUrl(); QString styleUrl();
void style(const QDir &dir, PointStyleMap &pointStyles, void style(const QDir &dir, PointStyleMap &pointStyles,
PolygonStyleMap &polyStyles, LineStyleMap &lineStyles); PolygonStyleMap &polyStyles, LineStyleMap &lineStyles);
void styleMapPair(const QString &id, PointStyleMap &pointStyles, void styleMapPair(const QString &id, QMap<QString, QString> &map);
PolygonStyleMap &polyStyles, LineStyleMap &lineStyles); void styleMap(QMap<QString, QString> &map);
void styleMap(PointStyleMap &pointStyles, PolygonStyleMap &polyStyles,
LineStyleMap &lineStyles);
void iconStyle(const QDir &dir, const QString &id, PointStyleMap &style); void iconStyle(const QDir &dir, const QString &id, PointStyleMap &style);
void polyStyle(const QString &id, PolygonStyleMap &styles); void polyStyle(const QString &id, PolygonStyleMap &styles);
void lineStyle(const QString &id, LineStyleMap &styles); void lineStyle(const QString &id, LineStyleMap &styles);