summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Nienhüser <nienhueser@kde.org>2016-07-23 15:54:18 (GMT)
committerDennis Nienhüser <nienhueser@kde.org>2016-07-23 15:54:18 (GMT)
commit59fb06dbcbe697c5515818e85dc40dba737e42b7 (patch)
treec9c5b6ed0a7dece6844a86dcaa230216d7cf8110
parent942cd301687de253911460c67a8eb55069c578d8 (diff)
Render amenity=shelter
-rw-r--r--data/svg/osmcarto/svg/amenity/shelter-14.svg1
-rw-r--r--src/lib/marble/StyleBuilder.cpp2
-rw-r--r--src/lib/marble/declarative/Placemark.cpp1
-rw-r--r--src/lib/marble/geodata/data/GeoDataFeature.h1
-rw-r--r--src/lib/marble/osm/OsmPresetLibrary.cpp1
5 files changed, 6 insertions, 0 deletions
diff --git a/data/svg/osmcarto/svg/amenity/shelter-14.svg b/data/svg/osmcarto/svg/amenity/shelter-14.svg
new file mode 100644
index 0000000..2209833
--- /dev/null
+++ b/data/svg/osmcarto/svg/amenity/shelter-14.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 14 14"><path d="M4.008 0l-1 2h.47l1.045-2h-.515zm4 0l-1 2h.47l1.045-2h-.515zm4 0l-1 2h.47l1.045-2h-.515zM1 2L0 4h.47l1.048-2H1zm4.008 0l-1 2h.47l1.045-2h-.515zm4 0l-1 2h.47l1.045-2h-.515zm4 0l-1 2h.47l1.045-2h-.515zM2.5 4l-1 2h.47l1.048-2H2.5zm7.982 0l-1 2h.47L11 4h-.518zM7 5L0 9h2l1-.4V13.5a.5.5 0 0 0 .24.428.5.5 0 0 0 .504.008A.5.5 0 0 0 4 13.5V8.2L7 7l3 1.2v5.3a.5.5 0 0 0 .24.428.5.5 0 0 0 .504.008A.5.5 0 0 0 11 13.5V8.6l1 .4h2L7 5z" fill-rule="evenodd"/></svg> \ No newline at end of file
diff --git a/src/lib/marble/StyleBuilder.cpp b/src/lib/marble/StyleBuilder.cpp
index aa69f2e..ade7149 100644
--- a/src/lib/marble/StyleBuilder.cpp
+++ b/src/lib/marble/StyleBuilder.cpp
@@ -526,6 +526,7 @@ void StyleBuilder::Private::initializeDefaultStyles()
m_defaultStyle[GeoDataFeature::AmenityPostOffice] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/post_office-14", amenityColor );
m_defaultStyle[GeoDataFeature::AmenityPrison] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/prison.16", amenityColor );
m_defaultStyle[GeoDataFeature::AmenityRecycling] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/recycling.16", amenityColor );
+ m_defaultStyle[GeoDataFeature::AmenityShelter] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/shelter-14", amenityColor );
m_defaultStyle[GeoDataFeature::AmenityTelephone] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/telephone.16", amenityColor );
m_defaultStyle[GeoDataFeature::AmenityToilets] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/toilets.16", amenityColor );
m_defaultStyle[GeoDataFeature::AmenityTownHall] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/town_hall.16", amenityColor );
@@ -1325,6 +1326,7 @@ QString StyleBuilder::visualCategoryName(GeoDataFeature::GeoDataVisualCategory c
visualCategoryNames[GeoDataFeature::AmenityPostOffice] = "AmenityPostOffice";
visualCategoryNames[GeoDataFeature::AmenityPrison] = "AmenityPrison";
visualCategoryNames[GeoDataFeature::AmenityRecycling] = "AmenityRecycling";
+ visualCategoryNames[GeoDataFeature::AmenityShelter] = "AmenityShelter";
visualCategoryNames[GeoDataFeature::AmenityTelephone] = "AmenityTelephone";
visualCategoryNames[GeoDataFeature::AmenityToilets] = "AmenityToilets";
visualCategoryNames[GeoDataFeature::AmenityTownHall] = "AmenityTownHall";
diff --git a/src/lib/marble/declarative/Placemark.cpp b/src/lib/marble/declarative/Placemark.cpp
index d5e67d2..d931b9d 100644
--- a/src/lib/marble/declarative/Placemark.cpp
+++ b/src/lib/marble/declarative/Placemark.cpp
@@ -302,6 +302,7 @@ QString Placemark::categoryName(GeoDataFeature::GeoDataVisualCategory category)
case GeoDataFeature::AmenityPostOffice: return tr("Post Office");
case GeoDataFeature::AmenityPrison: return tr("Prison");
case GeoDataFeature::AmenityRecycling: return tr("Recycling");
+ case GeoDataFeature::AmenityShelter: return tr("Shelter");
case GeoDataFeature::AmenityTelephone: return tr("Telephone");
case GeoDataFeature::AmenityToilets: return tr("Toilets");
case GeoDataFeature::AmenityTownHall: return tr("Town Hall");
diff --git a/src/lib/marble/geodata/data/GeoDataFeature.h b/src/lib/marble/geodata/data/GeoDataFeature.h
index 6433d2a..663e994 100644
--- a/src/lib/marble/geodata/data/GeoDataFeature.h
+++ b/src/lib/marble/geodata/data/GeoDataFeature.h
@@ -231,6 +231,7 @@ class GEODATA_EXPORT GeoDataFeature : public GeoDataObject
AmenityPostOffice,
AmenityPrison,
AmenityRecycling,
+ AmenityShelter,
AmenityTelephone,
AmenityToilets,
AmenityTownHall,
diff --git a/src/lib/marble/osm/OsmPresetLibrary.cpp b/src/lib/marble/osm/OsmPresetLibrary.cpp
index 40e4407..36f483f 100644
--- a/src/lib/marble/osm/OsmPresetLibrary.cpp
+++ b/src/lib/marble/osm/OsmPresetLibrary.cpp
@@ -82,6 +82,7 @@ void OsmPresetLibrary::initializeOsmVisualCategories()
s_visualCategories[ OsmTag( "amenity", "post_office" ) ] = GeoDataFeature::AmenityPostOffice;
s_visualCategories[ OsmTag( "amenity", "prison" ) ] = GeoDataFeature::AmenityPrison;
s_visualCategories[ OsmTag( "amenity", "recycling" ) ] = GeoDataFeature::AmenityRecycling;
+ s_visualCategories[ OsmTag( "amenity", "shelter" ) ] = GeoDataFeature::AmenityShelter;
s_visualCategories[ OsmTag( "amenity", "telephone" ) ] = GeoDataFeature::AmenityTelephone;
s_visualCategories[ OsmTag( "amenity", "toilets" ) ] = GeoDataFeature::AmenityToilets;
s_visualCategories[ OsmTag( "amenity", "townhall" ) ] = GeoDataFeature::AmenityTownHall;