diff --git a/src/lib/marble/StyleBuilder.cpp b/src/lib/marble/StyleBuilder.cpp --- a/src/lib/marble/StyleBuilder.cpp +++ b/src/lib/marble/StyleBuilder.cpp @@ -1046,6 +1046,7 @@ m_defaultStyle[GeoDataPlacemark::TourismZoo] = createOsmPOIRingStyle(osmFont, QString(), amenityColor, Qt::transparent); m_defaultStyle[GeoDataPlacemark::TourismAlpineHut] = createOsmPOIStyle(osmFont, "transportation/alpinehut.16", transportationColor); m_defaultStyle[GeoDataPlacemark::TourismWildernessHut] = createOsmPOIStyle(osmFont, "transportation/wilderness_hut", transportationColor); + m_defaultStyle[GeoDataPlacemark::TourismCaravanSite] = createOsmPOIAreaStyle(osmFont, "transportation/caravan_park.16", transportationColor); m_defaultStyle[GeoDataPlacemark::TransportAerodrome] = createOsmPOIStyle(osmFont, "airtransport/aerodrome", airTransportColor); m_defaultStyle[GeoDataPlacemark::TransportHelipad] = createOsmPOIStyle(osmFont, "airtransport/helipad", airTransportColor); m_defaultStyle[GeoDataPlacemark::TransportAirportTerminal] = createOsmPOIAreaStyle(osmFont, QString(), airTransportColor); @@ -1507,6 +1508,8 @@ s_visualCategories[OsmTag("tourism", "viewpoint")] = GeoDataPlacemark::TourismViewPoint; s_visualCategories[OsmTag("tourism", "wilderness_hut")] = GeoDataPlacemark::TourismWildernessHut; s_visualCategories[OsmTag("tourism", "zoo")] = GeoDataPlacemark::TourismZoo; + s_visualCategories[OsmTag("tourism", "caravan_site")] = GeoDataPlacemark::TourismCaravanSite; + s_visualCategories[OsmTag("amenity", "trailer_park")] = GeoDataPlacemark::TourismCaravanSite; s_visualCategories[OsmTag("barrier", "city_wall")] = GeoDataPlacemark::BarrierCityWall; s_visualCategories[OsmTag("barrier", "gate")] = GeoDataPlacemark::BarrierGate; @@ -1926,6 +1929,7 @@ s_defaultMinZoomLevels[GeoDataPlacemark::TourismThemePark] = 15; s_defaultMinZoomLevels[GeoDataPlacemark::TourismViewPoint] = 15; s_defaultMinZoomLevels[GeoDataPlacemark::TourismZoo] = 15; + s_defaultMinZoomLevels[GeoDataPlacemark::TourismCaravanSite] = 16; s_defaultMinZoomLevels[GeoDataPlacemark::HistoricMonument] = 16; s_defaultMinZoomLevels[GeoDataPlacemark::TourismInformation] = 17; s_defaultMinZoomLevels[GeoDataPlacemark::TransportAerodrome] = 9; @@ -2331,6 +2335,7 @@ popularities << GeoDataPlacemark::TourismZoo; popularities << GeoDataPlacemark::TourismAlpineHut; popularities << GeoDataPlacemark::TourismWildernessHut; + popularities << GeoDataPlacemark::TourismCaravanSite; popularities << GeoDataPlacemark::HistoricMemorial; @@ -2678,6 +2683,7 @@ visualCategoryNames[GeoDataPlacemark::TourismZoo] = "TouristZoo"; visualCategoryNames[GeoDataPlacemark::TourismAlpineHut] = "TouristAlpineHut"; visualCategoryNames[GeoDataPlacemark::TourismWildernessHut] = "TouristWildernessHut"; + visualCategoryNames[GeoDataPlacemark::TourismCaravanSite] = "TouristCaravanSite"; visualCategoryNames[GeoDataPlacemark::TransportAerodrome] = "TransportAerodrome"; visualCategoryNames[GeoDataPlacemark::TransportHelipad] = "TransportHelipad"; visualCategoryNames[GeoDataPlacemark::TransportAirportTerminal] = "TransportAirportTerminal"; diff --git a/src/lib/marble/geodata/data/GeoDataPlacemark.h b/src/lib/marble/geodata/data/GeoDataPlacemark.h --- a/src/lib/marble/geodata/data/GeoDataPlacemark.h +++ b/src/lib/marble/geodata/data/GeoDataPlacemark.h @@ -356,6 +356,7 @@ TourismZoo, TourismAlpineHut, TourismWildernessHut, + TourismCaravanSite, // OpenStreetMap category Historic HistoricArchaeologicalSite, diff --git a/src/lib/marble/geodata/data/GeoDataPlacemark.cpp b/src/lib/marble/geodata/data/GeoDataPlacemark.cpp --- a/src/lib/marble/geodata/data/GeoDataPlacemark.cpp +++ b/src/lib/marble/geodata/data/GeoDataPlacemark.cpp @@ -536,6 +536,7 @@ case TourismZoo: return GeoDataPlacemarkPrivate::tr("Zoo"); case TourismAlpineHut: return GeoDataPlacemarkPrivate::tr("Alpine Hut"); case TourismWildernessHut: return GeoDataPlacemarkPrivate::tr("Wilderness Hut"); + case TourismCaravanSite: return GeoDataPlacemarkPrivate::tr("Caravan Site"); case HistoricMemorial: return GeoDataPlacemarkPrivate::tr("Memorial"); case TransportAerodrome: return GeoDataPlacemarkPrivate::tr("Aerodrome"); case TransportHelipad: return GeoDataPlacemarkPrivate::tr("Helipad");