diff --git a/src/lib/marble/PlacemarkLayout.cpp b/src/lib/marble/PlacemarkLayout.cpp --- a/src/lib/marble/PlacemarkLayout.cpp +++ b/src/lib/marble/PlacemarkLayout.cpp @@ -134,6 +134,7 @@ << 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 --- a/src/lib/marble/StyleBuilder.cpp +++ b/src/lib/marble/StyleBuilder.cpp @@ -118,6 +118,7 @@ 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 @@ 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 @@ 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 --- a/src/lib/marble/geodata/data/GeoDataFeature.h +++ b/src/lib/marble/geodata/data/GeoDataFeature.h @@ -322,6 +322,7 @@ 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 --- a/src/lib/marble/geodata/data/GeoDataFeature_p.h +++ b/src/lib/marble/geodata/data/GeoDataFeature_p.h @@ -318,6 +318,7 @@ 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 --- a/src/lib/marble/osm/OsmPresetLibrary.cpp +++ b/src/lib/marble/osm/OsmPresetLibrary.cpp @@ -303,6 +303,7 @@ 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 --- a/src/plugins/runner/local-osm-search/OsmPlacemark.h +++ b/src/plugins/runner/local-osm-search/OsmPlacemark.h @@ -63,6 +63,7 @@ TransportAirport, TransportAirportTerminal, TransportAirportGate, + TransportAirportRunway, TransportBusStation, TransportBusStop, TransportCarShare,