summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSanjiban Bairagya <sanjiban22393@gmail.com>2016-08-08 19:36:33 (GMT)
committerSanjiban Bairagya <sanjiban22393@gmail.com>2016-08-08 19:36:33 (GMT)
commitf4ae0754dead3039f4663b664dda64301faad0ec (patch)
treed664ec03cf956884abcf77182315967cb02b36b9
parent2af89ea6a9f6ea35906c78025f3f4344b88460b0 (diff)
Add a visual category for aeroway runways, extract and render them in Vector OSM
-rw-r--r--src/lib/marble/PlacemarkLayout.cpp1
-rw-r--r--src/lib/marble/StyleBuilder.cpp3
-rw-r--r--src/lib/marble/geodata/data/GeoDataFeature.h1
-rw-r--r--src/lib/marble/geodata/data/GeoDataFeature_p.h1
-rw-r--r--src/lib/marble/osm/OsmPresetLibrary.cpp1
-rw-r--r--src/plugins/runner/local-osm-search/OsmPlacemark.h1
6 files changed, 8 insertions, 0 deletions
diff --git a/src/lib/marble/PlacemarkLayout.cpp b/src/lib/marble/PlacemarkLayout.cpp
index 6e8fc4c..84cbdac 100644
--- a/src/lib/marble/PlacemarkLayout.cpp
+++ b/src/lib/marble/PlacemarkLayout.cpp
@@ -134,6 +134,7 @@ QSet<GeoDataFeature::GeoDataVisualCategory> acceptedVisualCategories()
<< GeoDataFeature::TransportAerodrome
<< GeoDataFeature::TransportAirportTerminal
<< GeoDataFeature::TransportAirportGate
+ << GeoDataFeature::TransportAirportRunway
<< GeoDataFeature::TransportBusStation
<< GeoDataFeature::TransportBusStop
<< GeoDataFeature::TransportCarShare
diff --git a/src/lib/marble/StyleBuilder.cpp b/src/lib/marble/StyleBuilder.cpp
index 59e4da7..6ab7c7d 100644
--- a/src/lib/marble/StyleBuilder.cpp
+++ b/src/lib/marble/StyleBuilder.cpp
@@ -118,6 +118,7 @@ StyleBuilder::Private::Private() :
m_defaultMinZoomLevels[GeoDataFeature::HighwayTrunk] = 7;
m_defaultMinZoomLevels[GeoDataFeature::HighwayMotorwayLink] = 10;
m_defaultMinZoomLevels[GeoDataFeature::HighwayMotorway] = 6;
+ m_defaultMinZoomLevels[GeoDataFeature::TransportAirportRunway] = 15;
#if 0 // not needed as long as default min zoom level is 15
for(int i = GeoDataFeature::AccomodationCamping; i <= GeoDataFeature::ReligionSikh; i++)
@@ -669,6 +670,7 @@ void StyleBuilder::Private::initializeDefaultStyles()
m_defaultStyle[GeoDataFeature::HighwayTrunkLink] = StyleBuilder::Private::createHighwayStyle( "highway_trunk", "#f9b29c", "#c84e2f", QFont(QStringLiteral("Arial")), "000000", 9.0, 6 );
m_defaultStyle[GeoDataFeature::HighwayMotorway] = StyleBuilder::Private::createHighwayStyle( "highway_motorway", "#e892a2", "#dc2a67", QFont(QStringLiteral("Arial")), "000000", 9.0, 10 );
m_defaultStyle[GeoDataFeature::HighwayMotorwayLink] = StyleBuilder::Private::createHighwayStyle( "highway_motorway", "#e892a2", "#dc2a67", QFont(QStringLiteral("Arial")), "000000", 9.0, 10 );
+ m_defaultStyle[GeoDataFeature::TransportAirportRunway] = StyleBuilder::Private::createHighwayStyle( "", "#bbbbcc", "#bbbbcc", QFont(QStringLiteral("Arial")), "000000", 0, 1 );
m_defaultStyle[GeoDataFeature::NaturalWater] = StyleBuilder::Private::createStyle( 4, 0, waterColor, waterColor, true, true,
Qt::SolidPattern, Qt::SolidLine, Qt::RoundCap, false, QVector< qreal >(),
@@ -1419,6 +1421,7 @@ QString StyleBuilder::visualCategoryName(GeoDataFeature::GeoDataVisualCategory c
visualCategoryNames[GeoDataFeature::TransportHelipad] = "TransportHelipad";
visualCategoryNames[GeoDataFeature::TransportAirportTerminal] = "TransportAirportTerminal";
visualCategoryNames[GeoDataFeature::TransportAirportGate] = "TransportAirportGate";
+ visualCategoryNames[GeoDataFeature::TransportAirportRunway] = "TransportAirportRunway";
visualCategoryNames[GeoDataFeature::TransportBusStation] = "TransportBusStation";
visualCategoryNames[GeoDataFeature::TransportBusStop] = "TransportBusStop";
visualCategoryNames[GeoDataFeature::TransportCarShare] = "TransportCarShare";
diff --git a/src/lib/marble/geodata/data/GeoDataFeature.h b/src/lib/marble/geodata/data/GeoDataFeature.h
index 0ce18f4..f6e0eeb 100644
--- a/src/lib/marble/geodata/data/GeoDataFeature.h
+++ b/src/lib/marble/geodata/data/GeoDataFeature.h
@@ -322,6 +322,7 @@ class GEODATA_EXPORT GeoDataFeature : public GeoDataObject
TransportHelipad,
TransportAirportTerminal,
TransportAirportGate,
+ TransportAirportRunway,
TransportBusStation,
TransportBusStop,
TransportCarShare,
diff --git a/src/lib/marble/geodata/data/GeoDataFeature_p.h b/src/lib/marble/geodata/data/GeoDataFeature_p.h
index 46db7b7..be9f435 100644
--- a/src/lib/marble/geodata/data/GeoDataFeature_p.h
+++ b/src/lib/marble/geodata/data/GeoDataFeature_p.h
@@ -318,6 +318,7 @@ class GeoDataFeaturePrivate
case GeoDataFeature::TransportAerodrome: return tr("Aerodrome");
case GeoDataFeature::TransportHelipad: return tr("Helipad");
case GeoDataFeature::TransportAirportGate: return tr("Airport Gate");
+ case GeoDataFeature::TransportAirportRunway: return tr("Airport Runway");
case GeoDataFeature::TransportAirportTerminal: return tr("Airport Terminal");
case GeoDataFeature::TransportBusStation: return tr("Bus Station");
case GeoDataFeature::TransportBusStop: return tr("Bus Stop");
diff --git a/src/lib/marble/osm/OsmPresetLibrary.cpp b/src/lib/marble/osm/OsmPresetLibrary.cpp
index 463c8ce..2f4c591 100644
--- a/src/lib/marble/osm/OsmPresetLibrary.cpp
+++ b/src/lib/marble/osm/OsmPresetLibrary.cpp
@@ -303,6 +303,7 @@ void OsmPresetLibrary::initializeOsmVisualCategories()
s_visualCategories[ OsmTag( "aeroway", "aerodrome" ) ] = GeoDataFeature::TransportAerodrome;
s_visualCategories[ OsmTag( "aeroway", "helipad" ) ] = GeoDataFeature::TransportHelipad;
s_visualCategories[ OsmTag( "aeroway", "gate" ) ] = GeoDataFeature::TransportAirportGate;
+ s_visualCategories[ OsmTag( "aeroway", "runway" ) ] = GeoDataFeature::TransportAirportRunway;
s_visualCategories[ OsmTag( "transport", "airpor_terminal" ) ] = GeoDataFeature::TransportAirportTerminal;
s_visualCategories[ OsmTag( "transport", "bus_station" ) ] = GeoDataFeature::TransportBusStation;
s_visualCategories[ OsmTag( "highway", "bus_stop" ) ] = GeoDataFeature::TransportBusStop;
diff --git a/src/plugins/runner/local-osm-search/OsmPlacemark.h b/src/plugins/runner/local-osm-search/OsmPlacemark.h
index 7fcd5ba..b907921 100644
--- a/src/plugins/runner/local-osm-search/OsmPlacemark.h
+++ b/src/plugins/runner/local-osm-search/OsmPlacemark.h
@@ -63,6 +63,7 @@ public:
TransportAirport,
TransportAirportTerminal,
TransportAirportGate,
+ TransportAirportRunway,
TransportBusStation,
TransportBusStop,
TransportCarShare,