Commit 02684a87 authored by Torsten Rahn's avatar Torsten Rahn Committed by Torsten Rahn
Browse files

Adding AmenityKindergarten.

parent 6a50e1c2
......@@ -101,6 +101,7 @@ QSet<GeoDataFeature::GeoDataVisualCategory> acceptedVisualCategories()
<< GeoDataFeature::AccomodationMotel
<< GeoDataFeature::AccomodationYouthHostel
<< GeoDataFeature::AmenityLibrary
<< GeoDataFeature::AmenityKindergarten
<< GeoDataFeature::EducationCollege
<< GeoDataFeature::EducationSchool
<< GeoDataFeature::EducationUniversity
......
......@@ -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";
......
......@@ -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");
......
......@@ -189,6 +189,7 @@ class GEODATA_EXPORT GeoDataFeature : public GeoDataObject
// OpenStreetMap category Amenity
AmenityLibrary,
AmenityKindergarten,
// OpenStreetMap category Education
EducationCollege,
......
......@@ -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;
......
......@@ -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" );
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment