Commit bcf1f53b authored by Sanjiban Bairagya's avatar Sanjiban Bairagya
Browse files

Render aeroway taxiways

parent 83ee05e3
......@@ -135,6 +135,7 @@ QSet<GeoDataFeature::GeoDataVisualCategory> acceptedVisualCategories()
<< GeoDataFeature::TransportAirportTerminal
<< GeoDataFeature::TransportAirportGate
<< GeoDataFeature::TransportAirportRunway
<< GeoDataFeature::TransportAirportTaxiway
<< GeoDataFeature::TransportBusStation
<< GeoDataFeature::TransportBusStop
<< GeoDataFeature::TransportCarShare
......
......@@ -119,6 +119,7 @@ StyleBuilder::Private::Private() :
m_defaultMinZoomLevels[GeoDataFeature::HighwayMotorwayLink] = 10;
m_defaultMinZoomLevels[GeoDataFeature::HighwayMotorway] = 6;
m_defaultMinZoomLevels[GeoDataFeature::TransportAirportRunway] = 15;
m_defaultMinZoomLevels[GeoDataFeature::TransportAirportTaxiway] = 15;
#if 0 // not needed as long as default min zoom level is 15
for(int i = GeoDataFeature::AccomodationCamping; i <= GeoDataFeature::ReligionSikh; i++)
......@@ -673,6 +674,7 @@ void StyleBuilder::Private::initializeDefaultStyles()
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::TransportAirportTaxiway] = 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 >(),
......
......@@ -323,6 +323,7 @@ class GEODATA_EXPORT GeoDataFeature : public GeoDataObject
TransportAirportTerminal,
TransportAirportGate,
TransportAirportRunway,
TransportAirportTaxiway,
TransportBusStation,
TransportBusStop,
TransportCarShare,
......
......@@ -319,6 +319,7 @@ class GeoDataFeaturePrivate
case GeoDataFeature::TransportHelipad: return tr("Helipad");
case GeoDataFeature::TransportAirportGate: return tr("Airport Gate");
case GeoDataFeature::TransportAirportRunway: return tr("Airport Runway");
case GeoDataFeature::TransportAirportTaxiway: return tr("Airport Taxiway");
case GeoDataFeature::TransportAirportTerminal: return tr("Airport Terminal");
case GeoDataFeature::TransportBusStation: return tr("Bus Station");
case GeoDataFeature::TransportBusStop: return tr("Bus Stop");
......
......@@ -304,6 +304,7 @@ void OsmPresetLibrary::initializeOsmVisualCategories()
s_visualCategories[ OsmTag( "aeroway", "helipad" ) ] = GeoDataFeature::TransportHelipad;
s_visualCategories[ OsmTag( "aeroway", "gate" ) ] = GeoDataFeature::TransportAirportGate;
s_visualCategories[ OsmTag( "aeroway", "runway" ) ] = GeoDataFeature::TransportAirportRunway;
s_visualCategories[ OsmTag( "aeroway", "taxiway" ) ] = GeoDataFeature::TransportAirportTaxiway;
s_visualCategories[ OsmTag( "transport", "airpor_terminal" ) ] = GeoDataFeature::TransportAirportTerminal;
s_visualCategories[ OsmTag( "transport", "bus_station" ) ] = GeoDataFeature::TransportBusStation;
s_visualCategories[ OsmTag( "highway", "bus_stop" ) ] = GeoDataFeature::TransportBusStop;
......
......@@ -132,6 +132,10 @@ bool DatabaseQuery::isPointOfInterest( const QString &category )
pois["zoo"] = OsmPlacemark::TouristZoo;
pois[QObject::tr( "airport" ).toLower()] = OsmPlacemark::TransportAirportTerminal;
pois["airport"] = OsmPlacemark::TransportAirportTerminal;
pois[QObject::tr( "airport runway" ).toLower()] = OsmPlacemark::TransportAirportRunway;
pois["airport runway"] = OsmPlacemark::TransportAirportRunway;
pois[QObject::tr( "airport taxiway" ).toLower()] = OsmPlacemark::TransportAirportTaxiway;
pois["airport runway"] = OsmPlacemark::TransportAirportTaxiway;
pois[QObject::tr( "bus station" ).toLower()] = OsmPlacemark::TransportBusStation;
pois["bus station"] = OsmPlacemark::TransportBusStation;
pois[QObject::tr( "bus stop" ).toLower()] = OsmPlacemark::TransportBusStop;
......
......@@ -67,6 +67,8 @@ LocalOsmSearchRunner::LocalOsmSearchRunner( const QStringList &databaseFiles, QO
m_categoryMap[OsmPlacemark::TouristZoo] = GeoDataFeature::TouristZoo;
m_categoryMap[OsmPlacemark::TransportAirport] = GeoDataFeature::TransportAerodrome;
m_categoryMap[OsmPlacemark::TransportAirportTerminal] = GeoDataFeature::TransportAirportTerminal;
m_categoryMap[OsmPlacemark::TransportAirportRunway] = GeoDataFeature::TransportAirportRunway;
m_categoryMap[OsmPlacemark::TransportAirportTaxiway] = GeoDataFeature::TransportAirportTaxiway;
m_categoryMap[OsmPlacemark::TransportBusStation] = GeoDataFeature::TransportBusStation;
m_categoryMap[OsmPlacemark::TransportBusStop] = GeoDataFeature::TransportBusStop;
m_categoryMap[OsmPlacemark::TransportCarShare] = GeoDataFeature::TransportCarShare;
......
......@@ -64,6 +64,7 @@ public:
TransportAirportTerminal,
TransportAirportGate,
TransportAirportRunway,
TransportAirportTaxiway,
TransportBusStation,
TransportBusStop,
TransportCarShare,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment