Differential D3656 Diff 8989 src/lib/marble/StyleBuilder.cpp

Changeset View

Standalone View

View Options

src/lib/marble/StyleBuilder.cpp

Context not available.
484 m_defaultStyle[GeoDataPlacemark::AmenityWasteBasket] = createOsmPOIStyle(osmFont, "individual/waste_basket.10", amenityColor); 484​ m_defaultStyle[GeoDataPlacemark::AmenityWasteBasket] = createOsmPOIStyle(osmFont, "individual/waste_basket.10", amenityColor);
485 m_defaultStyle[GeoDataPlacemark::AmenityWasteBasket]->iconStyle().setScale(0.75); 485​ m_defaultStyle[GeoDataPlacemark::AmenityWasteBasket]->iconStyle().setScale(0.75);
486 m_defaultStyle[GeoDataPlacemark::AmenityChargingStation] = createOsmPOIStyle(osmFont, "transportation/charging_station"); 486​ m_defaultStyle[GeoDataPlacemark::AmenityChargingStation] = createOsmPOIStyle(osmFont, "transportation/charging_station");
487​ m_defaultStyle[GeoDataPlacemark::AmenityCarWash] = createOsmPOIStyle(osmFont, "amenity/car_wash", amenityColor);
488​ m_defaultStyle[GeoDataPlacemark::AmenitySocialFacility] = createOsmPOIStyle(osmFont, "amenity/social_facility", amenityColor);
487 489​
488 m_defaultStyle[GeoDataPlacemark::AmenityDrinkingWater] = createOsmPOIStyle(osmFont, "amenity/drinking_water.16", amenityColor); 490​ m_defaultStyle[GeoDataPlacemark::AmenityDrinkingWater] = createOsmPOIStyle(osmFont, "amenity/drinking_water.16", amenityColor);
489 491​
Context not available.
559 m_defaultStyle[GeoDataPlacemark::HistoricMemorial] = createOsmPOIStyle(osmFont, "amenity/tourist_memorial.16", amenityColor); 561​ m_defaultStyle[GeoDataPlacemark::HistoricMemorial] = createOsmPOIStyle(osmFont, "amenity/tourist_memorial.16", amenityColor);
560 562​
561 m_defaultStyle[GeoDataPlacemark::TouristAttraction] = createOsmPOIStyle(osmFont, "amenity/tourist_memorial.16", amenityColor); 563​ m_defaultStyle[GeoDataPlacemark::TouristAttraction] = createOsmPOIStyle(osmFont, "amenity/tourist_memorial.16", amenityColor);
564​ m_defaultStyle[GeoDataPlacemark::TouristArtwork] = createOsmPOIStyle(osmFont, "amenity/artwork", amenityColor);
562 m_defaultStyle[GeoDataPlacemark::TouristCastle] = createOsmPOIRingStyle(osmFont, "amenity/cinema.16", amenityColor); 565​ m_defaultStyle[GeoDataPlacemark::TouristCastle] = createOsmPOIRingStyle(osmFont, "amenity/cinema.16", amenityColor);
563 m_defaultStyle[GeoDataPlacemark::TouristCinema] = createOsmPOIStyle(osmFont, "amenity/cinema.16", amenityColor); 566​ m_defaultStyle[GeoDataPlacemark::TouristCinema] = createOsmPOIStyle(osmFont, "amenity/cinema.16", amenityColor);
564 m_defaultStyle[GeoDataPlacemark::TouristInformation] = createOsmPOIStyle(osmFont, "amenity/information.16", amenityColor); 567​ m_defaultStyle[GeoDataPlacemark::TouristInformation] = createOsmPOIStyle(osmFont, "amenity/information.16", amenityColor);
Context not available.
869 s_visualCategories[OsmTag("amenity", "drinking_water")] = GeoDataPlacemark::AmenityDrinkingWater; 872​ s_visualCategories[OsmTag("amenity", "drinking_water")] = GeoDataPlacemark::AmenityDrinkingWater;
870 s_visualCategories[OsmTag("amenity", "graveyard")] = GeoDataPlacemark::AmenityGraveyard; 873​ s_visualCategories[OsmTag("amenity", "graveyard")] = GeoDataPlacemark::AmenityGraveyard;
871 s_visualCategories[OsmTag("amenity", "charging_station")] = GeoDataPlacemark::AmenityChargingStation; 874​ s_visualCategories[OsmTag("amenity", "charging_station")] = GeoDataPlacemark::AmenityChargingStation;
875​ s_visualCategories[OsmTag("amenity", "car_wash")] = GeoDataPlacemark::AmenityCarWash;
876​ s_visualCategories[OsmTag("amenity", "social_facility")] = GeoDataPlacemark::AmenitySocialFacility;
872 877​
873 s_visualCategories[OsmTag("amenity", "dentist")] = GeoDataPlacemark::HealthDentist; 878​ s_visualCategories[OsmTag("amenity", "dentist")] = GeoDataPlacemark::HealthDentist;
874 s_visualCategories[OsmTag("amenity", "pharmacy")] = GeoDataPlacemark::HealthPharmacy; 879​ s_visualCategories[OsmTag("amenity", "pharmacy")] = GeoDataPlacemark::HealthPharmacy;
Context not available.
961 966​
962 s_visualCategories[OsmTag("historic", "memorial")] = GeoDataPlacemark::HistoricMemorial; 967​ s_visualCategories[OsmTag("historic", "memorial")] = GeoDataPlacemark::HistoricMemorial;
963 s_visualCategories[OsmTag("tourism", "attraction")] = GeoDataPlacemark::TouristAttraction; 968​ s_visualCategories[OsmTag("tourism", "attraction")] = GeoDataPlacemark::TouristAttraction;
969​ s_visualCategories[OsmTag("tourism", "artwork")] = GeoDataPlacemark::TouristArtwork;
964 s_visualCategories[OsmTag("tourism", "camp_site")] = GeoDataPlacemark::AccomodationCamping; 970​ s_visualCategories[OsmTag("tourism", "camp_site")] = GeoDataPlacemark::AccomodationCamping;
965 s_visualCategories[OsmTag("tourism", "hostel")] = GeoDataPlacemark::AccomodationHostel; 971​ s_visualCategories[OsmTag("tourism", "hostel")] = GeoDataPlacemark::AccomodationHostel;
966 s_visualCategories[OsmTag("tourism", "hotel")] = GeoDataPlacemark::AccomodationHotel; 972​ s_visualCategories[OsmTag("tourism", "hotel")] = GeoDataPlacemark::AccomodationHotel;
Context not available.
1178 s_defaultMinZoomLevels[GeoDataPlacemark::AmenityRecycling]= 17; 1184​ s_defaultMinZoomLevels[GeoDataPlacemark::AmenityRecycling]= 17;
1179 s_defaultMinZoomLevels[GeoDataPlacemark::AmenityShelter]= 17; 1185​ s_defaultMinZoomLevels[GeoDataPlacemark::AmenityShelter]= 17;
1180 s_defaultMinZoomLevels[GeoDataPlacemark::AmenityChargingStation] = 17; 1186​ s_defaultMinZoomLevels[GeoDataPlacemark::AmenityChargingStation] = 17;
1187​ s_defaultMinZoomLevels[GeoDataPlacemark::AmenityCarWash] = 17;
1188​ s_defaultMinZoomLevels[GeoDataPlacemark::AmenitySocialFacility] = 16;
1181 1189​
1182 s_defaultMinZoomLevels[GeoDataPlacemark::BarrierCityWall] = 15; 1190​ s_defaultMinZoomLevels[GeoDataPlacemark::BarrierCityWall] = 15;
1183 s_defaultMinZoomLevels[GeoDataPlacemark::BarrierGate] = 17; 1191​ s_defaultMinZoomLevels[GeoDataPlacemark::BarrierGate] = 17;
Context not available.
1343 s_defaultMinZoomLevels[GeoDataPlacemark::TouristAlpineHut] = 13; 1351​ s_defaultMinZoomLevels[GeoDataPlacemark::TouristAlpineHut] = 13;
1344 s_defaultMinZoomLevels[GeoDataPlacemark::TouristWildernessHut] = 13; 1352​ s_defaultMinZoomLevels[GeoDataPlacemark::TouristWildernessHut] = 13;
1345 s_defaultMinZoomLevels[GeoDataPlacemark::TouristAttraction] = 17; 1353​ s_defaultMinZoomLevels[GeoDataPlacemark::TouristAttraction] = 17;
1354​ s_defaultMinZoomLevels[GeoDataPlacemark::TouristArtwork] = 15;
1346 s_defaultMinZoomLevels[GeoDataPlacemark::TouristCastle] = 15; 1355​ s_defaultMinZoomLevels[GeoDataPlacemark::TouristCastle] = 15;
1347 s_defaultMinZoomLevels[GeoDataPlacemark::TouristCinema] = 16; 1356​ s_defaultMinZoomLevels[GeoDataPlacemark::TouristCinema] = 16;
1348 s_defaultMinZoomLevels[GeoDataPlacemark::TouristMuseum] = 16; 1357​ s_defaultMinZoomLevels[GeoDataPlacemark::TouristMuseum] = 16;
Context not available.
1977 popularities << GeoDataPlacemark::ManmadeWindMill; 1986​ popularities << GeoDataPlacemark::ManmadeWindMill;
1978 1987​
1979 popularities << GeoDataPlacemark::TouristAttraction; 1988​ popularities << GeoDataPlacemark::TouristAttraction;
1989​ popularities << GeoDataPlacemark::TouristArtwork;
1980 popularities << GeoDataPlacemark::TouristCastle; 1990​ popularities << GeoDataPlacemark::TouristCastle;
1981 popularities << GeoDataPlacemark::TouristCinema; 1991​ popularities << GeoDataPlacemark::TouristCinema;
1982 popularities << GeoDataPlacemark::TouristInformation; 1992​ popularities << GeoDataPlacemark::TouristInformation;
Context not available.
2242 visualCategoryNames[GeoDataPlacemark::AmenityDrinkingWater] = "AmenityDrinkingWater"; 2252​ visualCategoryNames[GeoDataPlacemark::AmenityDrinkingWater] = "AmenityDrinkingWater";
2243 visualCategoryNames[GeoDataPlacemark::AmenityGraveyard] = "AmenityGraveyard"; 2253​ visualCategoryNames[GeoDataPlacemark::AmenityGraveyard] = "AmenityGraveyard";
2244 visualCategoryNames[GeoDataPlacemark::AmenityChargingStation] = "ChargingStation"; 2254​ visualCategoryNames[GeoDataPlacemark::AmenityChargingStation] = "ChargingStation";
2255​ visualCategoryNames[GeoDataPlacemark::AmenityCarWash] = "CarWash";
2256​ visualCategoryNames[GeoDataPlacemark::AmenitySocialFacility] = "SocialFacility";
2245 visualCategoryNames[GeoDataPlacemark::BarrierCityWall] = "BarrierCityWall"; 2257​ visualCategoryNames[GeoDataPlacemark::BarrierCityWall] = "BarrierCityWall";
2246 visualCategoryNames[GeoDataPlacemark::BarrierGate] = "BarrierGate"; 2258​ visualCategoryNames[GeoDataPlacemark::BarrierGate] = "BarrierGate";
2247 visualCategoryNames[GeoDataPlacemark::BarrierLiftGate] = "BarrierLiftGate"; 2259​ visualCategoryNames[GeoDataPlacemark::BarrierLiftGate] = "BarrierLiftGate";
Context not available.
2307 visualCategoryNames[GeoDataPlacemark::ManmadeWaterTower] = "ManmadeWaterTower"; 2319​ visualCategoryNames[GeoDataPlacemark::ManmadeWaterTower] = "ManmadeWaterTower";
2308 visualCategoryNames[GeoDataPlacemark::ManmadeWindMill] = "ManmadeWindMill"; 2320​ visualCategoryNames[GeoDataPlacemark::ManmadeWindMill] = "ManmadeWindMill";
2309 visualCategoryNames[GeoDataPlacemark::TouristAttraction] = "TouristAttraction"; 2321​ visualCategoryNames[GeoDataPlacemark::TouristAttraction] = "TouristAttraction";
2322​ visualCategoryNames[GeoDataPlacemark::TouristArtwork] = "TouristArtwork";
2310 visualCategoryNames[GeoDataPlacemark::TouristCastle] = "TouristCastle"; 2323​ visualCategoryNames[GeoDataPlacemark::TouristCastle] = "TouristCastle";
2311 visualCategoryNames[GeoDataPlacemark::TouristCinema] = "TouristCinema"; 2324​ visualCategoryNames[GeoDataPlacemark::TouristCinema] = "TouristCinema";
2312 visualCategoryNames[GeoDataPlacemark::TouristInformation] = "TouristInformation"; 2325​ visualCategoryNames[GeoDataPlacemark::TouristInformation] = "TouristInformation";
Context not available.