Commit 23fb2b7e authored by Dennis Nienhüser's avatar Dennis Nienhüser
Browse files

Show gates at airports

parent a7ff38fe
......@@ -133,6 +133,7 @@ QSet<GeoDataFeature::GeoDataVisualCategory> acceptedVisualCategories()
<< GeoDataFeature::TouristZoo
<< GeoDataFeature::TransportAerodrome
<< GeoDataFeature::TransportAirportTerminal
<< GeoDataFeature::TransportAirportGate
<< GeoDataFeature::TransportBusStation
<< GeoDataFeature::TransportBusStop
<< GeoDataFeature::TransportCarShare
......
......@@ -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";
......
......@@ -321,6 +321,7 @@ class GEODATA_EXPORT GeoDataFeature : public GeoDataObject
TransportAerodrome,
TransportHelipad,
TransportAirportTerminal,
TransportAirportGate,
TransportBusStation,
TransportBusStop,
TransportCarShare,
......
......@@ -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;
......
......@@ -62,6 +62,7 @@ public:
TouristZoo,
TransportAirport,
TransportAirportTerminal,
TransportAirportGate,
TransportBusStation,
TransportBusStop,
TransportCarShare,
......
......@@ -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() );
......
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