Changeset View
Changeset View
Standalone View
Standalone View
src/lib/marble/FileLoader.cpp
Show All 23 Lines | |||||
24 | #include "GeoDataExtendedData.h" | 24 | #include "GeoDataExtendedData.h" | ||
25 | #include "GeoDataStyle.h" | 25 | #include "GeoDataStyle.h" | ||
26 | #include "GeoDataStyleMap.h" | 26 | #include "GeoDataStyleMap.h" | ||
27 | #include "GeoDataPhotoOverlay.h" | 27 | #include "GeoDataPhotoOverlay.h" | ||
28 | #include "GeoDataPoint.h" | 28 | #include "GeoDataPoint.h" | ||
29 | #include "GeoDataPolyStyle.h" | 29 | #include "GeoDataPolyStyle.h" | ||
30 | #include "GeoDataLineStyle.h" | 30 | #include "GeoDataLineStyle.h" | ||
31 | #include "GeoDataPolygon.h" | 31 | #include "GeoDataPolygon.h" | ||
32 | #include "GeoDataRelation.h" | ||||
32 | #include "GeoDataScreenOverlay.h" | 33 | #include "GeoDataScreenOverlay.h" | ||
33 | #include "GeoDataTour.h" | 34 | #include "GeoDataTour.h" | ||
34 | #include "GeoDataTrack.h" | 35 | #include "GeoDataTrack.h" | ||
35 | #include "MarbleDirs.h" | 36 | #include "MarbleDirs.h" | ||
36 | #include "MarbleDebug.h" | 37 | #include "MarbleDebug.h" | ||
37 | #include "MarbleModel.h" | 38 | #include "MarbleModel.h" | ||
38 | #include "ParsingRunnerManager.h" | 39 | #include "ParsingRunnerManager.h" | ||
39 | 40 | | |||
▲ Show 20 Lines • Show All 206 Lines • ▼ Show 20 Line(s) | 246 | { | |||
246 | const QString styleUrl = QLatin1Char('#') + m_styleMap->id(); | 247 | const QString styleUrl = QLatin1Char('#') + m_styleMap->id(); | ||
247 | 248 | | |||
248 | QVector<GeoDataFeature*>::Iterator i = container->begin(); | 249 | QVector<GeoDataFeature*>::Iterator i = container->begin(); | ||
249 | QVector<GeoDataFeature*>::Iterator const end = container->end(); | 250 | QVector<GeoDataFeature*>::Iterator const end = container->end(); | ||
250 | for (; i != end; ++i ) { | 251 | for (; i != end; ++i ) { | ||
251 | if (auto child = dynamic_cast<GeoDataContainer *>(*i)) { | 252 | if (auto child = dynamic_cast<GeoDataContainer *>(*i)) { | ||
252 | createFilterProperties( child ); | 253 | createFilterProperties( child ); | ||
253 | } else if (geodata_cast<GeoDataTour>(*i) | 254 | } else if (geodata_cast<GeoDataTour>(*i) | ||
255 | || geodata_cast<GeoDataRelation>(*i) | ||||
254 | || geodata_cast<GeoDataGroundOverlay>(*i) | 256 | || geodata_cast<GeoDataGroundOverlay>(*i) | ||
255 | || geodata_cast<GeoDataPhotoOverlay>(*i) | 257 | || geodata_cast<GeoDataPhotoOverlay>(*i) | ||
256 | || geodata_cast<GeoDataScreenOverlay>(*i)) { | 258 | || geodata_cast<GeoDataScreenOverlay>(*i)) { | ||
257 | /** @todo: How to handle this ? */ | 259 | /** @todo: How to handle this ? */ | ||
258 | } else if (auto placemark = geodata_cast<GeoDataPlacemark>(*i)) { | 260 | } else if (auto placemark = geodata_cast<GeoDataPlacemark>(*i)) { | ||
259 | const QString placemarkRole = placemark->role(); | 261 | const QString placemarkRole = placemark->role(); | ||
260 | Q_ASSERT( placemark->geometry() ); | 262 | Q_ASSERT( placemark->geometry() ); | ||
261 | 263 | | |||
▲ Show 20 Lines • Show All 306 Lines • Show Last 20 Lines |