summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSanjiban Bairagya <sanjiban22393@gmail.com>2016-08-11 19:16:28 (GMT)
committerSanjiban Bairagya <sanjiban22393@gmail.com>2016-08-11 19:16:28 (GMT)
commitbcf1f53b06214a45d27e731d951d14a4fd29dc3d (patch)
tree817efb685eb86e1d32858c072336b7fd8962a6ae
parent83ee05e30e0f6d6ce4799194e20feca782b0a365 (diff)
Render aeroway taxiways
-rw-r--r--src/lib/marble/PlacemarkLayout.cpp1
-rw-r--r--src/lib/marble/StyleBuilder.cpp2
-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/DatabaseQuery.cpp4
-rw-r--r--src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp2
-rw-r--r--src/plugins/runner/local-osm-search/OsmPlacemark.h1
8 files changed, 13 insertions, 0 deletions
diff --git a/src/lib/marble/PlacemarkLayout.cpp b/src/lib/marble/PlacemarkLayout.cpp
index 84cbdac..5433013 100644
--- a/src/lib/marble/PlacemarkLayout.cpp
+++ b/src/lib/marble/PlacemarkLayout.cpp
@@ -135,6 +135,7 @@ QSet<GeoDataFeature::GeoDataVisualCategory> acceptedVisualCategories()
<< GeoDataFeature::TransportAirportTerminal
<< GeoDataFeature::TransportAirportGate
<< GeoDataFeature::TransportAirportRunway
+ << GeoDataFeature::TransportAirportTaxiway
<< GeoDataFeature::TransportBusStation
<< GeoDataFeature::TransportBusStop
<< GeoDataFeature::TransportCarShare
diff --git a/src/lib/marble/StyleBuilder.cpp b/src/lib/marble/StyleBuilder.cpp
index 1b45508..12ba46f 100644
--- a/src/lib/marble/StyleBuilder.cpp
+++ b/src/lib/marble/StyleBuilder.cpp
@@ -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 >(),
diff --git a/src/lib/marble/geodata/data/GeoDataFeature.h b/src/lib/marble/geodata/data/GeoDataFeature.h
index f6e0eeb..af988b9 100644
--- a/src/lib/marble/geodata/data/GeoDataFeature.h
+++ b/src/lib/marble/geodata/data/GeoDataFeature.h
@@ -323,6 +323,7 @@ class GEODATA_EXPORT GeoDataFeature : public GeoDataObject
TransportAirportTerminal,
TransportAirportGate,
TransportAirportRunway,
+ TransportAirportTaxiway,
TransportBusStation,
TransportBusStop,
TransportCarShare,
diff --git a/src/lib/marble/geodata/data/GeoDataFeature_p.h b/src/lib/marble/geodata/data/GeoDataFeature_p.h
index be9f435..b94213f 100644
--- a/src/lib/marble/geodata/data/GeoDataFeature_p.h
+++ b/src/lib/marble/geodata/data/GeoDataFeature_p.h
@@ -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");
diff --git a/src/lib/marble/osm/OsmPresetLibrary.cpp b/src/lib/marble/osm/OsmPresetLibrary.cpp
index 2f4c591..bc94407 100644
--- a/src/lib/marble/osm/OsmPresetLibrary.cpp
+++ b/src/lib/marble/osm/OsmPresetLibrary.cpp
@@ -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;
diff --git a/src/plugins/runner/local-osm-search/DatabaseQuery.cpp b/src/plugins/runner/local-osm-search/DatabaseQuery.cpp
index de510d9..f2ac5c7 100644
--- a/src/plugins/runner/local-osm-search/DatabaseQuery.cpp
+++ b/src/plugins/runner/local-osm-search/DatabaseQuery.cpp
@@ -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;
diff --git a/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp b/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp
index 7c682c4..16712c0 100644
--- a/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp
+++ b/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp
@@ -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;
diff --git a/src/plugins/runner/local-osm-search/OsmPlacemark.h b/src/plugins/runner/local-osm-search/OsmPlacemark.h
index b907921..7886b34 100644
--- a/src/plugins/runner/local-osm-search/OsmPlacemark.h
+++ b/src/plugins/runner/local-osm-search/OsmPlacemark.h
@@ -64,6 +64,7 @@ public:
TransportAirportTerminal,
TransportAirportGate,
TransportAirportRunway,
+ TransportAirportTaxiway,
TransportBusStation,
TransportBusStop,
TransportCarShare,