summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Nienhüser <nienhueser@kde.org>2016-07-30 06:14:05 (GMT)
committerDennis Nienhüser <nienhueser@kde.org>2016-07-30 06:14:05 (GMT)
commit23fb2b7e1dc8e6285185582abf18d15e9eff25bb (patch)
tree17900c1f17128d9aad178bf8b433acb41fbb2f8c
parenta7ff38fe01b94bf6aa97bc4d3d37e271a26d5439 (diff)
Show gates at airports
-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/osm/OsmPresetLibrary.cpp1
-rw-r--r--src/plugins/runner/local-osm-search/OsmPlacemark.h1
-rw-r--r--src/plugins/runner/osm/OsmNode.cpp3
6 files changed, 9 insertions, 0 deletions
diff --git a/src/lib/marble/PlacemarkLayout.cpp b/src/lib/marble/PlacemarkLayout.cpp
index 9988894..6e8fc4c 100644
--- a/src/lib/marble/PlacemarkLayout.cpp
+++ b/src/lib/marble/PlacemarkLayout.cpp
@@ -133,6 +133,7 @@ QSet<GeoDataFeature::GeoDataVisualCategory> acceptedVisualCategories()
<< GeoDataFeature::TouristZoo
<< GeoDataFeature::TransportAerodrome
<< GeoDataFeature::TransportAirportTerminal
+ << GeoDataFeature::TransportAirportGate
<< GeoDataFeature::TransportBusStation
<< GeoDataFeature::TransportBusStop
<< GeoDataFeature::TransportCarShare
diff --git a/src/lib/marble/StyleBuilder.cpp b/src/lib/marble/StyleBuilder.cpp
index 73a02ba..52d8912 100644
--- a/src/lib/marble/StyleBuilder.cpp
+++ b/src/lib/marble/StyleBuilder.cpp
@@ -606,6 +606,7 @@ void StyleBuilder::Private::initializeDefaultStyles()
m_defaultStyle[GeoDataFeature::TransportAerodrome] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "airtransport/aerodrome", airTransportColor );
m_defaultStyle[GeoDataFeature::TransportHelipad] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "airtransport/helipad", airTransportColor );
m_defaultStyle[GeoDataFeature::TransportAirportTerminal] = StyleBuilder::Private::createOsmPOIStyle( osmFont, QString(), airTransportColor );
+ m_defaultStyle[GeoDataFeature::TransportAirportGate] = StyleBuilder::Private::createOsmPOIStyle( osmFont, QString(), airTransportColor );
m_defaultStyle[GeoDataFeature::TransportBusStation] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "transportation/bus_station.16", transportationColor );
m_defaultStyle[GeoDataFeature::TransportBusStop] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "transportation/bus_stop.12", transportationColor );
m_defaultStyle[GeoDataFeature::TransportCarShare] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "transportation/car_share.16", transportationColor );
@@ -1412,6 +1413,7 @@ QString StyleBuilder::visualCategoryName(GeoDataFeature::GeoDataVisualCategory c
visualCategoryNames[GeoDataFeature::TransportAerodrome] = "TransportAerodrome";
visualCategoryNames[GeoDataFeature::TransportHelipad] = "TransportHelipad";
visualCategoryNames[GeoDataFeature::TransportAirportTerminal] = "TransportAirportTerminal";
+ visualCategoryNames[GeoDataFeature::TransportAirportGate] = "TransportAirportGate";
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 d88f9ac..0ce18f4 100644
--- a/src/lib/marble/geodata/data/GeoDataFeature.h
+++ b/src/lib/marble/geodata/data/GeoDataFeature.h
@@ -321,6 +321,7 @@ class GEODATA_EXPORT GeoDataFeature : public GeoDataObject
TransportAerodrome,
TransportHelipad,
TransportAirportTerminal,
+ TransportAirportGate,
TransportBusStation,
TransportBusStop,
TransportCarShare,
diff --git a/src/lib/marble/osm/OsmPresetLibrary.cpp b/src/lib/marble/osm/OsmPresetLibrary.cpp
index 36f483f..463c8ce 100644
--- a/src/lib/marble/osm/OsmPresetLibrary.cpp
+++ b/src/lib/marble/osm/OsmPresetLibrary.cpp
@@ -302,6 +302,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( "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 59a3003..7fcd5ba 100644
--- a/src/plugins/runner/local-osm-search/OsmPlacemark.h
+++ b/src/plugins/runner/local-osm-search/OsmPlacemark.h
@@ -62,6 +62,7 @@ public:
TouristZoo,
TransportAirport,
TransportAirportTerminal,
+ TransportAirportGate,
TransportBusStation,
TransportBusStop,
TransportCarShare,
diff --git a/src/plugins/runner/osm/OsmNode.cpp b/src/plugins/runner/osm/OsmNode.cpp
index e6d5f83..65df1d8 100644
--- a/src/plugins/runner/osm/OsmNode.cpp
+++ b/src/plugins/runner/osm/OsmNode.cpp
@@ -49,6 +49,9 @@ void OsmNode::create(GeoDataDocument *document) const
} else {
placemark->setName(m_osmData.tagValue("name"));
}
+ if (placemark->name().isEmpty()) {
+ placemark->setName(m_osmData.tagValue("ref"));
+ }
placemark->setVisualCategory(category);
placemark->setStyle( GeoDataStyle::Ptr() );