summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Rahn <rahn@kde.org>2016-07-17 11:48:37 (GMT)
committerTorsten Rahn <trahn@testo.de>2016-07-17 11:49:19 (GMT)
commit02684a87bf018c7e672d2539130673edc9ca5b3c (patch)
treeb1fa9acbdf0566ffe8722fcd269e5d4f638c330d
parent6a50e1c259c6811be956af238c3e8b848f84d5a5 (diff)
Adding AmenityKindergarten.
-rw-r--r--src/lib/marble/PlacemarkLayout.cpp1
-rw-r--r--src/lib/marble/StyleBuilder.cpp4
-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.cpp2
-rw-r--r--src/plugins/runner/osm/OsmWay.cpp1
6 files changed, 10 insertions, 0 deletions
diff --git a/src/lib/marble/PlacemarkLayout.cpp b/src/lib/marble/PlacemarkLayout.cpp
index c97820a..43fa762 100644
--- a/src/lib/marble/PlacemarkLayout.cpp
+++ b/src/lib/marble/PlacemarkLayout.cpp
@@ -101,6 +101,7 @@ QSet<GeoDataFeature::GeoDataVisualCategory> acceptedVisualCategories()
<< GeoDataFeature::AccomodationMotel
<< GeoDataFeature::AccomodationYouthHostel
<< GeoDataFeature::AmenityLibrary
+ << GeoDataFeature::AmenityKindergarten
<< GeoDataFeature::EducationCollege
<< GeoDataFeature::EducationSchool
<< GeoDataFeature::EducationUniversity
diff --git a/src/lib/marble/StyleBuilder.cpp b/src/lib/marble/StyleBuilder.cpp
index 96179a2..57db4fc 100644
--- a/src/lib/marble/StyleBuilder.cpp
+++ b/src/lib/marble/StyleBuilder.cpp
@@ -475,6 +475,7 @@ void StyleBuilder::Private::initializeDefaultStyles()
m_defaultStyle[GeoDataFeature::AccomodationYouthHostel] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "transportation/hostel.16", transportationColor );
m_defaultStyle[GeoDataFeature::AccomodationGuestHouse] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "transportation/guest_house.16", transportationColor );
m_defaultStyle[GeoDataFeature::AmenityLibrary] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/library.20", amenityColor );
+ m_defaultStyle[GeoDataFeature::AmenityKindergarten] = StyleBuilder::Private::createOsmPOIStyle( osmFont, QString(), amenityColor, educationalAreasAndHospital, amenityColor );
m_defaultStyle[GeoDataFeature::EducationCollege] = StyleBuilder::Private::createOsmPOIStyle( osmFont, QString(), amenityColor, educationalAreasAndHospital, amenityColor );
m_defaultStyle[GeoDataFeature::EducationSchool] = StyleBuilder::Private::createOsmPOIStyle( osmFont, QString(), amenityColor, educationalAreasAndHospital, amenityColor );
m_defaultStyle[GeoDataFeature::EducationUniversity] = StyleBuilder::Private::createOsmPOIStyle( osmFont, QString(), amenityColor, educationalAreasAndHospital, amenityColor );
@@ -1042,6 +1043,7 @@ QStringList StyleBuilder::renderOrder() const
paintLayerOrder << Private::createPaintLayerItem("Polygon", GeoDataFeature::AmenityGraveyard);
+ paintLayerOrder << Private::createPaintLayerItem("Polygon", GeoDataFeature::AmenityKindergarten);
paintLayerOrder << Private::createPaintLayerItem("Polygon", GeoDataFeature::EducationCollege);
paintLayerOrder << Private::createPaintLayerItem("Polygon", GeoDataFeature::EducationSchool);
paintLayerOrder << Private::createPaintLayerItem("Polygon", GeoDataFeature::EducationUniversity);
@@ -1112,6 +1114,7 @@ QStringList StyleBuilder::renderOrder() const
paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataFeature::Landmass);
paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataFeature::NaturalCliff);
paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataFeature::NaturalPeak);
+ paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataFeature::AmenityKindergarten);
paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataFeature::EducationCollege);
paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataFeature::EducationSchool);
paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataFeature::EducationUniversity);
@@ -1237,6 +1240,7 @@ QString StyleBuilder::visualCategoryName(GeoDataFeature::GeoDataVisualCategory c
visualCategoryNames[GeoDataFeature::AccomodationYouthHostel] = "AccomodationYouthHostel";
visualCategoryNames[GeoDataFeature::AccomodationGuestHouse] = "AccomodationGuestHouse";
visualCategoryNames[GeoDataFeature::AmenityLibrary] = "AmenityLibrary";
+ visualCategoryNames[GeoDataFeature::AmenityKindergarten] = "AmenityKindergarten";
visualCategoryNames[GeoDataFeature::EducationCollege] = "EducationCollege";
visualCategoryNames[GeoDataFeature::EducationSchool] = "EducationSchool";
visualCategoryNames[GeoDataFeature::EducationUniversity] = "EducationUniversity";
diff --git a/src/lib/marble/declarative/Placemark.cpp b/src/lib/marble/declarative/Placemark.cpp
index d9017cf..a5b7cd7 100644
--- a/src/lib/marble/declarative/Placemark.cpp
+++ b/src/lib/marble/declarative/Placemark.cpp
@@ -252,6 +252,7 @@ QString Placemark::categoryName(GeoDataFeature::GeoDataVisualCategory category)
case GeoDataFeature::AccomodationYouthHostel: return tr("Youth Hostel");
case GeoDataFeature::AccomodationGuestHouse: return tr("Guest House");
case GeoDataFeature::AmenityLibrary: return tr("Library");
+ case GeoDataFeature::AmenityKindergarten: return tr("Kindergarten");
case GeoDataFeature::EducationCollege: return tr("College");
case GeoDataFeature::EducationSchool: return tr("School");
case GeoDataFeature::EducationUniversity: return tr("University");
diff --git a/src/lib/marble/geodata/data/GeoDataFeature.h b/src/lib/marble/geodata/data/GeoDataFeature.h
index 3de67e5..8335abe 100644
--- a/src/lib/marble/geodata/data/GeoDataFeature.h
+++ b/src/lib/marble/geodata/data/GeoDataFeature.h
@@ -189,6 +189,7 @@ class GEODATA_EXPORT GeoDataFeature : public GeoDataObject
// OpenStreetMap category Amenity
AmenityLibrary,
+ AmenityKindergarten,
// OpenStreetMap category Education
EducationCollege,
diff --git a/src/lib/marble/osm/OsmPresetLibrary.cpp b/src/lib/marble/osm/OsmPresetLibrary.cpp
index 146d7b8..3b2d140 100644
--- a/src/lib/marble/osm/OsmPresetLibrary.cpp
+++ b/src/lib/marble/osm/OsmPresetLibrary.cpp
@@ -55,6 +55,8 @@ void OsmPresetLibrary::initializeOsmVisualCategories()
s_visualCategories[ OsmTag( "amenity", "school" ) ] = GeoDataFeature::EducationSchool;
s_visualCategories[ OsmTag( "amenity", "college" ) ] = GeoDataFeature::EducationCollege;
s_visualCategories[ OsmTag( "amenity", "library" ) ] = GeoDataFeature::AmenityLibrary;
+ s_visualCategories[ OsmTag( "amenity", "kindergarten" ) ] = GeoDataFeature::AmenityKindergarten;
+ s_visualCategories[ OsmTag( "amenity", "childcare" ) ] = GeoDataFeature::AmenityKindergarten;
s_visualCategories[ OsmTag( "amenity", "university" ) ] = GeoDataFeature::EducationUniversity;
s_visualCategories[ OsmTag( "amenity", "bus_station" ) ] = GeoDataFeature::TransportBusStation;
s_visualCategories[ OsmTag( "amenity", "car_sharing" ) ] = GeoDataFeature::TransportCarShare;
diff --git a/src/plugins/runner/osm/OsmWay.cpp b/src/plugins/runner/osm/OsmWay.cpp
index 37ba831..23a3238 100644
--- a/src/plugins/runner/osm/OsmWay.cpp
+++ b/src/plugins/runner/osm/OsmWay.cpp
@@ -140,6 +140,7 @@ bool OsmWay::isAreaTag(const QString &keyValue)
s_areaTags.insert( "amenity=bicycle_parking" );
s_areaTags.insert( "amenity=college" );
s_areaTags.insert( "amenity=hospital" );
+ s_areaTags.insert( "amenity=kindergarten" );
s_areaTags.insert( "amenity=school" );
s_areaTags.insert( "amenity=university" );
s_areaTags.insert( "leisure=common" );