Changeset View
Changeset View
Standalone View
Standalone View
src/plugins/runner/osm/OsmWay.h
1 | // | 1 | // | ||
---|---|---|---|---|---|
2 | // This file is part of the Marble Virtual Globe. | 2 | // This file is part of the Marble Virtual Globe. | ||
3 | // | 3 | // | ||
4 | // This program is free software licensed under the GNU LGPL. You can | 4 | // This program is free software licensed under the GNU LGPL. You can | ||
5 | // find a copy of this license in LICENSE.txt in the top directory of | 5 | // find a copy of this license in LICENSE.txt in the top directory of | ||
6 | // the source code. | 6 | // the source code. | ||
7 | // | 7 | // | ||
8 | // Copyright 2015 Dennis Nienhüser <nienhueser@kde.org> | 8 | // Copyright 2015 Dennis Nienhüser <nienhueser@kde.org> | ||
9 | // | 9 | // | ||
10 | 10 | | |||
11 | #ifndef MARBLE_OSMWAY | 11 | #ifndef MARBLE_OSMWAY | ||
12 | #define MARBLE_OSMWAY | 12 | #define MARBLE_OSMWAY | ||
13 | 13 | | |||
14 | #include "OsmNode.h" | 14 | #include "OsmNode.h" | ||
15 | #include "GeoDataBuilding.h" | ||||
nienhueser: No private header inclusion here as well | |||||
15 | #include <osm/OsmPlacemarkData.h> | 16 | #include <osm/OsmPlacemarkData.h> | ||
16 | #include <StyleBuilder.h> | 17 | #include <StyleBuilder.h> | ||
17 | 18 | | |||
18 | #include <QSet> | 19 | #include <QSet> | ||
19 | #include <QString> | 20 | #include <QString> | ||
20 | 21 | | |||
21 | namespace Marble { | 22 | namespace Marble { | ||
22 | 23 | | |||
Show All 10 Lines | 28 | public: | |||
33 | 34 | | |||
34 | GeoDataPlacemark* create(const OsmNodes &nodes, QSet<qint64> &usedNodes) const; | 35 | GeoDataPlacemark* create(const OsmNodes &nodes, QSet<qint64> &usedNodes) const; | ||
35 | 36 | | |||
36 | private: | 37 | private: | ||
37 | bool isArea() const; | 38 | bool isArea() const; | ||
38 | 39 | | |||
39 | static bool isAreaTag(const StyleBuilder::OsmTag &keyValue); | 40 | static bool isAreaTag(const StyleBuilder::OsmTag &keyValue); | ||
40 | 41 | | |||
42 | bool isBuilding() const; | ||||
43 | | ||||
44 | static bool isBuildingTag(const StyleBuilder::OsmTag &keyValue); | ||||
45 | | ||||
41 | OsmPlacemarkData m_osmData; | 46 | OsmPlacemarkData m_osmData; | ||
42 | QVector<qint64> m_references; | 47 | QVector<qint64> m_references; | ||
43 | 48 | | |||
44 | static QSet<StyleBuilder::OsmTag> s_areaTags; | 49 | static QSet<StyleBuilder::OsmTag> s_areaTags; | ||
50 | static QSet<StyleBuilder::OsmTag> s_buildingTags; | ||||
51 | | ||||
52 | QString extractBuildingName() const; | ||||
53 | double extractBuildingHeight() const; | ||||
54 | QVector<GeoDataBuilding::NamedEntry> extractNamedEntries() const; | ||||
45 | }; | 55 | }; | ||
46 | 56 | | |||
47 | typedef QHash<qint64,OsmWay> OsmWays; | 57 | typedef QHash<qint64,OsmWay> OsmWays; | ||
48 | 58 | | |||
49 | } | 59 | } | ||
50 | 60 | | |||
51 | #endif | 61 | #endif |
No private header inclusion here as well