summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Beschow <bbeschow@cs.tu-berlin.de>2016-09-11 09:26:33 (GMT)
committerBernhard Beschow <bbeschow@cs.tu-berlin.de>2016-09-11 09:26:33 (GMT)
commitc78b2f09485ab9cb2aaae8bca2db7f75dd9396df (patch)
treec87a9dab11017acb97ebbbed773c3e4a072357e2
parent21045945f7e08992c6bc21ed7030a4f286b0b2b3 (diff)
no need for StyleBuilder::Private:: prefix
-rw-r--r--src/lib/marble/StyleBuilder.cpp522
1 files changed, 261 insertions, 261 deletions
diff --git a/src/lib/marble/StyleBuilder.cpp b/src/lib/marble/StyleBuilder.cpp
index 0806291..fb11ef4 100644
--- a/src/lib/marble/StyleBuilder.cpp
+++ b/src/lib/marble/StyleBuilder.cpp
@@ -499,7 +499,7 @@ void StyleBuilder::Private::initializeDefaultStyles()
QFont( defaultFamily, defaultSize, 50, false ), defaultLabelColor ));
m_defaultStyle[GeoDataFeature::Bookmark]
- = StyleBuilder::Private::createPOIStyle(QFont( defaultFamily, defaultSize, 50, false ),
+ = createPOIStyle(QFont( defaultFamily, defaultSize, 50, false ),
MarbleDirs::path("svg/bookmark.svg"), defaultLabelColor );
m_defaultStyle[GeoDataFeature::Bookmark]->iconStyle().setScale(0.75);
@@ -515,278 +515,278 @@ void StyleBuilder::Private::initializeDefaultStyles()
// QColor const buildingColor(0, 255, 0, 64);
QFont const osmFont( defaultFamily, 10, 50, false );
- m_defaultStyle[GeoDataFeature::AccomodationCamping] = StyleBuilder::Private::createOsmPOIRingStyle( osmFont, "transportation/camping.16", transportationColor );
- m_defaultStyle[GeoDataFeature::AccomodationHostel] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "transportation/hostel.16", transportationColor );
- m_defaultStyle[GeoDataFeature::AccomodationHotel] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "transportation/hotel.16", transportationColor );
- m_defaultStyle[GeoDataFeature::AccomodationMotel] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "transportation/motel.16", transportationColor );
- 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::createOsmPOIAreaStyle( osmFont, QString(), amenityColor, educationalAreasAndHospital, amenityColor );
- m_defaultStyle[GeoDataFeature::EducationCollege] = StyleBuilder::Private::createOsmPOIAreaStyle( osmFont, QString(), amenityColor, educationalAreasAndHospital, amenityColor );
- m_defaultStyle[GeoDataFeature::EducationSchool] = StyleBuilder::Private::createOsmPOIAreaStyle( osmFont, QString(), amenityColor, educationalAreasAndHospital, amenityColor );
- m_defaultStyle[GeoDataFeature::EducationUniversity] = StyleBuilder::Private::createOsmPOIAreaStyle( osmFont, QString(), amenityColor, educationalAreasAndHospital, amenityColor );
- m_defaultStyle[GeoDataFeature::FoodBar] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/bar.16", amenityColor );
- m_defaultStyle[GeoDataFeature::FoodBiergarten] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/biergarten.16", amenityColor );
- m_defaultStyle[GeoDataFeature::FoodCafe] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/cafe.16", amenityColor );
- m_defaultStyle[GeoDataFeature::FoodFastFood] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/fast_food.16", amenityColor );
- m_defaultStyle[GeoDataFeature::FoodPub] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/pub.16", amenityColor );
- m_defaultStyle[GeoDataFeature::FoodRestaurant] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/restaurant.16", amenityColor );
-
- m_defaultStyle[GeoDataFeature::HealthDentist] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "health/dentist.16", healthColor );
- m_defaultStyle[GeoDataFeature::HealthDoctors] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "health/doctors.16", healthColor );
- m_defaultStyle[GeoDataFeature::HealthHospital] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "health/hospital.16", healthColor, educationalAreasAndHospital, amenityColor );
- m_defaultStyle[GeoDataFeature::HealthPharmacy] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "health/pharmacy.16", healthColor );
- m_defaultStyle[GeoDataFeature::HealthVeterinary] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "health/veterinary-14", healthColor );
-
- m_defaultStyle[GeoDataFeature::MoneyAtm] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/atm.16", amenityColor );
- m_defaultStyle[GeoDataFeature::MoneyBank] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/bank.16", amenityColor );
-
- m_defaultStyle[GeoDataFeature::AmenityArchaeologicalSite] = StyleBuilder::Private::createOsmPOIAreaStyle( osmFont, "amenity/archaeological_site.16", amenityColor, Qt::transparent );
- m_defaultStyle[GeoDataFeature::AmenityEmbassy] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "transportation/embassy.16", transportationColor );
- m_defaultStyle[GeoDataFeature::AmenityEmergencyPhone] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/emergency_phone.16", amenityColor );
- m_defaultStyle[GeoDataFeature::AmenityWaterPark] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/water_park.16", amenityColor );
- m_defaultStyle[GeoDataFeature::AmenityCommunityCentre] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/community_centre-14", amenityColor );
- m_defaultStyle[GeoDataFeature::AmenityFountain] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/fountain-14", QColor("#7989de"), waterColor, waterColor.darker(150) );
- m_defaultStyle[GeoDataFeature::AmenityNightClub] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/nightclub.18", amenityColor );
- m_defaultStyle[GeoDataFeature::AmenityBench] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "individual/bench.16", amenityColor );
- m_defaultStyle[GeoDataFeature::AmenityCourtHouse] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/courthouse-16", amenityColor );
- m_defaultStyle[GeoDataFeature::AmenityFireStation] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/firestation.16", amenityColor );
- m_defaultStyle[GeoDataFeature::AmenityHuntingStand] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "manmade/hunting-stand.16", amenityColor );
- m_defaultStyle[GeoDataFeature::AmenityPolice] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/police.16", amenityColor );
- m_defaultStyle[GeoDataFeature::AmenityPostBox] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/post_box-12", amenityColor );
- 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 );
- m_defaultStyle[GeoDataFeature::AmenityWasteBasket] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "individual/waste_basket.10", amenityColor );
-
- m_defaultStyle[GeoDataFeature::AmenityDrinkingWater] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/drinking_water.16", amenityColor );
-
- m_defaultStyle[GeoDataFeature::NaturalPeak] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "individual/peak", amenityColor );
+ m_defaultStyle[GeoDataFeature::AccomodationCamping] = createOsmPOIRingStyle(osmFont, "transportation/camping.16", transportationColor);
+ m_defaultStyle[GeoDataFeature::AccomodationHostel] = createOsmPOIStyle(osmFont, "transportation/hostel.16", transportationColor);
+ m_defaultStyle[GeoDataFeature::AccomodationHotel] = createOsmPOIStyle(osmFont, "transportation/hotel.16", transportationColor);
+ m_defaultStyle[GeoDataFeature::AccomodationMotel] = createOsmPOIStyle(osmFont, "transportation/motel.16", transportationColor);
+ m_defaultStyle[GeoDataFeature::AccomodationYouthHostel] = createOsmPOIStyle(osmFont, "transportation/hostel.16", transportationColor);
+ m_defaultStyle[GeoDataFeature::AccomodationGuestHouse] = createOsmPOIStyle(osmFont, "transportation/guest_house.16", transportationColor);
+ m_defaultStyle[GeoDataFeature::AmenityLibrary] = createOsmPOIStyle(osmFont, "amenity/library.20", amenityColor);
+ m_defaultStyle[GeoDataFeature::AmenityKindergarten] = createOsmPOIAreaStyle(osmFont, QString(), amenityColor, educationalAreasAndHospital, amenityColor);
+ m_defaultStyle[GeoDataFeature::EducationCollege] = createOsmPOIAreaStyle(osmFont, QString(), amenityColor, educationalAreasAndHospital, amenityColor);
+ m_defaultStyle[GeoDataFeature::EducationSchool] = createOsmPOIAreaStyle(osmFont, QString(), amenityColor, educationalAreasAndHospital, amenityColor);
+ m_defaultStyle[GeoDataFeature::EducationUniversity] = createOsmPOIAreaStyle(osmFont, QString(), amenityColor, educationalAreasAndHospital, amenityColor);
+ m_defaultStyle[GeoDataFeature::FoodBar] = createOsmPOIStyle(osmFont, "amenity/bar.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::FoodBiergarten] = createOsmPOIStyle(osmFont, "amenity/biergarten.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::FoodCafe] = createOsmPOIStyle(osmFont, "amenity/cafe.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::FoodFastFood] = createOsmPOIStyle(osmFont, "amenity/fast_food.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::FoodPub] = createOsmPOIStyle(osmFont, "amenity/pub.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::FoodRestaurant] = createOsmPOIStyle(osmFont, "amenity/restaurant.16", amenityColor);
+
+ m_defaultStyle[GeoDataFeature::HealthDentist] = createOsmPOIStyle(osmFont, "health/dentist.16", healthColor);
+ m_defaultStyle[GeoDataFeature::HealthDoctors] = createOsmPOIStyle(osmFont, "health/doctors.16", healthColor);
+ m_defaultStyle[GeoDataFeature::HealthHospital] = createOsmPOIStyle(osmFont, "health/hospital.16", healthColor, educationalAreasAndHospital, amenityColor);
+ m_defaultStyle[GeoDataFeature::HealthPharmacy] = createOsmPOIStyle(osmFont, "health/pharmacy.16", healthColor);
+ m_defaultStyle[GeoDataFeature::HealthVeterinary] = createOsmPOIStyle(osmFont, "health/veterinary-14", healthColor);
+
+ m_defaultStyle[GeoDataFeature::MoneyAtm] = createOsmPOIStyle(osmFont, "amenity/atm.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::MoneyBank] = createOsmPOIStyle(osmFont, "amenity/bank.16", amenityColor);
+
+ m_defaultStyle[GeoDataFeature::AmenityArchaeologicalSite] = createOsmPOIAreaStyle(osmFont, "amenity/archaeological_site.16", amenityColor, Qt::transparent);
+ m_defaultStyle[GeoDataFeature::AmenityEmbassy] = createOsmPOIStyle(osmFont, "transportation/embassy.16", transportationColor);
+ m_defaultStyle[GeoDataFeature::AmenityEmergencyPhone] = createOsmPOIStyle(osmFont, "amenity/emergency_phone.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::AmenityWaterPark] = createOsmPOIStyle(osmFont, "amenity/water_park.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::AmenityCommunityCentre] = createOsmPOIStyle(osmFont, "amenity/community_centre-14", amenityColor);
+ m_defaultStyle[GeoDataFeature::AmenityFountain] = createOsmPOIStyle(osmFont, "amenity/fountain-14", QColor("#7989de"), waterColor, waterColor.darker(150));
+ m_defaultStyle[GeoDataFeature::AmenityNightClub] = createOsmPOIStyle(osmFont, "amenity/nightclub.18", amenityColor);
+ m_defaultStyle[GeoDataFeature::AmenityBench] = createOsmPOIStyle(osmFont, "individual/bench.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::AmenityCourtHouse] = createOsmPOIStyle(osmFont, "amenity/courthouse-16", amenityColor);
+ m_defaultStyle[GeoDataFeature::AmenityFireStation] = createOsmPOIStyle(osmFont, "amenity/firestation.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::AmenityHuntingStand] = createOsmPOIStyle(osmFont, "manmade/hunting-stand.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::AmenityPolice] = createOsmPOIStyle(osmFont, "amenity/police.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::AmenityPostBox] = createOsmPOIStyle(osmFont, "amenity/post_box-12", amenityColor);
+ m_defaultStyle[GeoDataFeature::AmenityPostOffice] = createOsmPOIStyle(osmFont, "amenity/post_office-14", amenityColor);
+ m_defaultStyle[GeoDataFeature::AmenityPrison] = createOsmPOIStyle(osmFont, "amenity/prison.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::AmenityRecycling] = createOsmPOIStyle(osmFont, "amenity/recycling.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::AmenityShelter] = createOsmPOIStyle(osmFont, "amenity/shelter-14", amenityColor);
+ m_defaultStyle[GeoDataFeature::AmenityTelephone] = createOsmPOIStyle(osmFont, "amenity/telephone.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::AmenityToilets] = createOsmPOIStyle(osmFont, "amenity/toilets.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::AmenityTownHall] = createOsmPOIStyle(osmFont, "amenity/town_hall.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::AmenityWasteBasket] = createOsmPOIStyle(osmFont, "individual/waste_basket.10", amenityColor);
+
+ m_defaultStyle[GeoDataFeature::AmenityDrinkingWater] = createOsmPOIStyle(osmFont, "amenity/drinking_water.16", amenityColor);
+
+ m_defaultStyle[GeoDataFeature::NaturalPeak] = createOsmPOIStyle(osmFont, "individual/peak", amenityColor);
m_defaultStyle[GeoDataFeature::NaturalPeak]->iconStyle().setScale(0.33);
- m_defaultStyle[GeoDataFeature::NaturalTree] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "individual/tree-29", amenityColor ); // tree-16 provides the official icon
-
- m_defaultStyle[GeoDataFeature::ShopBeverages] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/beverages-14", shopColor );
- m_defaultStyle[GeoDataFeature::ShopHifi] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/hifi-14", shopColor );
- m_defaultStyle[GeoDataFeature::ShopSupermarket] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/shop_supermarket", shopColor );
- m_defaultStyle[GeoDataFeature::ShopAlcohol] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/shop_alcohol.16", shopColor );
- m_defaultStyle[GeoDataFeature::ShopBakery] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/shop_bakery.16", shopColor );
- m_defaultStyle[GeoDataFeature::ShopButcher] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/butcher-14", shopColor );
- m_defaultStyle[GeoDataFeature::ShopConfectionery] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/confectionery.14", shopColor );
- m_defaultStyle[GeoDataFeature::ShopConvenience] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/shop_convenience", shopColor );
- m_defaultStyle[GeoDataFeature::ShopGreengrocer] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/greengrocer-14", shopColor );
- m_defaultStyle[GeoDataFeature::ShopSeafood] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/seafood-14", shopColor );
- m_defaultStyle[GeoDataFeature::ShopDepartmentStore] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/department_store-16", shopColor );
- m_defaultStyle[GeoDataFeature::ShopKiosk] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/kiosk-14", shopColor );
- m_defaultStyle[GeoDataFeature::ShopBag] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/bag-14", shopColor );
- m_defaultStyle[GeoDataFeature::ShopClothes] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/shop_clothes.16", shopColor );
- m_defaultStyle[GeoDataFeature::ShopFashion] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/shop_clothes.16", shopColor );
- m_defaultStyle[GeoDataFeature::ShopJewelry] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/shop_jewelry.16", shopColor );
- m_defaultStyle[GeoDataFeature::ShopShoes] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/shop_shoes.16", shopColor );
- m_defaultStyle[GeoDataFeature::ShopVarietyStore] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/variety_store-14", shopColor );
- m_defaultStyle[GeoDataFeature::ShopBeauty] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/beauty-14", shopColor );
- m_defaultStyle[GeoDataFeature::ShopChemist] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/chemist-14", shopColor );
- m_defaultStyle[GeoDataFeature::ShopCosmetics] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/perfumery-14", shopColor );
- m_defaultStyle[GeoDataFeature::ShopHairdresser] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/shop_hairdresser.16", shopColor );
- m_defaultStyle[GeoDataFeature::ShopOptician] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/shop_optician.16", shopColor );
- m_defaultStyle[GeoDataFeature::ShopPerfumery] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/perfumery-14", shopColor );
- m_defaultStyle[GeoDataFeature::ShopDoitYourself] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/shop_diy.16", shopColor );
- m_defaultStyle[GeoDataFeature::ShopFlorist] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/florist.16", shopColor );
- m_defaultStyle[GeoDataFeature::ShopHardware] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/shop_diy.16", shopColor );
- m_defaultStyle[GeoDataFeature::ShopFurniture] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/shop_furniture.16", shopColor );
- m_defaultStyle[GeoDataFeature::ShopElectronics] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/shop_electronics.16", shopColor );
- m_defaultStyle[GeoDataFeature::ShopMobilePhone] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/shop_mobile_phone.16", shopColor );
- m_defaultStyle[GeoDataFeature::ShopBicycle] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/shop_bicycle.16", shopColor );
- m_defaultStyle[GeoDataFeature::ShopCar] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/shop_car", shopColor );
- m_defaultStyle[GeoDataFeature::ShopCarRepair] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/shopping_car_repair.16", shopColor );
- m_defaultStyle[GeoDataFeature::ShopCarParts] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/car_parts-14", shopColor );
- m_defaultStyle[GeoDataFeature::ShopMotorcycle] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/motorcycle-14", shopColor );
- m_defaultStyle[GeoDataFeature::ShopOutdoor] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/outdoor-14", shopColor );
- m_defaultStyle[GeoDataFeature::ShopMusicalInstrument] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/musical_instrument-14", shopColor );
- m_defaultStyle[GeoDataFeature::ShopPhoto] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/photo-14", shopColor );
- m_defaultStyle[GeoDataFeature::ShopBook] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/shop_books.16", shopColor );
- m_defaultStyle[GeoDataFeature::ShopGift] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/shop_gift.16", shopColor );
- m_defaultStyle[GeoDataFeature::ShopStationery] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/stationery-14", shopColor );
- m_defaultStyle[GeoDataFeature::ShopLaundry] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/laundry-14", shopColor );
- m_defaultStyle[GeoDataFeature::ShopPet] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/shop_pet.16", shopColor );
- m_defaultStyle[GeoDataFeature::ShopToys] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/toys-14", shopColor );
- m_defaultStyle[GeoDataFeature::ShopTravelAgency] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/travel_agency-14", shopColor );
- m_defaultStyle[GeoDataFeature::Shop] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "shop/shop-14", shopColor );
-
- m_defaultStyle[GeoDataFeature::ManmadeBridge] = StyleBuilder::Private::createWayStyle(QColor("#b8b8b8"), Qt::transparent, true, true);
- m_defaultStyle[GeoDataFeature::ManmadeLighthouse] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "transportation/lighthouse.16", transportationColor, "#f2efe9", QColor( "#f2efe9" ).darker() );
- m_defaultStyle[GeoDataFeature::ManmadePier] = StyleBuilder::Private::createStyle(0.0, 3.0, "#f2efe9", "#f2efe9", true, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont);
- m_defaultStyle[GeoDataFeature::ManmadeWaterTower] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/water_tower.16", amenityColor );
- m_defaultStyle[GeoDataFeature::ManmadeWindMill] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/windmill.16", amenityColor );
-
- m_defaultStyle[GeoDataFeature::TouristAttraction] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/tourist_memorial.16", amenityColor );
- m_defaultStyle[GeoDataFeature::TouristCastle] = StyleBuilder::Private::createOsmPOIRingStyle( osmFont, "amenity/cinema.16", amenityColor );
- m_defaultStyle[GeoDataFeature::TouristCinema] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/cinema.16", amenityColor );
- m_defaultStyle[GeoDataFeature::TouristInformation] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/information.16", amenityColor );
- m_defaultStyle[GeoDataFeature::TouristMonument] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/monument.16", amenityColor );
- m_defaultStyle[GeoDataFeature::TouristMuseum] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/museum.16", amenityColor );
- m_defaultStyle[GeoDataFeature::TouristRuin] = StyleBuilder::Private::createOsmPOIRingStyle( osmFont, QString(), amenityColor );
- m_defaultStyle[GeoDataFeature::TouristTheatre] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/theatre.16", amenityColor );
- m_defaultStyle[GeoDataFeature::TouristThemePark] = StyleBuilder::Private::createOsmPOIStyle( osmFont, QString(), amenityColor );
- m_defaultStyle[GeoDataFeature::TouristViewPoint] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "amenity/viewpoint.16", amenityColor );
- m_defaultStyle[GeoDataFeature::TouristZoo] = StyleBuilder::Private::createOsmPOIRingStyle( osmFont, QString(), amenityColor, Qt::transparent );
- m_defaultStyle[GeoDataFeature::TouristAlpineHut] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "transportation/alpinehut.16", transportationColor );
- m_defaultStyle[GeoDataFeature::TransportAerodrome] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "airtransport/aerodrome", airTransportColor );
- m_defaultStyle[GeoDataFeature::TransportHelipad] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "airtransport/helipad", airTransportColor );
- m_defaultStyle[GeoDataFeature::TransportAirportTerminal] = StyleBuilder::Private::createOsmPOIAreaStyle( osmFont, QString(), airTransportColor );
- m_defaultStyle[GeoDataFeature::TransportAirportGate] = StyleBuilder::Private::createOsmPOIAreaStyle( osmFont, QString(), airTransportColor );
- m_defaultStyle[GeoDataFeature::TransportBusStation] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "transportation/bus_station.16", transportationColor );
- m_defaultStyle[GeoDataFeature::TransportBusStop] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "transportation/bus_stop.12", transportationColor );
- m_defaultStyle[GeoDataFeature::TransportCarShare] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "transportation/car_share.16", transportationColor );
- m_defaultStyle[GeoDataFeature::TransportFuel] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "transportation/fuel.16", transportationColor );
- m_defaultStyle[GeoDataFeature::TransportParking] = StyleBuilder::Private::createOsmPOIAreaStyle( osmFont, "transportation/parking", transportationColor, "#F6EEB6", QColor( "#F6EEB6" ).darker() );
- m_defaultStyle[GeoDataFeature::TransportParkingSpace] = StyleBuilder::Private::createWayStyle( "#F6EEB6", QColor( "#F6EEB6" ).darker(), true, true );
- m_defaultStyle[GeoDataFeature::TransportPlatform] = StyleBuilder::Private::createWayStyle( "#bbbbbb", Qt::transparent, true, false );
- m_defaultStyle[GeoDataFeature::TransportTrainStation] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "individual/railway_station", transportationColor );
- m_defaultStyle[GeoDataFeature::TransportTramStop] = StyleBuilder::Private::createOsmPOIStyle( osmFont, QString(), transportationColor );
- m_defaultStyle[GeoDataFeature::TransportRentalBicycle] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "transportation/rental_bicycle.16", transportationColor );
- m_defaultStyle[GeoDataFeature::TransportRentalCar] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "transportation/rental_car.16", transportationColor );
- m_defaultStyle[GeoDataFeature::TransportTaxiRank] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "transportation/taxi.16", transportationColor );
- m_defaultStyle[GeoDataFeature::TransportBicycleParking] = StyleBuilder::Private::createOsmPOIAreaStyle( osmFont, "transportation/bicycle_parking.16", transportationColor );
- m_defaultStyle[GeoDataFeature::TransportMotorcycleParking] = StyleBuilder::Private::createOsmPOIAreaStyle( osmFont, "transportation/motorcycle_parking.16", transportationColor );
- m_defaultStyle[GeoDataFeature::TransportSubwayEntrance] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "transportation/subway_entrance", transportationColor );
- m_defaultStyle[GeoDataFeature::ReligionPlaceOfWorship] = StyleBuilder::Private::createOsmPOIStyle( osmFont, QString() /* "black/place_of_worship.16" */ );
- m_defaultStyle[GeoDataFeature::ReligionBahai] = StyleBuilder::Private::createOsmPOIStyle( osmFont, QString() );
- m_defaultStyle[GeoDataFeature::ReligionBuddhist] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "black/buddhist.16" );
- m_defaultStyle[GeoDataFeature::ReligionChristian] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "black/christian.16" );
- m_defaultStyle[GeoDataFeature::ReligionMuslim] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "black/muslim.16" );
- m_defaultStyle[GeoDataFeature::ReligionHindu] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "black/hinduist.16" );
- m_defaultStyle[GeoDataFeature::ReligionJain] = StyleBuilder::Private::createOsmPOIStyle( osmFont, QString() );
- m_defaultStyle[GeoDataFeature::ReligionJewish] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "black/jewish.16" );
- m_defaultStyle[GeoDataFeature::ReligionShinto] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "black/shintoist.16" );
- m_defaultStyle[GeoDataFeature::ReligionSikh] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "black/sikhist.16" );
-
- m_defaultStyle[GeoDataFeature::HighwayTrafficSignals] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "individual/traffic_light" );
-
- m_defaultStyle[GeoDataFeature::PowerTower] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "individual/power_tower", QColor( "#888888" ) );
+ m_defaultStyle[GeoDataFeature::NaturalTree] = createOsmPOIStyle(osmFont, "individual/tree-29", amenityColor); // tree-16 provides the official icon
+
+ m_defaultStyle[GeoDataFeature::ShopBeverages] = createOsmPOIStyle(osmFont, "shop/beverages-14", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopHifi] = createOsmPOIStyle(osmFont, "shop/hifi-14", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopSupermarket] = createOsmPOIStyle(osmFont, "shop/shop_supermarket", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopAlcohol] = createOsmPOIStyle(osmFont, "shop/shop_alcohol.16", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopBakery] = createOsmPOIStyle(osmFont, "shop/shop_bakery.16", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopButcher] = createOsmPOIStyle(osmFont, "shop/butcher-14", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopConfectionery] = createOsmPOIStyle(osmFont, "shop/confectionery.14", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopConvenience] = createOsmPOIStyle(osmFont, "shop/shop_convenience", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopGreengrocer] = createOsmPOIStyle(osmFont, "shop/greengrocer-14", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopSeafood] = createOsmPOIStyle(osmFont, "shop/seafood-14", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopDepartmentStore] = createOsmPOIStyle(osmFont, "shop/department_store-16", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopKiosk] = createOsmPOIStyle(osmFont, "shop/kiosk-14", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopBag] = createOsmPOIStyle(osmFont, "shop/bag-14", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopClothes] = createOsmPOIStyle(osmFont, "shop/shop_clothes.16", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopFashion] = createOsmPOIStyle(osmFont, "shop/shop_clothes.16", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopJewelry] = createOsmPOIStyle(osmFont, "shop/shop_jewelry.16", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopShoes] = createOsmPOIStyle(osmFont, "shop/shop_shoes.16", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopVarietyStore] = createOsmPOIStyle(osmFont, "shop/variety_store-14", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopBeauty] = createOsmPOIStyle(osmFont, "shop/beauty-14", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopChemist] = createOsmPOIStyle(osmFont, "shop/chemist-14", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopCosmetics] = createOsmPOIStyle(osmFont, "shop/perfumery-14", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopHairdresser] = createOsmPOIStyle(osmFont, "shop/shop_hairdresser.16", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopOptician] = createOsmPOIStyle(osmFont, "shop/shop_optician.16", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopPerfumery] = createOsmPOIStyle(osmFont, "shop/perfumery-14", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopDoitYourself] = createOsmPOIStyle(osmFont, "shop/shop_diy.16", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopFlorist] = createOsmPOIStyle(osmFont, "shop/florist.16", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopHardware] = createOsmPOIStyle(osmFont, "shop/shop_diy.16", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopFurniture] = createOsmPOIStyle(osmFont, "shop/shop_furniture.16", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopElectronics] = createOsmPOIStyle(osmFont, "shop/shop_electronics.16", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopMobilePhone] = createOsmPOIStyle(osmFont, "shop/shop_mobile_phone.16", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopBicycle] = createOsmPOIStyle(osmFont, "shop/shop_bicycle.16", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopCar] = createOsmPOIStyle(osmFont, "shop/shop_car", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopCarRepair] = createOsmPOIStyle(osmFont, "shop/shopping_car_repair.16", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopCarParts] = createOsmPOIStyle(osmFont, "shop/car_parts-14", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopMotorcycle] = createOsmPOIStyle(osmFont, "shop/motorcycle-14", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopOutdoor] = createOsmPOIStyle(osmFont, "shop/outdoor-14", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopMusicalInstrument] = createOsmPOIStyle(osmFont, "shop/musical_instrument-14", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopPhoto] = createOsmPOIStyle(osmFont, "shop/photo-14", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopBook] = createOsmPOIStyle(osmFont, "shop/shop_books.16", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopGift] = createOsmPOIStyle(osmFont, "shop/shop_gift.16", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopStationery] = createOsmPOIStyle(osmFont, "shop/stationery-14", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopLaundry] = createOsmPOIStyle(osmFont, "shop/laundry-14", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopPet] = createOsmPOIStyle(osmFont, "shop/shop_pet.16", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopToys] = createOsmPOIStyle(osmFont, "shop/toys-14", shopColor);
+ m_defaultStyle[GeoDataFeature::ShopTravelAgency] = createOsmPOIStyle(osmFont, "shop/travel_agency-14", shopColor);
+ m_defaultStyle[GeoDataFeature::Shop] = createOsmPOIStyle(osmFont, "shop/shop-14", shopColor);
+
+ m_defaultStyle[GeoDataFeature::ManmadeBridge] = createWayStyle(QColor("#b8b8b8"), Qt::transparent, true, true);
+ m_defaultStyle[GeoDataFeature::ManmadeLighthouse] = createOsmPOIStyle(osmFont, "transportation/lighthouse.16", transportationColor, "#f2efe9", QColor( "#f2efe9" ).darker());
+ m_defaultStyle[GeoDataFeature::ManmadePier] = createStyle(0.0, 3.0, "#f2efe9", "#f2efe9", true, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont);
+ m_defaultStyle[GeoDataFeature::ManmadeWaterTower] = createOsmPOIStyle(osmFont, "amenity/water_tower.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::ManmadeWindMill] = createOsmPOIStyle(osmFont, "amenity/windmill.16", amenityColor);
+
+ m_defaultStyle[GeoDataFeature::TouristAttraction] = createOsmPOIStyle(osmFont, "amenity/tourist_memorial.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::TouristCastle] = createOsmPOIRingStyle(osmFont, "amenity/cinema.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::TouristCinema] = createOsmPOIStyle(osmFont, "amenity/cinema.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::TouristInformation] = createOsmPOIStyle(osmFont, "amenity/information.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::TouristMonument] = createOsmPOIStyle(osmFont, "amenity/monument.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::TouristMuseum] = createOsmPOIStyle(osmFont, "amenity/museum.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::TouristRuin] = createOsmPOIRingStyle(osmFont, QString(), amenityColor);
+ m_defaultStyle[GeoDataFeature::TouristTheatre] = createOsmPOIStyle(osmFont, "amenity/theatre.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::TouristThemePark] = createOsmPOIStyle(osmFont, QString(), amenityColor);
+ m_defaultStyle[GeoDataFeature::TouristViewPoint] = createOsmPOIStyle(osmFont, "amenity/viewpoint.16", amenityColor);
+ m_defaultStyle[GeoDataFeature::TouristZoo] = createOsmPOIRingStyle(osmFont, QString(), amenityColor, Qt::transparent);
+ m_defaultStyle[GeoDataFeature::TouristAlpineHut] = createOsmPOIStyle(osmFont, "transportation/alpinehut.16", transportationColor);
+ m_defaultStyle[GeoDataFeature::TransportAerodrome] = createOsmPOIStyle(osmFont, "airtransport/aerodrome", airTransportColor);
+ m_defaultStyle[GeoDataFeature::TransportHelipad] = createOsmPOIStyle(osmFont, "airtransport/helipad", airTransportColor);
+ m_defaultStyle[GeoDataFeature::TransportAirportTerminal] = createOsmPOIAreaStyle(osmFont, QString(), airTransportColor);
+ m_defaultStyle[GeoDataFeature::TransportAirportGate] = createOsmPOIAreaStyle(osmFont, QString(), airTransportColor);
+ m_defaultStyle[GeoDataFeature::TransportBusStation] = createOsmPOIStyle(osmFont, "transportation/bus_station.16", transportationColor);
+ m_defaultStyle[GeoDataFeature::TransportBusStop] = createOsmPOIStyle(osmFont, "transportation/bus_stop.12", transportationColor);
+ m_defaultStyle[GeoDataFeature::TransportCarShare] = createOsmPOIStyle(osmFont, "transportation/car_share.16", transportationColor);
+ m_defaultStyle[GeoDataFeature::TransportFuel] = createOsmPOIStyle(osmFont, "transportation/fuel.16", transportationColor);
+ m_defaultStyle[GeoDataFeature::TransportParking] = createOsmPOIAreaStyle(osmFont, "transportation/parking", transportationColor, "#F6EEB6", QColor( "#F6EEB6" ).darker());
+ m_defaultStyle[GeoDataFeature::TransportParkingSpace] = createWayStyle("#F6EEB6", QColor( "#F6EEB6" ).darker(), true, true);
+ m_defaultStyle[GeoDataFeature::TransportPlatform] = createWayStyle("#bbbbbb", Qt::transparent, true, false);
+ m_defaultStyle[GeoDataFeature::TransportTrainStation] = createOsmPOIStyle(osmFont, "individual/railway_station", transportationColor);
+ m_defaultStyle[GeoDataFeature::TransportTramStop] = createOsmPOIStyle(osmFont, QString(), transportationColor);
+ m_defaultStyle[GeoDataFeature::TransportRentalBicycle] = createOsmPOIStyle(osmFont, "transportation/rental_bicycle.16", transportationColor);
+ m_defaultStyle[GeoDataFeature::TransportRentalCar] = createOsmPOIStyle(osmFont, "transportation/rental_car.16", transportationColor);
+ m_defaultStyle[GeoDataFeature::TransportTaxiRank] = createOsmPOIStyle(osmFont, "transportation/taxi.16", transportationColor);
+ m_defaultStyle[GeoDataFeature::TransportBicycleParking] = createOsmPOIAreaStyle(osmFont, "transportation/bicycle_parking.16", transportationColor);
+ m_defaultStyle[GeoDataFeature::TransportMotorcycleParking] = createOsmPOIAreaStyle(osmFont, "transportation/motorcycle_parking.16", transportationColor);
+ m_defaultStyle[GeoDataFeature::TransportSubwayEntrance] = createOsmPOIStyle(osmFont, "transportation/subway_entrance", transportationColor);
+ m_defaultStyle[GeoDataFeature::ReligionPlaceOfWorship] = createOsmPOIStyle(osmFont, QString() /* "black/place_of_worship.16" */);
+ m_defaultStyle[GeoDataFeature::ReligionBahai] = createOsmPOIStyle(osmFont, QString());
+ m_defaultStyle[GeoDataFeature::ReligionBuddhist] = createOsmPOIStyle(osmFont, "black/buddhist.16");
+ m_defaultStyle[GeoDataFeature::ReligionChristian] = createOsmPOIStyle(osmFont, "black/christian.16");
+ m_defaultStyle[GeoDataFeature::ReligionMuslim] = createOsmPOIStyle(osmFont, "black/muslim.16");
+ m_defaultStyle[GeoDataFeature::ReligionHindu] = createOsmPOIStyle(osmFont, "black/hinduist.16");
+ m_defaultStyle[GeoDataFeature::ReligionJain] = createOsmPOIStyle(osmFont, QString());
+ m_defaultStyle[GeoDataFeature::ReligionJewish] = createOsmPOIStyle(osmFont, "black/jewish.16");
+ m_defaultStyle[GeoDataFeature::ReligionShinto] = createOsmPOIStyle(osmFont, "black/shintoist.16");
+ m_defaultStyle[GeoDataFeature::ReligionSikh] = createOsmPOIStyle(osmFont, "black/sikhist.16");
+
+ m_defaultStyle[GeoDataFeature::HighwayTrafficSignals] = createOsmPOIStyle(osmFont, "individual/traffic_light");
+
+ m_defaultStyle[GeoDataFeature::PowerTower] = createOsmPOIStyle(osmFont, "individual/power_tower", QColor( "#888888" ));
m_defaultStyle[GeoDataFeature::PowerTower]->iconStyle().setScale(0.6);
- m_defaultStyle[GeoDataFeature::BarrierCityWall] = StyleBuilder::Private::createStyle(6.0, 3.0, "#787878", Qt::transparent, true, false, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont, Qt::transparent);
- m_defaultStyle[GeoDataFeature::BarrierGate] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "individual/gate" );
- m_defaultStyle[GeoDataFeature::BarrierLiftGate] = StyleBuilder::Private::createOsmPOIStyle( osmFont, "individual/liftgate" );
- m_defaultStyle[GeoDataFeature::BarrierWall] = StyleBuilder::Private::createStyle(2.0, 0.0, "#787878", Qt::transparent, true, false, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont, Qt::transparent);
-
- m_defaultStyle[GeoDataFeature::HighwaySteps] = StyleBuilder::Private::createStyle(0.0, 2.0, "#fa8072", QColor(Qt::white), true, true, Qt::SolidPattern, Qt::CustomDashLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
- m_defaultStyle[GeoDataFeature::HighwayUnknown] = StyleBuilder::Private::createHighwayStyle("#dddddd", "#bbbbbb", osmFont, "000000", 0, 1);
- m_defaultStyle[GeoDataFeature::HighwayPath] = StyleBuilder::Private::createHighwayStyle("#dddde8", "#999999", osmFont, "000000", 0, 1, Qt::DotLine, Qt::SquareCap, true);
- m_defaultStyle[GeoDataFeature::HighwayTrack] = StyleBuilder::Private::createHighwayStyle("#996600", QColor(Qt::white), osmFont, "000000", 1, 1, Qt::DashLine, Qt::SquareCap, true);
- m_defaultStyle[GeoDataFeature::HighwayPedestrian] = StyleBuilder::Private::createHighwayStyle("#dddde8", "#999999", osmFont, "000000", 0, 2);
- m_defaultStyle[GeoDataFeature::HighwayFootway] = StyleBuilder::Private::createHighwayStyle("#fa8072", QColor(Qt::white), osmFont, "000000", 0, 2, Qt::DotLine, Qt::SquareCap, true);
- m_defaultStyle[GeoDataFeature::HighwayCycleway] = StyleBuilder::Private::createHighwayStyle(QColor(Qt::blue), QColor(Qt::white), osmFont, "000000", 0, 2, Qt::DotLine, Qt::SquareCap, true);
- m_defaultStyle[GeoDataFeature::HighwayService] = StyleBuilder::Private::createHighwayStyle("#ffffff", "#bbbbbb", osmFont, "000000", 1, 6 );
- m_defaultStyle[GeoDataFeature::HighwayResidential] = StyleBuilder::Private::createHighwayStyle("#ffffff", "#bbbbbb", osmFont, "000000", 3, 6 );
- m_defaultStyle[GeoDataFeature::HighwayLivingStreet] = StyleBuilder::Private::createHighwayStyle("#ffffff", "#bbbbbb", osmFont, "000000", 3, 6 );
- m_defaultStyle[GeoDataFeature::HighwayRoad] = StyleBuilder::Private::createHighwayStyle("#dddddd", "#bbbbbb", osmFont, "000000", 3, 6 );
- m_defaultStyle[GeoDataFeature::HighwayUnclassified] = StyleBuilder::Private::createHighwayStyle("#ffffff", "#bbbbbb", osmFont, "000000", 3, 6 );
- m_defaultStyle[GeoDataFeature::HighwayTertiary] = StyleBuilder::Private::createHighwayStyle("#ffffff", "#8f8f8f", osmFont, "000000", 6, 6 );
- m_defaultStyle[GeoDataFeature::HighwayTertiaryLink] = StyleBuilder::Private::createHighwayStyle("#ffffff", "#8f8f8f", osmFont, "000000", 6, 6 );
- m_defaultStyle[GeoDataFeature::HighwaySecondary] = StyleBuilder::Private::createHighwayStyle("#f7fabf", "#707d05", osmFont, "000000", 6, 6 );
- m_defaultStyle[GeoDataFeature::HighwaySecondaryLink] = StyleBuilder::Private::createHighwayStyle("#f7fabf", "#707d05", osmFont, "000000", 6, 6 );
- m_defaultStyle[GeoDataFeature::HighwayPrimary] = StyleBuilder::Private::createHighwayStyle("#fcd6a4", "#a06b00", osmFont, "000000", 9, 6 );
- m_defaultStyle[GeoDataFeature::HighwayPrimaryLink] = StyleBuilder::Private::createHighwayStyle("#fcd6a4", "#a06b00", osmFont, "000000", 6, 6 );
- m_defaultStyle[GeoDataFeature::HighwayTrunk] = StyleBuilder::Private::createHighwayStyle("#f9b29c", "#c84e2f", osmFont, "000000", 9, 6 );
- m_defaultStyle[GeoDataFeature::HighwayTrunkLink] = StyleBuilder::Private::createHighwayStyle("#f9b29c", "#c84e2f", osmFont, "000000", 9, 6 );
- m_defaultStyle[GeoDataFeature::HighwayMotorway] = StyleBuilder::Private::createHighwayStyle("#e892a2", "#dc2a67", osmFont, "000000", 9, 10 );
- m_defaultStyle[GeoDataFeature::HighwayMotorwayLink] = StyleBuilder::Private::createHighwayStyle("#e892a2", "#dc2a67", osmFont, "000000", 9, 10 );
- m_defaultStyle[GeoDataFeature::TransportAirportRunway] = StyleBuilder::Private::createHighwayStyle("#bbbbcc", "#bbbbcc", osmFont, "000000", 0, 1 );
- m_defaultStyle[GeoDataFeature::TransportAirportTaxiway] = StyleBuilder::Private::createHighwayStyle("#bbbbcc", "#bbbbcc", osmFont, "000000", 0, 1 );
- m_defaultStyle[GeoDataFeature::TransportAirportApron] = StyleBuilder::Private::createWayStyle( "#e9d1ff", Qt::transparent, true, false );
-
- m_defaultStyle[GeoDataFeature::NaturalWater] = StyleBuilder::Private::createStyle( 4, 0, waterColor, waterColor, true, true,
+ m_defaultStyle[GeoDataFeature::BarrierCityWall] = createStyle(6.0, 3.0, "#787878", Qt::transparent, true, false, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont, Qt::transparent);
+ m_defaultStyle[GeoDataFeature::BarrierGate] = createOsmPOIStyle(osmFont, "individual/gate");
+ m_defaultStyle[GeoDataFeature::BarrierLiftGate] = createOsmPOIStyle(osmFont, "individual/liftgate");
+ m_defaultStyle[GeoDataFeature::BarrierWall] = createStyle(2.0, 0.0, "#787878", Qt::transparent, true, false, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont, Qt::transparent);
+
+ m_defaultStyle[GeoDataFeature::HighwaySteps] = createStyle(0.0, 2.0, "#fa8072", QColor(Qt::white), true, true, Qt::SolidPattern, Qt::CustomDashLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
+ m_defaultStyle[GeoDataFeature::HighwayUnknown] = createHighwayStyle("#dddddd", "#bbbbbb", osmFont, "000000", 0, 1);
+ m_defaultStyle[GeoDataFeature::HighwayPath] = createHighwayStyle("#dddde8", "#999999", osmFont, "000000", 0, 1, Qt::DotLine, Qt::SquareCap, true);
+ m_defaultStyle[GeoDataFeature::HighwayTrack] = createHighwayStyle("#996600", QColor(Qt::white), osmFont, "000000", 1, 1, Qt::DashLine, Qt::SquareCap, true);
+ m_defaultStyle[GeoDataFeature::HighwayPedestrian] = createHighwayStyle("#dddde8", "#999999", osmFont, "000000", 0, 2);
+ m_defaultStyle[GeoDataFeature::HighwayFootway] = createHighwayStyle("#fa8072", QColor(Qt::white), osmFont, "000000", 0, 2, Qt::DotLine, Qt::SquareCap, true);
+ m_defaultStyle[GeoDataFeature::HighwayCycleway] = createHighwayStyle(QColor(Qt::blue), QColor(Qt::white), osmFont, "000000", 0, 2, Qt::DotLine, Qt::SquareCap, true);
+ m_defaultStyle[GeoDataFeature::HighwayService] = createHighwayStyle("#ffffff", "#bbbbbb", osmFont, "000000", 1, 6);
+ m_defaultStyle[GeoDataFeature::HighwayResidential] = createHighwayStyle("#ffffff", "#bbbbbb", osmFont, "000000", 3, 6);
+ m_defaultStyle[GeoDataFeature::HighwayLivingStreet] = createHighwayStyle("#ffffff", "#bbbbbb", osmFont, "000000", 3, 6);
+ m_defaultStyle[GeoDataFeature::HighwayRoad] = createHighwayStyle("#dddddd", "#bbbbbb", osmFont, "000000", 3, 6);
+ m_defaultStyle[GeoDataFeature::HighwayUnclassified] = createHighwayStyle("#ffffff", "#bbbbbb", osmFont, "000000", 3, 6);
+ m_defaultStyle[GeoDataFeature::HighwayTertiary] = createHighwayStyle("#ffffff", "#8f8f8f", osmFont, "000000", 6, 6);
+ m_defaultStyle[GeoDataFeature::HighwayTertiaryLink] = createHighwayStyle("#ffffff", "#8f8f8f", osmFont, "000000", 6, 6);
+ m_defaultStyle[GeoDataFeature::HighwaySecondary] = createHighwayStyle("#f7fabf", "#707d05", osmFont, "000000", 6, 6);
+ m_defaultStyle[GeoDataFeature::HighwaySecondaryLink] = createHighwayStyle("#f7fabf", "#707d05", osmFont, "000000", 6, 6);
+ m_defaultStyle[GeoDataFeature::HighwayPrimary] = createHighwayStyle("#fcd6a4", "#a06b00", osmFont, "000000", 9, 6);
+ m_defaultStyle[GeoDataFeature::HighwayPrimaryLink] = createHighwayStyle("#fcd6a4", "#a06b00", osmFont, "000000", 6, 6);
+ m_defaultStyle[GeoDataFeature::HighwayTrunk] = createHighwayStyle("#f9b29c", "#c84e2f", osmFont, "000000", 9, 6);
+ m_defaultStyle[GeoDataFeature::HighwayTrunkLink] = createHighwayStyle("#f9b29c", "#c84e2f", osmFont, "000000", 9, 6);
+ m_defaultStyle[GeoDataFeature::HighwayMotorway] = createHighwayStyle("#e892a2", "#dc2a67", osmFont, "000000", 9, 10);
+ m_defaultStyle[GeoDataFeature::HighwayMotorwayLink] = createHighwayStyle("#e892a2", "#dc2a67", osmFont, "000000", 9, 10);
+ m_defaultStyle[GeoDataFeature::TransportAirportRunway] = createHighwayStyle("#bbbbcc", "#bbbbcc", osmFont, "000000", 0, 1);
+ m_defaultStyle[GeoDataFeature::TransportAirportTaxiway] = createHighwayStyle("#bbbbcc", "#bbbbcc", osmFont, "000000", 0, 1);
+ m_defaultStyle[GeoDataFeature::TransportAirportApron] = createWayStyle("#e9d1ff", Qt::transparent, true, false);
+
+ m_defaultStyle[GeoDataFeature::NaturalWater] = createStyle(4, 0, waterColor, waterColor, true, true,
Qt::SolidPattern, Qt::SolidLine, Qt::RoundCap, false, QVector< qreal >(),
osmFont, waterColor.darker(150));
- m_defaultStyle[GeoDataFeature::NaturalReef] = StyleBuilder::Private::createStyle( 5.5, 0, "#36677c", "#36677c", true, true,
+ m_defaultStyle[GeoDataFeature::NaturalReef] = createStyle(5.5, 0, "#36677c", "#36677c", true, true,
Qt::Dense7Pattern, Qt::DotLine, Qt::RoundCap, false, QVector< qreal >(),
osmFont, waterColor.darker(150));
- m_defaultStyle[GeoDataFeature::AmenityGraveyard] = StyleBuilder::Private::createWayStyle( "#AACBAF", "#AACBAF", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/grave_yard_generic.png") );
-
- m_defaultStyle[GeoDataFeature::NaturalWood] = StyleBuilder::Private::createWayStyle( "#8DC46C", "#8DC46C", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/forest.png") );
- m_defaultStyle[GeoDataFeature::NaturalBeach] = StyleBuilder::Private::createWayStyle( "#FFF1BA", "#FFF1BA", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/beach.png") );
- m_defaultStyle[GeoDataFeature::NaturalWetland] = StyleBuilder::Private::createWayStyle( "#DDECEC", "#DDECEC", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/wetland.png") );
- m_defaultStyle[GeoDataFeature::NaturalGlacier] = StyleBuilder::Private::createWayStyle( "#DDECEC", "#DDECEC", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/glacier.png") );
- m_defaultStyle[GeoDataFeature::NaturalIceShelf] = StyleBuilder::Private::createWayStyle( "#8ebebe", "#8ebebe", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/glacier.png") );
- m_defaultStyle[GeoDataFeature::NaturalScrub] = StyleBuilder::Private::createWayStyle( "#B5E3B5", "#B5E3B5", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/scrub.png") );
- m_defaultStyle[GeoDataFeature::NaturalCliff] = StyleBuilder::Private::createWayStyle( Qt::transparent, Qt::transparent, true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/cliff2.png") );
- m_defaultStyle[GeoDataFeature::NaturalHeath] = StyleBuilder::Private::createWayStyle( "#d6d99f", QColor("#d6d99f").darker(150), true, false );
-
- m_defaultStyle[GeoDataFeature::LeisureGolfCourse] = StyleBuilder::Private::createWayStyle( QColor("#b5e3b5"), QColor("#b5e3b5").darker(150), true, true );
- m_defaultStyle[GeoDataFeature::LeisureMarina] = StyleBuilder::Private::createOsmPOIStyle( osmFont, QString(), QColor("#95abd5"), QColor("#aec8d1"), QColor("#95abd5").darker(150) );
- m_defaultStyle[GeoDataFeature::LeisurePark] = StyleBuilder::Private::createWayStyle( QColor("#c8facc"), QColor("#c8facc").darker(150), true, true );
- m_defaultStyle[GeoDataFeature::LeisurePlayground] = StyleBuilder::Private::createOsmPOIAreaStyle( osmFont, "amenity/playground.16", amenityColor, "#CCFFF1", "#BDFFED" );
- m_defaultStyle[GeoDataFeature::LeisurePitch] = StyleBuilder::Private::createWayStyle( "#8ad3af", QColor("#8ad3af").darker(150), true, true );
- m_defaultStyle[GeoDataFeature::LeisureSportsCentre] = StyleBuilder::Private::createWayStyle( "#33cc99", QColor("#33cc99").darker(150), true, true );
- m_defaultStyle[GeoDataFeature::LeisureStadium] = StyleBuilder::Private::createWayStyle( "#33cc99", QColor("#33cc99").darker(150), true, true );
- m_defaultStyle[GeoDataFeature::LeisureTrack] = StyleBuilder::Private::createWayStyle( "#74dcba", QColor("#74dcba").darker(150), true, true );
- m_defaultStyle[GeoDataFeature::LeisureSwimmingPool] = StyleBuilder::Private::createWayStyle( waterColor, waterColor.darker(150), true, true );
-
- m_defaultStyle[GeoDataFeature::LanduseAllotments] = StyleBuilder::Private::createWayStyle( "#E4C6AA", "#E4C6AA", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/allotments.png") );
- m_defaultStyle[GeoDataFeature::LanduseBasin] = StyleBuilder::Private::createWayStyle( QColor(0xB5, 0xD0, 0xD0, 0x80 ), QColor( 0xB5, 0xD0, 0xD0 ) );
- m_defaultStyle[GeoDataFeature::LanduseCemetery] = StyleBuilder::Private::createWayStyle( "#AACBAF", "#AACBAF", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/grave_yard_generic.png") );
- m_defaultStyle[GeoDataFeature::LanduseCommercial] = StyleBuilder::Private::createWayStyle( "#F2DAD9", "#D1B2B0", true, true );
- m_defaultStyle[GeoDataFeature::LanduseConstruction] = StyleBuilder::Private::createWayStyle( "#b6b592", "#b6b592", true, true );
- m_defaultStyle[GeoDataFeature::LanduseFarmland] = StyleBuilder::Private::createWayStyle( "#EDDDC9", "#C8B69E", true, true );
- m_defaultStyle[GeoDataFeature::LanduseFarmyard] = StyleBuilder::Private::createWayStyle( "#EFD6B5", "#D1B48C", true, true );
- m_defaultStyle[GeoDataFeature::LanduseGarages] = StyleBuilder::Private::createWayStyle( "#E0DDCD", "#E0DDCD", true, true );
- m_defaultStyle[GeoDataFeature::LanduseGrass] = StyleBuilder::Private::createWayStyle( "#A8C8A5", "#A8C8A5", true, true );
- m_defaultStyle[GeoDataFeature::LanduseIndustrial] = StyleBuilder::Private::createWayStyle( "#DED0D5", "#DED0D5", true, true );
- m_defaultStyle[GeoDataFeature::LanduseLandfill] = StyleBuilder::Private::createWayStyle( "#b6b592", "#b6b592", true, true );
- m_defaultStyle[GeoDataFeature::LanduseMeadow] = StyleBuilder::Private::createWayStyle( "#cdebb0", "#cdebb0", true, true );
- m_defaultStyle[GeoDataFeature::LanduseMilitary] = StyleBuilder::Private::createWayStyle( "#F3D8D2", "#F3D8D2", true, true, Qt::BDiagPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/military_red_hatch.png") );
- m_defaultStyle[GeoDataFeature::LanduseQuarry] = StyleBuilder::Private::createWayStyle( "#C4C2C2", "#C4C2C2", true, true, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/quarry.png") );
- m_defaultStyle[GeoDataFeature::LanduseRailway] = StyleBuilder::Private::createWayStyle( "#DED0D5", "#DED0D5", true, true );
- m_defaultStyle[GeoDataFeature::LanduseReservoir] = StyleBuilder::Private::createWayStyle( waterColor, waterColor, true, true );
- m_defaultStyle[GeoDataFeature::LanduseResidential] = StyleBuilder::Private::createWayStyle( "#DCDCDC", "#DCDCDC", true, true );
- m_defaultStyle[GeoDataFeature::LanduseRetail] = StyleBuilder::Private::createWayStyle( "#FFD6D1", "#D99C95", true, true );
- m_defaultStyle[GeoDataFeature::LanduseOrchard] = StyleBuilder::Private::createWayStyle( "#AEDFA3", "#AEDFA3", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/orchard.png") );
- m_defaultStyle[GeoDataFeature::LanduseVineyard] = StyleBuilder::Private::createWayStyle( "#AEDFA3", "#AEDFA3", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/vineyard.png") );
-
- m_defaultStyle[GeoDataFeature::MilitaryDangerArea] = StyleBuilder::Private::createWayStyle( "#FFC0CB", "#FFC0CB", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/danger.png") );
-
- m_defaultStyle[GeoDataFeature::RailwayRail] = StyleBuilder::Private::createStyle(2.0, 1.435, "#706E70", "#EEEEEE", true, true, Qt::SolidPattern, Qt::CustomDashLine, Qt::FlatCap, true, QVector< qreal >() << 2 << 3, osmFont);
- m_defaultStyle[GeoDataFeature::RailwayNarrowGauge] = StyleBuilder::Private::createStyle(2.0, 1.0, "#706E70", "#EEEEEE", true, true, Qt::SolidPattern, Qt::CustomDashLine, Qt::FlatCap, true, QVector< qreal >() << 2 << 3, osmFont);
+ m_defaultStyle[GeoDataFeature::AmenityGraveyard] = createWayStyle("#AACBAF", "#AACBAF", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/grave_yard_generic.png"));
+
+ m_defaultStyle[GeoDataFeature::NaturalWood] = createWayStyle("#8DC46C", "#8DC46C", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/forest.png"));
+ m_defaultStyle[GeoDataFeature::NaturalBeach] = createWayStyle("#FFF1BA", "#FFF1BA", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/beach.png"));
+ m_defaultStyle[GeoDataFeature::NaturalWetland] = createWayStyle("#DDECEC", "#DDECEC", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/wetland.png"));
+ m_defaultStyle[GeoDataFeature::NaturalGlacier] = createWayStyle("#DDECEC", "#DDECEC", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/glacier.png"));
+ m_defaultStyle[GeoDataFeature::NaturalIceShelf] = createWayStyle("#8ebebe", "#8ebebe", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/glacier.png"));
+ m_defaultStyle[GeoDataFeature::NaturalScrub] = createWayStyle("#B5E3B5", "#B5E3B5", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/scrub.png"));
+ m_defaultStyle[GeoDataFeature::NaturalCliff] = createWayStyle(Qt::transparent, Qt::transparent, true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/cliff2.png"));
+ m_defaultStyle[GeoDataFeature::NaturalHeath] = createWayStyle("#d6d99f", QColor("#d6d99f").darker(150), true, false);
+
+ m_defaultStyle[GeoDataFeature::LeisureGolfCourse] = createWayStyle(QColor("#b5e3b5"), QColor("#b5e3b5").darker(150), true, true);
+ m_defaultStyle[GeoDataFeature::LeisureMarina] = createOsmPOIStyle(osmFont, QString(), QColor("#95abd5"), QColor("#aec8d1"), QColor("#95abd5").darker(150));
+ m_defaultStyle[GeoDataFeature::LeisurePark] = createWayStyle(QColor("#c8facc"), QColor("#c8facc").darker(150), true, true);
+ m_defaultStyle[GeoDataFeature::LeisurePlayground] = createOsmPOIAreaStyle(osmFont, "amenity/playground.16", amenityColor, "#CCFFF1", "#BDFFED");
+ m_defaultStyle[GeoDataFeature::LeisurePitch] = createWayStyle("#8ad3af", QColor("#8ad3af").darker(150), true, true);
+ m_defaultStyle[GeoDataFeature::LeisureSportsCentre] = createWayStyle("#33cc99", QColor("#33cc99").darker(150), true, true);
+ m_defaultStyle[GeoDataFeature::LeisureStadium] = createWayStyle("#33cc99", QColor("#33cc99").darker(150), true, true);
+ m_defaultStyle[GeoDataFeature::LeisureTrack] = createWayStyle("#74dcba", QColor("#74dcba").darker(150), true, true);
+ m_defaultStyle[GeoDataFeature::LeisureSwimmingPool] = createWayStyle(waterColor, waterColor.darker(150), true, true);
+
+ m_defaultStyle[GeoDataFeature::LanduseAllotments] = createWayStyle("#E4C6AA", "#E4C6AA", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/allotments.png"));
+ m_defaultStyle[GeoDataFeature::LanduseBasin] = createWayStyle(QColor(0xB5, 0xD0, 0xD0, 0x80 ), QColor( 0xB5, 0xD0, 0xD0 ));
+ m_defaultStyle[GeoDataFeature::LanduseCemetery] = createWayStyle("#AACBAF", "#AACBAF", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/grave_yard_generic.png"));
+ m_defaultStyle[GeoDataFeature::LanduseCommercial] = createWayStyle("#F2DAD9", "#D1B2B0", true, true);
+ m_defaultStyle[GeoDataFeature::LanduseConstruction] = createWayStyle("#b6b592", "#b6b592", true, true);
+ m_defaultStyle[GeoDataFeature::LanduseFarmland] = createWayStyle("#EDDDC9", "#C8B69E", true, true);
+ m_defaultStyle[GeoDataFeature::LanduseFarmyard] = createWayStyle("#EFD6B5", "#D1B48C", true, true);
+ m_defaultStyle[GeoDataFeature::LanduseGarages] = createWayStyle("#E0DDCD", "#E0DDCD", true, true);
+ m_defaultStyle[GeoDataFeature::LanduseGrass] = createWayStyle("#A8C8A5", "#A8C8A5", true, true);
+ m_defaultStyle[GeoDataFeature::LanduseIndustrial] = createWayStyle("#DED0D5", "#DED0D5", true, true);
+ m_defaultStyle[GeoDataFeature::LanduseLandfill] = createWayStyle("#b6b592", "#b6b592", true, true);
+ m_defaultStyle[GeoDataFeature::LanduseMeadow] = createWayStyle("#cdebb0", "#cdebb0", true, true);
+ m_defaultStyle[GeoDataFeature::LanduseMilitary] = createWayStyle("#F3D8D2", "#F3D8D2", true, true, Qt::BDiagPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/military_red_hatch.png"));
+ m_defaultStyle[GeoDataFeature::LanduseQuarry] = createWayStyle("#C4C2C2", "#C4C2C2", true, true, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/quarry.png"));
+ m_defaultStyle[GeoDataFeature::LanduseRailway] = createWayStyle("#DED0D5", "#DED0D5", true, true);
+ m_defaultStyle[GeoDataFeature::LanduseReservoir] = createWayStyle(waterColor, waterColor, true, true);
+ m_defaultStyle[GeoDataFeature::LanduseResidential] = createWayStyle("#DCDCDC", "#DCDCDC", true, true);
+ m_defaultStyle[GeoDataFeature::LanduseRetail] = createWayStyle("#FFD6D1", "#D99C95", true, true);
+ m_defaultStyle[GeoDataFeature::LanduseOrchard] = createWayStyle("#AEDFA3", "#AEDFA3", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/orchard.png"));
+ m_defaultStyle[GeoDataFeature::LanduseVineyard] = createWayStyle("#AEDFA3", "#AEDFA3", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/vineyard.png"));
+
+ m_defaultStyle[GeoDataFeature::MilitaryDangerArea] = createWayStyle("#FFC0CB", "#FFC0CB", true, false, Qt::SolidPattern, MarbleDirs::path("bitmaps/osmcarto/patterns/danger.png"));
+
+ m_defaultStyle[GeoDataFeature::RailwayRail] = createStyle(2.0, 1.435, "#706E70", "#EEEEEE", true, true, Qt::SolidPattern, Qt::CustomDashLine, Qt::FlatCap, true, QVector< qreal >() << 2 << 3, osmFont);
+ m_defaultStyle[GeoDataFeature::RailwayNarrowGauge] = createStyle(2.0, 1.0, "#706E70", "#EEEEEE", true, true, Qt::SolidPattern, Qt::CustomDashLine, Qt::FlatCap, true, QVector< qreal >() << 2 << 3, osmFont);
// FIXME: the tram is currently being rendered as a polygon.
- m_defaultStyle[GeoDataFeature::RailwayTram] = StyleBuilder::Private::createStyle( 2.0, 1.435, "#706E70", "#EEEEEE", false, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont);
- m_defaultStyle[GeoDataFeature::RailwayLightRail] = StyleBuilder::Private::createStyle( 2.0, 1.435, "#706E70", "#EEEEEE", false, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont);
- m_defaultStyle[GeoDataFeature::RailwayAbandoned] = StyleBuilder::Private::createStyle( 2.0, 1.435, Qt::transparent, "#706E70", false, false, Qt::SolidPattern, Qt::DotLine, Qt::FlatCap, false, QVector<qreal>(), osmFont);
- m_defaultStyle[GeoDataFeature::RailwaySubway] = StyleBuilder::Private::createStyle( 2.0, 1.435, "#706E70", "#EEEEEE", false, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont);
- m_defaultStyle[GeoDataFeature::RailwayPreserved] = StyleBuilder::Private::createStyle( 2.0, 1.435, "#EEEEEE", "#706E70", true, true, Qt::SolidPattern, Qt::DotLine, Qt::FlatCap, true, QVector<qreal>(), osmFont);
- m_defaultStyle[GeoDataFeature::RailwayMiniature] = StyleBuilder::Private::createStyle( 2.0, 1.435, "#706E70", "#EEEEEE", false, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont);
- m_defaultStyle[GeoDataFeature::RailwayConstruction] = StyleBuilder::Private::createStyle( 2.0, 1.435, "#EEEEEE", "#706E70", true, true, Qt::SolidPattern, Qt::DotLine, Qt::FlatCap, true, QVector<qreal>(), osmFont);
- m_defaultStyle[GeoDataFeature::RailwayMonorail] = StyleBuilder::Private::createStyle( 2.0, 1.435, "#706E70", "#EEEEEE", false, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont);
- m_defaultStyle[GeoDataFeature::RailwayFunicular] = StyleBuilder::Private::createStyle( 2.0, 1.435, "#706E70", "#EEEEEE", false, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont);
-
- m_defaultStyle[GeoDataFeature::Building] = StyleBuilder::Private::createStyle( 1, 0, buildingColor, buildingColor.darker(),
+ m_defaultStyle[GeoDataFeature::RailwayTram] = createStyle(2.0, 1.435, "#706E70", "#EEEEEE", false, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont);
+ m_defaultStyle[GeoDataFeature::RailwayLightRail] = createStyle(2.0, 1.435, "#706E70", "#EEEEEE", false, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont);
+ m_defaultStyle[GeoDataFeature::RailwayAbandoned] = createStyle(2.0, 1.435, Qt::transparent, "#706E70", false, false, Qt::SolidPattern, Qt::DotLine, Qt::FlatCap, false, QVector<qreal>(), osmFont);
+ m_defaultStyle[GeoDataFeature::RailwaySubway] = createStyle(2.0, 1.435, "#706E70", "#EEEEEE", false, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont);
+ m_defaultStyle[GeoDataFeature::RailwayPreserved] = createStyle(2.0, 1.435, "#EEEEEE", "#706E70", true, true, Qt::SolidPattern, Qt::DotLine, Qt::FlatCap, true, QVector<qreal>(), osmFont);
+ m_defaultStyle[GeoDataFeature::RailwayMiniature] = createStyle(2.0, 1.435, "#706E70", "#EEEEEE", false, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont);
+ m_defaultStyle[GeoDataFeature::RailwayConstruction] = createStyle(2.0, 1.435, "#EEEEEE", "#706E70", true, true, Qt::SolidPattern, Qt::DotLine, Qt::FlatCap, true, QVector<qreal>(), osmFont);
+ m_defaultStyle[GeoDataFeature::RailwayMonorail] = createStyle(2.0, 1.435, "#706E70", "#EEEEEE", false, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont);
+ m_defaultStyle[GeoDataFeature::RailwayFunicular] = createStyle(2.0, 1.435, "#706E70", "#EEEEEE", false, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont);
+
+ m_defaultStyle[GeoDataFeature::Building] = createStyle(1, 0, buildingColor, buildingColor.darker(),
true, true, Qt::SolidPattern, Qt::SolidLine, Qt::RoundCap, false, QVector<qreal>(), osmFont);
- m_defaultStyle[GeoDataFeature::Landmass] = StyleBuilder::Private::createWayStyle( "#F1EEE8", "#F1EEE8", true, true );
- m_defaultStyle[GeoDataFeature::UrbanArea] = StyleBuilder::Private::createWayStyle( "#E6E3DD", "#E6E3DD", true, true );
- m_defaultStyle[GeoDataFeature::InternationalDateLine] = StyleBuilder::Private::createStyle(1.0, 0.0, "#000000", "#000000", false, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont);
- m_defaultStyle[GeoDataFeature::Bathymetry] = StyleBuilder::Private::createWayStyle( waterColor, waterColor, true, true );
-
- m_defaultStyle[GeoDataFeature::AdminLevel1] = StyleBuilder::Private::createStyle(0.0, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::CustomDashLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
- m_defaultStyle[GeoDataFeature::AdminLevel2] = StyleBuilder::Private::createStyle(2.0, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
- m_defaultStyle[GeoDataFeature::AdminLevel3] = StyleBuilder::Private::createStyle(1.8, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::DashLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
- m_defaultStyle[GeoDataFeature::AdminLevel4] = StyleBuilder::Private::createStyle(1.5, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::DotLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
- m_defaultStyle[GeoDataFeature::AdminLevel5] = StyleBuilder::Private::createStyle(1.25, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::DashDotDotLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
- m_defaultStyle[GeoDataFeature::AdminLevel6] = StyleBuilder::Private::createStyle(1, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::DashDotLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
- m_defaultStyle[GeoDataFeature::AdminLevel7] = StyleBuilder::Private::createStyle(1, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::DashLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
- m_defaultStyle[GeoDataFeature::AdminLevel8] = StyleBuilder::Private::createStyle(1, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::DashLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
- m_defaultStyle[GeoDataFeature::AdminLevel9] = StyleBuilder::Private::createStyle(1.5, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::DotLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
- m_defaultStyle[GeoDataFeature::AdminLevel10] = StyleBuilder::Private::createStyle(1.5, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::DotLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
- m_defaultStyle[GeoDataFeature::AdminLevel11] = StyleBuilder::Private::createStyle(1.5, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::DotLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
-
- m_defaultStyle[GeoDataFeature::BoundaryMaritime] = StyleBuilder::Private::createStyle(2.0, 0.0, "#88b3bf", "#88b3bf", false, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont);
+ m_defaultStyle[GeoDataFeature::Landmass] = createWayStyle("#F1EEE8", "#F1EEE8", true, true);
+ m_defaultStyle[GeoDataFeature::UrbanArea] = createWayStyle("#E6E3DD", "#E6E3DD", true, true);
+ m_defaultStyle[GeoDataFeature::InternationalDateLine] = createStyle(1.0, 0.0, "#000000", "#000000", false, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont);
+ m_defaultStyle[GeoDataFeature::Bathymetry] = createWayStyle(waterColor, waterColor, true, true);
+
+ m_defaultStyle[GeoDataFeature::AdminLevel1] = createStyle(0.0, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::CustomDashLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
+ m_defaultStyle[GeoDataFeature::AdminLevel2] = createStyle(2.0, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
+ m_defaultStyle[GeoDataFeature::AdminLevel3] = createStyle(1.8, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::DashLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
+ m_defaultStyle[GeoDataFeature::AdminLevel4] = createStyle(1.5, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::DotLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
+ m_defaultStyle[GeoDataFeature::AdminLevel5] = createStyle(1.25, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::DashDotDotLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
+ m_defaultStyle[GeoDataFeature::AdminLevel6] = createStyle(1, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::DashDotLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
+ m_defaultStyle[GeoDataFeature::AdminLevel7] = createStyle(1, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::DashLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
+ m_defaultStyle[GeoDataFeature::AdminLevel8] = createStyle(1, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::DashLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
+ m_defaultStyle[GeoDataFeature::AdminLevel9] = createStyle(1.5, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::DotLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
+ m_defaultStyle[GeoDataFeature::AdminLevel10] = createStyle(1.5, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::DotLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
+ m_defaultStyle[GeoDataFeature::AdminLevel11] = createStyle(1.5, 0.0, "#DF9CCF", "#DF9CCF", false, true, Qt::SolidPattern, Qt::DotLine, Qt::FlatCap, false, QVector< qreal >() << 0.3 << 0.3, osmFont);
+
+ m_defaultStyle[GeoDataFeature::BoundaryMaritime] = createStyle(2.0, 0.0, "#88b3bf", "#88b3bf", false, true, Qt::SolidPattern, Qt::SolidLine, Qt::FlatCap, false, QVector<qreal>(), osmFont);
m_defaultStyle[GeoDataFeature::Satellite]
= GeoDataStyle::Ptr(new GeoDataStyle( MarbleDirs::path( "bitmaps/satellite.png" ),