Differential D7622 Diff 18988 src/lib/marble/StyleBuilder.cpp

Changeset View

Standalone View

View Options

src/lib/marble/StyleBuilder.cpp

Context not available.
1087 m_defaultStyle[GeoDataPlacemark::ReligionSikh] = createOsmPOIStyle(osmFont, "black/sikhist.16"); 1087​ m_defaultStyle[GeoDataPlacemark::ReligionSikh] = createOsmPOIStyle(osmFont, "black/sikhist.16");
1088 m_defaultStyle[GeoDataPlacemark::ReligionTaoist] = createOsmPOIStyle(osmFont, "black/taoist.16"); 1088​ m_defaultStyle[GeoDataPlacemark::ReligionTaoist] = createOsmPOIStyle(osmFont, "black/taoist.16");
1089 1089​
1090​ m_defaultStyle[GeoDataPlacemark::IndoorDoor] = createOsmPOIRingStyle(osmFont, "indoor/door_b.16");
1091​ m_defaultStyle[GeoDataPlacemark::IndoorWall] = createOsmPOIStyle(osmFont, "indoor/wall_b.16");
nienhueserUnsubmitted
Done

I would go without icon here.... Torsten?

nienhueser: I would go without icon here.... Torsten?
rahnUnsubmitted
Done

yes, we agreed on that.

rahn: yes, we agreed on that.
1092​ m_defaultStyle[GeoDataPlacemark::IndoorRoom] = createWayStyle(buildingColor.darker(), QColor(Qt::black));
1093​
1090 m_defaultStyle[GeoDataPlacemark::HighwayTrafficSignals] = createOsmPOIStyle(osmFont, "individual/traffic_light"); 1094​ m_defaultStyle[GeoDataPlacemark::HighwayTrafficSignals] = createOsmPOIStyle(osmFont, "individual/traffic_light");
1091 m_defaultStyle[GeoDataPlacemark::HighwayTrafficSignals]->iconStyle().setScale(0.75); 1095​ m_defaultStyle[GeoDataPlacemark::HighwayTrafficSignals]->iconStyle().setScale(0.75);
1092 1096​
Context not available.
1693 s_visualCategories[OsmTag("aerialway", "zip_line")] = GeoDataPlacemark::AerialwayZipLine; 1697​ s_visualCategories[OsmTag("aerialway", "zip_line")] = GeoDataPlacemark::AerialwayZipLine;
1694 s_visualCategories[OsmTag("aerialway", "goods")] = GeoDataPlacemark::AerialwayGoods; 1698​ s_visualCategories[OsmTag("aerialway", "goods")] = GeoDataPlacemark::AerialwayGoods;
1695 1699​
1700​ s_visualCategories[OsmTag("indoor", "door")] = GeoDataPlacemark::IndoorDoor;
1701​ s_visualCategories[OsmTag("indoor", "wall")] = GeoDataPlacemark::IndoorWall;
1702​ s_visualCategories[OsmTag("indoor", "room")] = GeoDataPlacemark::IndoorRoom;
1703​
1696 //Custom Marble OSM Tags 1704​ //Custom Marble OSM Tags
1697 s_visualCategories[OsmTag("marble_land", "landmass")] = GeoDataPlacemark::Landmass; 1705​ s_visualCategories[OsmTag("marble_land", "landmass")] = GeoDataPlacemark::Landmass;
1698 s_visualCategories[OsmTag("settlement", "yes")] = GeoDataPlacemark::UrbanArea; 1706​ s_visualCategories[OsmTag("settlement", "yes")] = GeoDataPlacemark::UrbanArea;
Context not available.
2007 s_defaultMinZoomLevels[GeoDataPlacemark::AerialwayZipLine] = 15; 2015​ s_defaultMinZoomLevels[GeoDataPlacemark::AerialwayZipLine] = 15;
2008 s_defaultMinZoomLevels[GeoDataPlacemark::AerialwayGoods] = 15; 2016​ s_defaultMinZoomLevels[GeoDataPlacemark::AerialwayGoods] = 15;
2009 2017​
2018​ s_defaultMinZoomLevels[GeoDataPlacemark::IndoorDoor] = 15;
nienhueserUnsubmitted
Done

I think 17 is more appropriate for all of them

nienhueser: I think 17 is more appropriate for all of them
2019​ s_defaultMinZoomLevels[GeoDataPlacemark::IndoorWall] = 15;
2020​ s_defaultMinZoomLevels[GeoDataPlacemark::IndoorRoom] = 15;
2021​
2010 for (int i = GeoDataPlacemark::PlaceCity; i < GeoDataPlacemark::LastIndex; i++) { 2022​ for (int i = GeoDataPlacemark::PlaceCity; i < GeoDataPlacemark::LastIndex; i++) {
2011 if (s_defaultMinZoomLevels[i] < 0) { 2023​ if (s_defaultMinZoomLevels[i] < 0) {
2012 qDebug() << "Missing default min zoom level for GeoDataPlacemark::GeoDataVisualCategory " << i; 2024​ qDebug() << "Missing default min zoom level for GeoDataPlacemark::GeoDataVisualCategory " << i;
Context not available.
2822 visualCategoryNames[GeoDataPlacemark::CrossingRailway] = "CrossingRailway"; 2834​ visualCategoryNames[GeoDataPlacemark::CrossingRailway] = "CrossingRailway";
2823 visualCategoryNames[GeoDataPlacemark::CrossingSignals] = "CrossingSignals"; 2835​ visualCategoryNames[GeoDataPlacemark::CrossingSignals] = "CrossingSignals";
2824 visualCategoryNames[GeoDataPlacemark::CrossingZebra] = "CrossingZebra"; 2836​ visualCategoryNames[GeoDataPlacemark::CrossingZebra] = "CrossingZebra";
2837​ visualCategoryNames[GeoDataPlacemark::IndoorDoor] = "IndoorDoor";
2838​ visualCategoryNames[GeoDataPlacemark::IndoorWall] = "IndoorWall";
2839​ visualCategoryNames[GeoDataPlacemark::IndoorRoom] = "IndoorRoom";
2825 visualCategoryNames[GeoDataPlacemark::LastIndex] = "LastIndex"; 2840​ visualCategoryNames[GeoDataPlacemark::LastIndex] = "LastIndex";
2826 } 2841​ }
2827 2842​
Context not available.