Differential D3625 Diff 8867 src/lib/marble/StyleBuilder.cpp

Changeset View

Standalone View

View Options

src/lib/marble/StyleBuilder.cpp

Context not available.
426 m_defaultStyle[GeoDataPlacemark::AccomodationYouthHostel] = createOsmPOIStyle(osmFont, "transportation/hostel.16", transportationColor); 426​ m_defaultStyle[GeoDataPlacemark::AccomodationYouthHostel] = createOsmPOIStyle(osmFont, "transportation/hostel.16", transportationColor);
427 m_defaultStyle[GeoDataPlacemark::AccomodationGuestHouse] = createOsmPOIStyle(osmFont, "transportation/guest_house.16", transportationColor); 427​ m_defaultStyle[GeoDataPlacemark::AccomodationGuestHouse] = createOsmPOIStyle(osmFont, "transportation/guest_house.16", transportationColor);
428 m_defaultStyle[GeoDataPlacemark::AmenityLibrary] = createOsmPOIStyle(osmFont, "amenity/library.20", amenityColor); 428​ m_defaultStyle[GeoDataPlacemark::AmenityLibrary] = createOsmPOIStyle(osmFont, "amenity/library.20", amenityColor);
429​ m_defaultStyle[GeoDataPlacemark::AmenityChargingStation] = createOsmPOIStyle(osmFont, "transportation/charging_station");
429 m_defaultStyle[GeoDataPlacemark::AmenityKindergarten] = createOsmPOIAreaStyle(osmFont, QString(), amenityColor, educationalAreasAndHospital, amenityColor); 430​ m_defaultStyle[GeoDataPlacemark::AmenityKindergarten] = createOsmPOIAreaStyle(osmFont, QString(), amenityColor, educationalAreasAndHospital, amenityColor);
430 m_defaultStyle[GeoDataPlacemark::EducationCollege] = createOsmPOIAreaStyle(osmFont, QString(), amenityColor, educationalAreasAndHospital, amenityColor); 431​ m_defaultStyle[GeoDataPlacemark::EducationCollege] = createOsmPOIAreaStyle(osmFont, QString(), amenityColor, educationalAreasAndHospital, amenityColor);
431 m_defaultStyle[GeoDataPlacemark::EducationSchool] = createOsmPOIAreaStyle(osmFont, QString(), amenityColor, educationalAreasAndHospital, amenityColor); 432​ m_defaultStyle[GeoDataPlacemark::EducationSchool] = createOsmPOIAreaStyle(osmFont, QString(), amenityColor, educationalAreasAndHospital, amenityColor);
Context not available.
834 s_visualCategories[OsmTag("amenity", "waste_basket")] = GeoDataPlacemark::AmenityWasteBasket; 835​ s_visualCategories[OsmTag("amenity", "waste_basket")] = GeoDataPlacemark::AmenityWasteBasket;
835 s_visualCategories[OsmTag("amenity", "drinking_water")] = GeoDataPlacemark::AmenityDrinkingWater; 836​ s_visualCategories[OsmTag("amenity", "drinking_water")] = GeoDataPlacemark::AmenityDrinkingWater;
836 s_visualCategories[OsmTag("amenity", "graveyard")] = GeoDataPlacemark::AmenityGraveyard; 837​ s_visualCategories[OsmTag("amenity", "graveyard")] = GeoDataPlacemark::AmenityGraveyard;
838​ s_visualCategories[OsmTag("amenity", "charging_station")] = GeoDataPlacemark::AmenityChargingStation;
837 839​
838 s_visualCategories[OsmTag("amenity", "dentist")] = GeoDataPlacemark::HealthDentist; 840​ s_visualCategories[OsmTag("amenity", "dentist")] = GeoDataPlacemark::HealthDentist;
839 s_visualCategories[OsmTag("amenity", "pharmacy")] = GeoDataPlacemark::HealthPharmacy; 841​ s_visualCategories[OsmTag("amenity", "pharmacy")] = GeoDataPlacemark::HealthPharmacy;
Context not available.
1134 s_defaultMinZoomLevels[GeoDataPlacemark::AmenityPrison]= 17; 1136​ s_defaultMinZoomLevels[GeoDataPlacemark::AmenityPrison]= 17;
1135 s_defaultMinZoomLevels[GeoDataPlacemark::AmenityRecycling]= 17; 1137​ s_defaultMinZoomLevels[GeoDataPlacemark::AmenityRecycling]= 17;
1136 s_defaultMinZoomLevels[GeoDataPlacemark::AmenityShelter]= 17; 1138​ s_defaultMinZoomLevels[GeoDataPlacemark::AmenityShelter]= 17;
1139​ s_defaultMinZoomLevels[GeoDataPlacemark::AmenityChargingStation] = 17;
1137 1140​
1138 s_defaultMinZoomLevels[GeoDataPlacemark::BarrierCityWall] = 15; 1141​ s_defaultMinZoomLevels[GeoDataPlacemark::BarrierCityWall] = 15;
1139 s_defaultMinZoomLevels[GeoDataPlacemark::BarrierGate] = 17; 1142​ s_defaultMinZoomLevels[GeoDataPlacemark::BarrierGate] = 17;
Context not available.
1916 visualCategoryNames[GeoDataPlacemark::AmenityWasteBasket] = "AmenityWasteBasket"; 1919​ visualCategoryNames[GeoDataPlacemark::AmenityWasteBasket] = "AmenityWasteBasket";
1917 visualCategoryNames[GeoDataPlacemark::AmenityDrinkingWater] = "AmenityDrinkingWater"; 1920​ visualCategoryNames[GeoDataPlacemark::AmenityDrinkingWater] = "AmenityDrinkingWater";
1918 visualCategoryNames[GeoDataPlacemark::AmenityGraveyard] = "AmenityGraveyard"; 1921​ visualCategoryNames[GeoDataPlacemark::AmenityGraveyard] = "AmenityGraveyard";
1922​ visualCategoryNames[GeoDataPlacemark::AmenityChargingStation] = "AmenityChargingStation";
1919 visualCategoryNames[GeoDataPlacemark::BarrierCityWall] = "BarrierCityWall"; 1923​ visualCategoryNames[GeoDataPlacemark::BarrierCityWall] = "BarrierCityWall";
1920 visualCategoryNames[GeoDataPlacemark::BarrierGate] = "BarrierGate"; 1924​ visualCategoryNames[GeoDataPlacemark::BarrierGate] = "BarrierGate";
1921 visualCategoryNames[GeoDataPlacemark::BarrierLiftGate] = "BarrierLiftGate"; 1925​ visualCategoryNames[GeoDataPlacemark::BarrierLiftGate] = "BarrierLiftGate";
Context not available.