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

Changeset View

Standalone View

View Options

src/lib/marble/StyleBuilder.cpp

Show First 20 Lines • Show All 467 Lines • ▼ Show 20 Line(s)424// QColor const buildingColor(0, 255, 0, 64);
468 m_defaultStyle[GeoDataPlacemark::AmenityPrison] = createOsmPOIStyle(osmFont, "amenity/prison.16", amenityColor); 468​ m_defaultStyle[GeoDataPlacemark::AmenityPrison] = createOsmPOIStyle(osmFont, "amenity/prison.16", amenityColor);
469 m_defaultStyle[GeoDataPlacemark::AmenityRecycling] = createOsmPOIStyle(osmFont, "amenity/recycling.16", amenityColor); 469​ m_defaultStyle[GeoDataPlacemark::AmenityRecycling] = createOsmPOIStyle(osmFont, "amenity/recycling.16", amenityColor);
470 m_defaultStyle[GeoDataPlacemark::AmenityShelter] = createOsmPOIStyle(osmFont, "transportation/shelter", transportationColor); 470​ m_defaultStyle[GeoDataPlacemark::AmenityShelter] = createOsmPOIStyle(osmFont, "transportation/shelter", transportationColor);
471 m_defaultStyle[GeoDataPlacemark::AmenityTelephone] = createOsmPOIStyle(osmFont, "amenity/telephone.16", amenityColor); 471​ m_defaultStyle[GeoDataPlacemark::AmenityTelephone] = createOsmPOIStyle(osmFont, "amenity/telephone.16", amenityColor);
472 m_defaultStyle[GeoDataPlacemark::AmenityToilets] = createOsmPOIStyle(osmFont, "amenity/toilets.16", amenityColor); 472​ m_defaultStyle[GeoDataPlacemark::AmenityToilets] = createOsmPOIStyle(osmFont, "amenity/toilets.16", amenityColor);
473 m_defaultStyle[GeoDataPlacemark::AmenityTownHall] = createOsmPOIStyle(osmFont, "amenity/town_hall.16", amenityColor); 473​ m_defaultStyle[GeoDataPlacemark::AmenityTownHall] = createOsmPOIStyle(osmFont, "amenity/town_hall.16", amenityColor);
474 m_defaultStyle[GeoDataPlacemark::AmenityWasteBasket] = createOsmPOIStyle(osmFont, "individual/waste_basket.10", amenityColor); 474​ m_defaultStyle[GeoDataPlacemark::AmenityWasteBasket] = createOsmPOIStyle(osmFont, "individual/waste_basket.10", amenityColor);
475 m_defaultStyle[GeoDataPlacemark::AmenityWasteBasket]->iconStyle().setScale(0.75); 475​ m_defaultStyle[GeoDataPlacemark::AmenityWasteBasket]->iconStyle().setScale(0.75);
476​ m_defaultStyle[GeoDataPlacemark::AmenityChargingStation] = createOsmPOIStyle(osmFont, "transportation/charging_station");
476 477​
477 m_defaultStyle[GeoDataPlacemark::AmenityDrinkingWater] = createOsmPOIStyle(osmFont, "amenity/drinking_water.16", amenityColor); 478​ m_defaultStyle[GeoDataPlacemark::AmenityDrinkingWater] = createOsmPOIStyle(osmFont, "amenity/drinking_water.16", amenityColor);
478 479​
479 m_defaultStyle[GeoDataPlacemark::NaturalPeak] = createOsmPOIStyle(osmFont, "individual/peak", amenityColor); 480​ m_defaultStyle[GeoDataPlacemark::NaturalPeak] = createOsmPOIStyle(osmFont, "individual/peak", amenityColor);
480 m_defaultStyle[GeoDataPlacemark::NaturalPeak]->iconStyle().setScale(0.33); 481​ m_defaultStyle[GeoDataPlacemark::NaturalPeak]->iconStyle().setScale(0.33);
481 m_defaultStyle[GeoDataPlacemark::NaturalTree] = createOsmPOIStyle(osmFont, "individual/tree-29", amenityColor); // tree-16 provides the official icon 482​ m_defaultStyle[GeoDataPlacemark::NaturalTree] = createOsmPOIStyle(osmFont, "individual/tree-29", amenityColor); // tree-16 provides the official icon
482 m_styleTreeAutumn = createOsmPOIStyle(osmFont, "individual/tree-29-autumn", amenityColor); 483​ m_styleTreeAutumn = createOsmPOIStyle(osmFont, "individual/tree-29-autumn", amenityColor);
483 m_styleTreeWinter = createOsmPOIStyle(osmFont, "individual/tree-29-winter", amenityColor); 484​ m_styleTreeWinter = createOsmPOIStyle(osmFont, "individual/tree-29-winter", amenityColor);
▲ Show 20 Lines • Show All 355 Lines • ▼ Show 20 Line(s)785{
839 s_visualCategories[OsmTag("amenity", "recycling")] = GeoDataPlacemark::AmenityRecycling; 840​ s_visualCategories[OsmTag("amenity", "recycling")] = GeoDataPlacemark::AmenityRecycling;
840 s_visualCategories[OsmTag("amenity", "shelter")] = GeoDataPlacemark::AmenityShelter; 841​ s_visualCategories[OsmTag("amenity", "shelter")] = GeoDataPlacemark::AmenityShelter;
841 s_visualCategories[OsmTag("amenity", "telephone")] = GeoDataPlacemark::AmenityTelephone; 842​ s_visualCategories[OsmTag("amenity", "telephone")] = GeoDataPlacemark::AmenityTelephone;
842 s_visualCategories[OsmTag("amenity", "toilets")] = GeoDataPlacemark::AmenityToilets; 843​ s_visualCategories[OsmTag("amenity", "toilets")] = GeoDataPlacemark::AmenityToilets;
843 s_visualCategories[OsmTag("amenity", "townhall")] = GeoDataPlacemark::AmenityTownHall; 844​ s_visualCategories[OsmTag("amenity", "townhall")] = GeoDataPlacemark::AmenityTownHall;
844 s_visualCategories[OsmTag("amenity", "waste_basket")] = GeoDataPlacemark::AmenityWasteBasket; 845​ s_visualCategories[OsmTag("amenity", "waste_basket")] = GeoDataPlacemark::AmenityWasteBasket;
845 s_visualCategories[OsmTag("amenity", "drinking_water")] = GeoDataPlacemark::AmenityDrinkingWater; 846​ s_visualCategories[OsmTag("amenity", "drinking_water")] = GeoDataPlacemark::AmenityDrinkingWater;
846 s_visualCategories[OsmTag("amenity", "graveyard")] = GeoDataPlacemark::AmenityGraveyard; 847​ s_visualCategories[OsmTag("amenity", "graveyard")] = GeoDataPlacemark::AmenityGraveyard;
848​ s_visualCategories[OsmTag("amenity", "charging_station")] = GeoDataPlacemark::AmenityChargingStation;
847 849​
848 s_visualCategories[OsmTag("amenity", "dentist")] = GeoDataPlacemark::HealthDentist; 850​ s_visualCategories[OsmTag("amenity", "dentist")] = GeoDataPlacemark::HealthDentist;
849 s_visualCategories[OsmTag("amenity", "pharmacy")] = GeoDataPlacemark::HealthPharmacy; 851​ s_visualCategories[OsmTag("amenity", "pharmacy")] = GeoDataPlacemark::HealthPharmacy;
850 s_visualCategories[OsmTag("amenity", "hospital")] = GeoDataPlacemark::HealthHospital; 852​ s_visualCategories[OsmTag("amenity", "hospital")] = GeoDataPlacemark::HealthHospital;
851 s_visualCategories[OsmTag("amenity", "doctors")] = GeoDataPlacemark::HealthDoctors; 853​ s_visualCategories[OsmTag("amenity", "doctors")] = GeoDataPlacemark::HealthDoctors;
852 s_visualCategories[OsmTag("amenity", "veterinary")] = GeoDataPlacemark::HealthVeterinary; 854​ s_visualCategories[OsmTag("amenity", "veterinary")] = GeoDataPlacemark::HealthVeterinary;
853 855​
854 s_visualCategories[OsmTag("amenity", "cinema")] = GeoDataPlacemark::TouristCinema; 856​ s_visualCategories[OsmTag("amenity", "cinema")] = GeoDataPlacemark::TouristCinema;
▲ Show 20 Lines • Show All 289 Lines • ▼ Show 20 Line(s)1106{
1144 s_defaultMinZoomLevels[GeoDataPlacemark::AmenityFireStation]= 16; 1146​ s_defaultMinZoomLevels[GeoDataPlacemark::AmenityFireStation]= 16;
1145 s_defaultMinZoomLevels[GeoDataPlacemark::AmenityHuntingStand]= 17; 1147​ s_defaultMinZoomLevels[GeoDataPlacemark::AmenityHuntingStand]= 17;
1146 s_defaultMinZoomLevels[GeoDataPlacemark::AmenityPolice]= 16; 1148​ s_defaultMinZoomLevels[GeoDataPlacemark::AmenityPolice]= 16;
1147 s_defaultMinZoomLevels[GeoDataPlacemark::AmenityPostBox]= 17; 1149​ s_defaultMinZoomLevels[GeoDataPlacemark::AmenityPostBox]= 17;
1148 s_defaultMinZoomLevels[GeoDataPlacemark::AmenityPostOffice]= 17; 1150​ s_defaultMinZoomLevels[GeoDataPlacemark::AmenityPostOffice]= 17;
1149 s_defaultMinZoomLevels[GeoDataPlacemark::AmenityPrison]= 17; 1151​ s_defaultMinZoomLevels[GeoDataPlacemark::AmenityPrison]= 17;
1150 s_defaultMinZoomLevels[GeoDataPlacemark::AmenityRecycling]= 17; 1152​ s_defaultMinZoomLevels[GeoDataPlacemark::AmenityRecycling]= 17;
1151 s_defaultMinZoomLevels[GeoDataPlacemark::AmenityShelter]= 17; 1153​ s_defaultMinZoomLevels[GeoDataPlacemark::AmenityShelter]= 17;
1154​ s_defaultMinZoomLevels[GeoDataPlacemark::AmenityChargingStation] = 17;
1152 1155​
1153 s_defaultMinZoomLevels[GeoDataPlacemark::BarrierCityWall] = 15; 1156​ s_defaultMinZoomLevels[GeoDataPlacemark::BarrierCityWall] = 15;
1154 s_defaultMinZoomLevels[GeoDataPlacemark::BarrierGate] = 17; 1157​ s_defaultMinZoomLevels[GeoDataPlacemark::BarrierGate] = 17;
1155 s_defaultMinZoomLevels[GeoDataPlacemark::BarrierLiftGate] = 17; 1158​ s_defaultMinZoomLevels[GeoDataPlacemark::BarrierLiftGate] = 17;
1156 s_defaultMinZoomLevels[GeoDataPlacemark::BarrierWall] = 17; 1159​ s_defaultMinZoomLevels[GeoDataPlacemark::BarrierWall] = 17;
1157 1160​
1158 s_defaultMinZoomLevels[GeoDataPlacemark::Bathymetry] = 1; 1161​ s_defaultMinZoomLevels[GeoDataPlacemark::Bathymetry] = 1;
1159 1162​
▲ Show 20 Lines • Show All 816 Lines • ▼ Show 20 Line(s)1853 if (visualCategoryNames.isEmpty()) {
1976 visualCategoryNames[GeoDataPlacemark::AmenityRecycling] = "AmenityRecycling"; 1979​ visualCategoryNames[GeoDataPlacemark::AmenityRecycling] = "AmenityRecycling";
1977 visualCategoryNames[GeoDataPlacemark::AmenityShelter] = "AmenityShelter"; 1980​ visualCategoryNames[GeoDataPlacemark::AmenityShelter] = "AmenityShelter";
1978 visualCategoryNames[GeoDataPlacemark::AmenityTelephone] = "AmenityTelephone"; 1981​ visualCategoryNames[GeoDataPlacemark::AmenityTelephone] = "AmenityTelephone";
1979 visualCategoryNames[GeoDataPlacemark::AmenityToilets] = "AmenityToilets"; 1982​ visualCategoryNames[GeoDataPlacemark::AmenityToilets] = "AmenityToilets";
1980 visualCategoryNames[GeoDataPlacemark::AmenityTownHall] = "AmenityTownHall"; 1983​ visualCategoryNames[GeoDataPlacemark::AmenityTownHall] = "AmenityTownHall";
1981 visualCategoryNames[GeoDataPlacemark::AmenityWasteBasket] = "AmenityWasteBasket"; 1984​ visualCategoryNames[GeoDataPlacemark::AmenityWasteBasket] = "AmenityWasteBasket";
1982 visualCategoryNames[GeoDataPlacemark::AmenityDrinkingWater] = "AmenityDrinkingWater"; 1985​ visualCategoryNames[GeoDataPlacemark::AmenityDrinkingWater] = "AmenityDrinkingWater";
1983 visualCategoryNames[GeoDataPlacemark::AmenityGraveyard] = "AmenityGraveyard"; 1986​ visualCategoryNames[GeoDataPlacemark::AmenityGraveyard] = "AmenityGraveyard";
1987​ visualCategoryNames[GeoDataPlacemark::AmenityChargingStation] = "ChargingStation";
1984 visualCategoryNames[GeoDataPlacemark::BarrierCityWall] = "BarrierCityWall"; 1988​ visualCategoryNames[GeoDataPlacemark::BarrierCityWall] = "BarrierCityWall";
1985 visualCategoryNames[GeoDataPlacemark::BarrierGate] = "BarrierGate"; 1989​ visualCategoryNames[GeoDataPlacemark::BarrierGate] = "BarrierGate";
1986 visualCategoryNames[GeoDataPlacemark::BarrierLiftGate] = "BarrierLiftGate"; 1990​ visualCategoryNames[GeoDataPlacemark::BarrierLiftGate] = "BarrierLiftGate";
1987 visualCategoryNames[GeoDataPlacemark::BarrierWall] = "BarrierWall"; 1991​ visualCategoryNames[GeoDataPlacemark::BarrierWall] = "BarrierWall";
1988 visualCategoryNames[GeoDataPlacemark::NaturalPeak] = "NaturalPeak"; 1992​ visualCategoryNames[GeoDataPlacemark::NaturalPeak] = "NaturalPeak";
1989 visualCategoryNames[GeoDataPlacemark::NaturalTree] = "NaturalTree"; 1993​ visualCategoryNames[GeoDataPlacemark::NaturalTree] = "NaturalTree";
1990 visualCategoryNames[GeoDataPlacemark::NaturalCave] = "NaturalCave"; 1994​ visualCategoryNames[GeoDataPlacemark::NaturalCave] = "NaturalCave";
1991 visualCategoryNames[GeoDataPlacemark::ShopBeverages] = "ShopBeverages"; 1995​ visualCategoryNames[GeoDataPlacemark::ShopBeverages] = "ShopBeverages";
▲ Show 20 Lines • Show All 332 Lines • Show Last 20 Lines