Differential D6159 Diff 15300 src/lib/marble/StyleBuilder.cpp

Changeset View

Standalone View

View Options

src/lib/marble/StyleBuilder.cpp

Context not available.
1046 m_defaultStyle[GeoDataPlacemark::TourismZoo] = createOsmPOIRingStyle(osmFont, QString(), amenityColor, Qt::transparent); 1046​ m_defaultStyle[GeoDataPlacemark::TourismZoo] = createOsmPOIRingStyle(osmFont, QString(), amenityColor, Qt::transparent);
1047 m_defaultStyle[GeoDataPlacemark::TourismAlpineHut] = createOsmPOIStyle(osmFont, "transportation/alpinehut.16", transportationColor); 1047​ m_defaultStyle[GeoDataPlacemark::TourismAlpineHut] = createOsmPOIStyle(osmFont, "transportation/alpinehut.16", transportationColor);
1048 m_defaultStyle[GeoDataPlacemark::TourismWildernessHut] = createOsmPOIStyle(osmFont, "transportation/wilderness_hut", transportationColor); 1048​ m_defaultStyle[GeoDataPlacemark::TourismWildernessHut] = createOsmPOIStyle(osmFont, "transportation/wilderness_hut", transportationColor);
1049​ m_defaultStyle[GeoDataPlacemark::TourismCaravanSite] = createOsmPOIAreaStyle(osmFont, "transportation/caravan_park.16", transportationColor);
1049 m_defaultStyle[GeoDataPlacemark::TransportAerodrome] = createOsmPOIStyle(osmFont, "airtransport/aerodrome", airTransportColor); 1050​ m_defaultStyle[GeoDataPlacemark::TransportAerodrome] = createOsmPOIStyle(osmFont, "airtransport/aerodrome", airTransportColor);
1050 m_defaultStyle[GeoDataPlacemark::TransportHelipad] = createOsmPOIStyle(osmFont, "airtransport/helipad", airTransportColor); 1051​ m_defaultStyle[GeoDataPlacemark::TransportHelipad] = createOsmPOIStyle(osmFont, "airtransport/helipad", airTransportColor);
1051 m_defaultStyle[GeoDataPlacemark::TransportAirportTerminal] = createOsmPOIAreaStyle(osmFont, QString(), airTransportColor); 1052​ m_defaultStyle[GeoDataPlacemark::TransportAirportTerminal] = createOsmPOIAreaStyle(osmFont, QString(), airTransportColor);
Context not available.
1507 s_visualCategories[OsmTag("tourism", "viewpoint")] = GeoDataPlacemark::TourismViewPoint; 1508​ s_visualCategories[OsmTag("tourism", "viewpoint")] = GeoDataPlacemark::TourismViewPoint;
1508 s_visualCategories[OsmTag("tourism", "wilderness_hut")] = GeoDataPlacemark::TourismWildernessHut; 1509​ s_visualCategories[OsmTag("tourism", "wilderness_hut")] = GeoDataPlacemark::TourismWildernessHut;
1509 s_visualCategories[OsmTag("tourism", "zoo")] = GeoDataPlacemark::TourismZoo; 1510​ s_visualCategories[OsmTag("tourism", "zoo")] = GeoDataPlacemark::TourismZoo;
1511​ s_visualCategories[OsmTag("tourism", "caravan_site")] = GeoDataPlacemark::TourismCaravanSite;
1512​ s_visualCategories[OsmTag("amenity", "trailer_park")] = GeoDataPlacemark::TourismCaravanSite;
1510 1513​
1511 s_visualCategories[OsmTag("barrier", "city_wall")] = GeoDataPlacemark::BarrierCityWall; 1514​ s_visualCategories[OsmTag("barrier", "city_wall")] = GeoDataPlacemark::BarrierCityWall;
1512 s_visualCategories[OsmTag("barrier", "gate")] = GeoDataPlacemark::BarrierGate; 1515​ s_visualCategories[OsmTag("barrier", "gate")] = GeoDataPlacemark::BarrierGate;
Context not available.
1926 s_defaultMinZoomLevels[GeoDataPlacemark::TourismThemePark] = 15; 1929​ s_defaultMinZoomLevels[GeoDataPlacemark::TourismThemePark] = 15;
1927 s_defaultMinZoomLevels[GeoDataPlacemark::TourismViewPoint] = 15; 1930​ s_defaultMinZoomLevels[GeoDataPlacemark::TourismViewPoint] = 15;
1928 s_defaultMinZoomLevels[GeoDataPlacemark::TourismZoo] = 15; 1931​ s_defaultMinZoomLevels[GeoDataPlacemark::TourismZoo] = 15;
1932​ s_defaultMinZoomLevels[GeoDataPlacemark::TourismCaravanSite] = 16;
1929 s_defaultMinZoomLevels[GeoDataPlacemark::HistoricMonument] = 16; 1933​ s_defaultMinZoomLevels[GeoDataPlacemark::HistoricMonument] = 16;
1930 s_defaultMinZoomLevels[GeoDataPlacemark::TourismInformation] = 17; 1934​ s_defaultMinZoomLevels[GeoDataPlacemark::TourismInformation] = 17;
1931 s_defaultMinZoomLevels[GeoDataPlacemark::TransportAerodrome] = 9; 1935​ s_defaultMinZoomLevels[GeoDataPlacemark::TransportAerodrome] = 9;
Context not available.
2331 popularities << GeoDataPlacemark::TourismZoo; 2335​ popularities << GeoDataPlacemark::TourismZoo;
2332 popularities << GeoDataPlacemark::TourismAlpineHut; 2336​ popularities << GeoDataPlacemark::TourismAlpineHut;
2333 popularities << GeoDataPlacemark::TourismWildernessHut; 2337​ popularities << GeoDataPlacemark::TourismWildernessHut;
2338​ popularities << GeoDataPlacemark::TourismCaravanSite;
2334 2339​
2335 popularities << GeoDataPlacemark::HistoricMemorial; 2340​ popularities << GeoDataPlacemark::HistoricMemorial;
2336 2341​
Context not available.
2678 visualCategoryNames[GeoDataPlacemark::TourismZoo] = "TouristZoo"; 2683​ visualCategoryNames[GeoDataPlacemark::TourismZoo] = "TouristZoo";
2679 visualCategoryNames[GeoDataPlacemark::TourismAlpineHut] = "TouristAlpineHut"; 2684​ visualCategoryNames[GeoDataPlacemark::TourismAlpineHut] = "TouristAlpineHut";
2680 visualCategoryNames[GeoDataPlacemark::TourismWildernessHut] = "TouristWildernessHut"; 2685​ visualCategoryNames[GeoDataPlacemark::TourismWildernessHut] = "TouristWildernessHut";
2686​ visualCategoryNames[GeoDataPlacemark::TourismCaravanSite] = "TouristCaravanSite";
2681 visualCategoryNames[GeoDataPlacemark::TransportAerodrome] = "TransportAerodrome"; 2687​ visualCategoryNames[GeoDataPlacemark::TransportAerodrome] = "TransportAerodrome";
2682 visualCategoryNames[GeoDataPlacemark::TransportHelipad] = "TransportHelipad"; 2688​ visualCategoryNames[GeoDataPlacemark::TransportHelipad] = "TransportHelipad";
2683 visualCategoryNames[GeoDataPlacemark::TransportAirportTerminal] = "TransportAirportTerminal"; 2689​ visualCategoryNames[GeoDataPlacemark::TransportAirportTerminal] = "TransportAirportTerminal";
Context not available.