summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Nienhüser <[email protected]>2015-10-26 22:09:53 +0100
committerDennis Nienhüser <[email protected]>2015-10-26 22:09:53 +0100
commit572b77bc4ce2db66853e40b44a9f74cc7ffbef25 (patch)
tree6e73ac67b30efbef95c6253b7dc4da6f0c3e2d6b
parent2772d15cabf1df889a0a376edd5704aee87d7911 (diff)
Render tourism=alpine_hut
-rw-r--r--src/lib/marble/PlacemarkLayout.cpp1
-rw-r--r--src/lib/marble/geodata/data/GeoDataFeature.cpp1
-rw-r--r--src/lib/marble/geodata/data/GeoDataFeature.h1
-rw-r--r--src/lib/marble/osm/OsmPresetLibrary.cpp1
4 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/marble/PlacemarkLayout.cpp b/src/lib/marble/PlacemarkLayout.cpp
index 0ccfcdb..1345b43 100644
--- a/src/lib/marble/PlacemarkLayout.cpp
+++ b/src/lib/marble/PlacemarkLayout.cpp
@@ -132,6 +132,7 @@ QSet<GeoDataFeature::GeoDataVisualCategory> acceptedVisualCategories()
<< GeoDataFeature::ShopBeverages
<< GeoDataFeature::ShopHifi
<< GeoDataFeature::ShopSupermarket
+ << GeoDataFeature::TouristAlpineHut
<< GeoDataFeature::TouristAttraction
<< GeoDataFeature::TouristCastle
<< GeoDataFeature::TouristCinema
diff --git a/src/lib/marble/geodata/data/GeoDataFeature.cpp b/src/lib/marble/geodata/data/GeoDataFeature.cpp
index fde9667..367a89a 100644
--- a/src/lib/marble/geodata/data/GeoDataFeature.cpp
+++ b/src/lib/marble/geodata/data/GeoDataFeature.cpp
@@ -504,6 +504,7 @@ void GeoDataFeaturePrivate::initializeDefaultStyles()
s_defaultStyle[GeoDataFeature::TouristThemePark] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, QString(), amenityColor );
s_defaultStyle[GeoDataFeature::TouristViewPoint] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "amenity/viewpoint.16", amenityColor );
s_defaultStyle[GeoDataFeature::TouristZoo] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, QString(), amenityColor, Qt::transparent );
+ s_defaultStyle[GeoDataFeature::TouristAlpineHut] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "transportation/alpinehut.16", transportationColor );
s_defaultStyle[GeoDataFeature::TransportAerodrome] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "airtransport/aerodrome", airTransportColor );
s_defaultStyle[GeoDataFeature::TransportHelipad] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, "airtransport/helipad", airTransportColor );
s_defaultStyle[GeoDataFeature::TransportAirportTerminal] = GeoDataFeaturePrivate::createOsmPOIStyle( osmFont, QString(), airTransportColor );
diff --git a/src/lib/marble/geodata/data/GeoDataFeature.h b/src/lib/marble/geodata/data/GeoDataFeature.h
index 743824f..5585ee8 100644
--- a/src/lib/marble/geodata/data/GeoDataFeature.h
+++ b/src/lib/marble/geodata/data/GeoDataFeature.h
@@ -315,6 +315,7 @@ class GEODATA_EXPORT GeoDataFeature : public GeoDataObject
TouristThemePark,
TouristViewPoint,
TouristZoo,
+ TouristAlpineHut,
// OpenStreetMap category Transport
TransportAerodrome,
diff --git a/src/lib/marble/osm/OsmPresetLibrary.cpp b/src/lib/marble/osm/OsmPresetLibrary.cpp
index 7b8dcd9..34b6cd5 100644
--- a/src/lib/marble/osm/OsmPresetLibrary.cpp
+++ b/src/lib/marble/osm/OsmPresetLibrary.cpp
@@ -176,6 +176,7 @@ void OsmPresetLibrary::initializeOsmVisualCategories()
s_visualCategories[ OsmTag( "tourism", "theme_park" ) ] = GeoDataFeature::TouristThemePark;
s_visualCategories[ OsmTag( "tourism", "viewpoint" ) ] = GeoDataFeature::TouristViewPoint;
s_visualCategories[ OsmTag( "tourism", "zoo" ) ] = GeoDataFeature::TouristZoo;
+ s_visualCategories[ OsmTag( "tourism", "alpine_hut" ) ] = GeoDataFeature::TouristAlpineHut;
s_visualCategories[ OsmTag( "barrier", "gate" ) ] = GeoDataFeature::BarrierGate;
s_visualCategories[ OsmTag( "barrier", "lift_gate" ) ] = GeoDataFeature::BarrierLiftGate;