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

Document styles are not inherited

Browse Source
This commit is contained in:
Martin Tůma 2022-09-01 00:49:21 +02:00
parent b7df3cbe0e
commit 589c602d21
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/data/kmlparser.cpp
View File

@ -513,7 +513,7 @@ void KMLParser::multiGeometry(QList<TrackData> &tracks, QList<Area> &areas,
}
void KMLParser::placemark(QList<TrackData> &tracks, QList<Area> &areas,
QVector<Waypoint> &waypoints, QMap<QString, QPixmap> &icons)
QVector<Waypoint> &waypoints, const QMap<QString, QPixmap> &icons)
{
QString name, desc, phone, address, id;
QDateTime timestamp;
@ -618,11 +618,11 @@ void KMLParser::style(const QDir &dir, QMap<QString, QPixmap> &icons)
void KMLParser::folder(const QDir &dir, QList<TrackData> &tracks,
QList<Area> &areas, QVector<Waypoint> &waypoints,
QMap<QString, QPixmap> &icons)
const QMap<QString, QPixmap> &icons)
{
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("Document"))
document(dir, tracks, areas, waypoints, icons);
document(dir, tracks, areas, waypoints);
else if (_reader.name() == QLatin1String("Placemark"))
placemark(tracks, areas, waypoints, icons);
else if (_reader.name() == QLatin1String("Folder"))
@ -633,12 +633,13 @@ void KMLParser::folder(const QDir &dir, QList<TrackData> &tracks,
}
void KMLParser::document(const QDir &dir, QList<TrackData> &tracks,
QList<Area> &areas, QVector<Waypoint> &waypoints,
QMap<QString, QPixmap> &icons)
QList<Area> &areas, QVector<Waypoint> &waypoints)
{
QMap<QString, QPixmap> icons;
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("Document"))
document(dir, tracks, areas, waypoints, icons);
document(dir, tracks, areas, waypoints);
else if (_reader.name() == QLatin1String("Placemark"))
placemark(tracks, areas, waypoints, icons);
else if (_reader.name() == QLatin1String("Folder"))
@ -653,15 +654,13 @@ void KMLParser::document(const QDir &dir, QList<TrackData> &tracks,
void KMLParser::kml(const QDir &dir, QList<TrackData> &tracks,
QList<Area> &areas, QVector<Waypoint> &waypoints)
{
QMap<QString, QPixmap> icons;
while (_reader.readNextStartElement()) {
if (_reader.name() == QLatin1String("Document"))
document(dir, tracks, areas, waypoints, icons);
document(dir, tracks, areas, waypoints);
else if (_reader.name() == QLatin1String("Placemark"))
placemark(tracks, areas, waypoints, icons);
placemark(tracks, areas, waypoints, QMap<QString, QPixmap>());
else if (_reader.name() == QLatin1String("Folder"))
folder(dir, tracks, areas, waypoints, icons);
folder(dir, tracks, areas, waypoints, QMap<QString, QPixmap>());
else
_reader.skipCurrentElement();
}

6
src/data/kmlparser.h
View File

@ -19,11 +19,11 @@ private:
void kml(const QDir &dir, QList<TrackData> &tracks, QList<Area> &areas,
QVector<Waypoint> &waypoints);
void document(const QDir &dir, QList<TrackData> &tracks, QList<Area> &areas,
QVector<Waypoint> &waypoints, QMap<QString, QPixmap> &icons);
QVector<Waypoint> &waypoints);
void folder(const QDir &dir, QList<TrackData> &tracks, QList<Area> &areas,
QVector<Waypoint> &waypoints, QMap<QString, QPixmap> &icons);
QVector<Waypoint> &waypoints, const QMap<QString, QPixmap> &icons);
void placemark(QList<TrackData> &tracks, QList<Area> &areas,
QVector<Waypoint> &waypoints, QMap<QString, QPixmap> &icons);
QVector<Waypoint> &waypoints, const QMap<QString, QPixmap> &icons);
void multiGeometry(QList<TrackData> &tracks, QList<Area> &areas,
QVector<Waypoint> &waypoints, const QString &name, const QString &desc,
const QDateTime &timestamp);