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 @@ -653,6 +653,8 @@ m_defaultStyle[GeoDataPlacemark::ManmadeWaterTower] = createOsmPOIStyle(osmFont, "amenity/water_tower.16", amenityColor); m_defaultStyle[GeoDataPlacemark::ManmadeWindMill] = createOsmPOIStyle(osmFont, "amenity/windmill.16", amenityColor); + m_defaultStyle[GeoDataPlacemark::HistoricMemorial] = createOsmPOIStyle(osmFont, "amenity/tourist_memorial.16", amenityColor); + m_defaultStyle[GeoDataPlacemark::TouristAttraction] = createOsmPOIStyle(osmFont, "amenity/tourist_memorial.16", amenityColor); m_defaultStyle[GeoDataPlacemark::TouristCastle] = createOsmPOIRingStyle(osmFont, "amenity/cinema.16", amenityColor); m_defaultStyle[GeoDataPlacemark::TouristCinema] = createOsmPOIStyle(osmFont, "amenity/cinema.16", amenityColor); @@ -1023,7 +1025,7 @@ s_visualCategories[OsmTag("religion", "shinto")] = GeoDataPlacemark::ReligionShinto; s_visualCategories[OsmTag("religion", "sikh")] = GeoDataPlacemark::ReligionSikh; - s_visualCategories[OsmTag("historic", "memorial")] = GeoDataPlacemark::TouristAttraction; + s_visualCategories[OsmTag("historic", "memorial")] = GeoDataPlacemark::HistoricMemorial; s_visualCategories[OsmTag("tourism", "attraction")] = GeoDataPlacemark::TouristAttraction; s_visualCategories[OsmTag("tourism", "camp_site")] = GeoDataPlacemark::AccomodationCamping; s_visualCategories[OsmTag("tourism", "hostel")] = GeoDataPlacemark::AccomodationHostel; @@ -1818,6 +1820,7 @@ visualCategoryNames[GeoDataPlacemark::TouristThemePark] = "TouristThemePark"; visualCategoryNames[GeoDataPlacemark::TouristViewPoint] = "TouristViewPoint"; visualCategoryNames[GeoDataPlacemark::TouristZoo] = "TouristZoo"; + visualCategoryNames[GeoDataPlacemark::HistoricMemorial] = "HistoricMemorial"; visualCategoryNames[GeoDataPlacemark::TouristAlpineHut] = "TouristAlpineHut"; visualCategoryNames[GeoDataPlacemark::TransportAerodrome] = "TransportAerodrome"; visualCategoryNames[GeoDataPlacemark::TransportHelipad] = "TransportHelipad"; 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 @@ -345,6 +345,9 @@ TouristZoo, TouristAlpineHut, + // OpenStreetMap category Historic + HistoricMemorial, + // OpenStreetMap category Transport TransportAerodrome, TransportHelipad, 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 @@ -562,6 +562,7 @@ case TouristViewPoint: return GeoDataPlacemarkPrivate::tr("View Point"); case TouristZoo: return GeoDataPlacemarkPrivate::tr("Zoo"); case TouristAlpineHut: return GeoDataPlacemarkPrivate::tr("Alpine Hut"); + case HistoricMemorial: return GeoDataPlacemarkPrivate::tr("Memorial"); case TransportAerodrome: return GeoDataPlacemarkPrivate::tr("Aerodrome"); case TransportHelipad: return GeoDataPlacemarkPrivate::tr("Helipad"); case TransportAirportGate: return GeoDataPlacemarkPrivate::tr("Airport Gate"); diff --git a/src/plugins/runner/local-osm-search/DatabaseQuery.cpp b/src/plugins/runner/local-osm-search/DatabaseQuery.cpp --- a/src/plugins/runner/local-osm-search/DatabaseQuery.cpp +++ b/src/plugins/runner/local-osm-search/DatabaseQuery.cpp @@ -162,6 +162,8 @@ pois["speed camera"] = OsmPlacemark::TransportSpeedCamera; pois[QObject::tr( "taxi" ).toLower()] = OsmPlacemark::TransportTaxiRank; pois["taxi"] = OsmPlacemark::TransportTaxiRank; + pois[QObject::tr( "memorial" ).toLower()] = OsmPlacemark::HistoricMemorial; + pois["memorial"] = OsmPlacemark::HistoricMemorial; } Q_ASSERT( !pois.isEmpty() ); diff --git a/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp b/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp --- a/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp +++ b/src/plugins/runner/local-osm-search/LocalOsmSearchRunner.cpp @@ -65,6 +65,7 @@ m_categoryMap[OsmPlacemark::TouristThemePark] = GeoDataPlacemark::TouristThemePark; m_categoryMap[OsmPlacemark::TouristViewPoint] = GeoDataPlacemark::TouristViewPoint; m_categoryMap[OsmPlacemark::TouristZoo] = GeoDataPlacemark::TouristZoo; + m_categoryMap[OsmPlacemark::HistoricMemorial] = GeoDataPlacemark::HistoricMemorial; m_categoryMap[OsmPlacemark::TransportAirport] = GeoDataPlacemark::TransportAerodrome; m_categoryMap[OsmPlacemark::TransportAirportTerminal] = GeoDataPlacemark::TransportAirportTerminal; m_categoryMap[OsmPlacemark::TransportAirportRunway] = GeoDataPlacemark::TransportAirportRunway; diff --git a/src/plugins/runner/local-osm-search/OsmPlacemark.h b/src/plugins/runner/local-osm-search/OsmPlacemark.h --- a/src/plugins/runner/local-osm-search/OsmPlacemark.h +++ b/src/plugins/runner/local-osm-search/OsmPlacemark.h @@ -86,7 +86,8 @@ PlacesIsolatedDwelling, PlacesSuburb, PlacesLocality, - PlacesIsland + PlacesIsland, + HistoricMemorial }; OsmPlacemark(); diff --git a/src/plugins/runner/osm/OsmNode.cpp b/src/plugins/runner/osm/OsmNode.cpp --- a/src/plugins/runner/osm/OsmNode.cpp +++ b/src/plugins/runner/osm/OsmNode.cpp @@ -199,6 +199,7 @@ popularities << GeoDataPlacemark::ManmadePier; popularities << GeoDataPlacemark::ManmadeWaterTower; popularities << GeoDataPlacemark::ManmadeWindMill; + popularities << GeoDataPlacemark::TouristAttraction; popularities << GeoDataPlacemark::TouristCastle; popularities << GeoDataPlacemark::TouristCinema; @@ -211,6 +212,9 @@ popularities << GeoDataPlacemark::TouristViewPoint; popularities << GeoDataPlacemark::TouristZoo; popularities << GeoDataPlacemark::TouristAlpineHut; + + popularities << GeoDataPlacemark::HistoricMemorial; + popularities << GeoDataPlacemark::TransportAerodrome; popularities << GeoDataPlacemark::TransportHelipad; popularities << GeoDataPlacemark::TransportAirportTerminal;