Differential D3574 Diff 8714 src/lib/marble/StyleBuilder.cpp

Changeset View

Standalone View

View Options

src/lib/marble/StyleBuilder.cpp

Show First 20 Lines • Show All 153 Lines • ▼ Show 20 Line(s)109{
154 m_defaultMinZoomLevels[GeoDataPlacemark::HighwayRaceway] = 12; 154​ m_defaultMinZoomLevels[GeoDataPlacemark::HighwayRaceway] = 12;
155 m_defaultMinZoomLevels[GeoDataPlacemark::HighwayTrunkLink] = 10; 155​ m_defaultMinZoomLevels[GeoDataPlacemark::HighwayTrunkLink] = 10;
156 m_defaultMinZoomLevels[GeoDataPlacemark::HighwayTrunk] = 7; 156​ m_defaultMinZoomLevels[GeoDataPlacemark::HighwayTrunk] = 7;
157 m_defaultMinZoomLevels[GeoDataPlacemark::HighwayMotorwayLink] = 10; 157​ m_defaultMinZoomLevels[GeoDataPlacemark::HighwayMotorwayLink] = 10;
158 m_defaultMinZoomLevels[GeoDataPlacemark::HighwayMotorway] = 6; 158​ m_defaultMinZoomLevels[GeoDataPlacemark::HighwayMotorway] = 6;
159 m_defaultMinZoomLevels[GeoDataPlacemark::TransportAirportRunway] = 15; 159​ m_defaultMinZoomLevels[GeoDataPlacemark::TransportAirportRunway] = 15;
160 m_defaultMinZoomLevels[GeoDataPlacemark::TransportAirportTaxiway] = 15; 160​ m_defaultMinZoomLevels[GeoDataPlacemark::TransportAirportTaxiway] = 15;
161 m_defaultMinZoomLevels[GeoDataPlacemark::TransportAirportApron] = 15; 161​ m_defaultMinZoomLevels[GeoDataPlacemark::TransportAirportApron] = 15;
162​ m_defaultMinZoomLevels[GeoDataPlacemark::TransportSpeedCamera] = 17;
162 163​
163#if 0 // not needed as long as default min zoom level is 15 164​#if 0 // not needed as long as default min zoom level is 15
164 for(int i = GeoDataPlacemark::AccomodationCamping; i <= GeoDataPlacemark::ReligionSikh; i++) 165​ for(int i = GeoDataPlacemark::AccomodationCamping; i <= GeoDataPlacemark::ReligionSikh; i++)
165 s_defaultMinZoomLevels[i] = 15; 166​ s_defaultMinZoomLevels[i] = 15;
166#endif 167​#endif
167 168​
168 m_defaultMinZoomLevels[GeoDataPlacemark::AmenityGraveyard] = 14; 169​ m_defaultMinZoomLevels[GeoDataPlacemark::AmenityGraveyard] = 14;
169 m_defaultMinZoomLevels[GeoDataPlacemark::AmenityFountain] = 17; 170​ m_defaultMinZoomLevels[GeoDataPlacemark::AmenityFountain] = 17;
▲ Show 20 Lines • Show All 562 Lines • ▼ Show 20 Line(s)538// QColor const buildingColor(0, 255, 0, 64);
732 m_defaultStyle[GeoDataPlacemark::HighwayRaceway] = createHighwayStyle("#ffc0cb", "#ffc0cb", osmFont, "000000", 1, 5); 733​ m_defaultStyle[GeoDataPlacemark::HighwayRaceway] = createHighwayStyle("#ffc0cb", "#ffc0cb", osmFont, "000000", 1, 5);
733 m_defaultStyle[GeoDataPlacemark::HighwayTrunk] = createHighwayStyle("#f9b29c", "#c84e2f", osmFont, "000000", 9, 6); 734​ m_defaultStyle[GeoDataPlacemark::HighwayTrunk] = createHighwayStyle("#f9b29c", "#c84e2f", osmFont, "000000", 9, 6);
734 m_defaultStyle[GeoDataPlacemark::HighwayTrunkLink] = createHighwayStyle("#f9b29c", "#c84e2f", osmFont, "000000", 9, 6); 735​ m_defaultStyle[GeoDataPlacemark::HighwayTrunkLink] = createHighwayStyle("#f9b29c", "#c84e2f", osmFont, "000000", 9, 6);
735 m_defaultStyle[GeoDataPlacemark::HighwayMotorway] = createHighwayStyle("#e892a2", "#dc2a67", osmFont, "000000", 9, 10); 736​ m_defaultStyle[GeoDataPlacemark::HighwayMotorway] = createHighwayStyle("#e892a2", "#dc2a67", osmFont, "000000", 9, 10);
736 m_defaultStyle[GeoDataPlacemark::HighwayMotorwayLink] = createHighwayStyle("#e892a2", "#dc2a67", osmFont, "000000", 9, 10); 737​ m_defaultStyle[GeoDataPlacemark::HighwayMotorwayLink] = createHighwayStyle("#e892a2", "#dc2a67", osmFont, "000000", 9, 10);
737 m_defaultStyle[GeoDataPlacemark::TransportAirportRunway] = createHighwayStyle("#bbbbcc", "#bbbbcc", osmFont, "000000", 0, 1, Qt::NoPen); 738​ m_defaultStyle[GeoDataPlacemark::TransportAirportRunway] = createHighwayStyle("#bbbbcc", "#bbbbcc", osmFont, "000000", 0, 1, Qt::NoPen);
738 m_defaultStyle[GeoDataPlacemark::TransportAirportTaxiway] = createHighwayStyle("#bbbbcc", "#bbbbcc", osmFont, "000000", 0, 1, Qt::NoPen); 739​ m_defaultStyle[GeoDataPlacemark::TransportAirportTaxiway] = createHighwayStyle("#bbbbcc", "#bbbbcc", osmFont, "000000", 0, 1, Qt::NoPen);
739 m_defaultStyle[GeoDataPlacemark::TransportAirportApron] = createWayStyle("#e9d1ff", Qt::transparent, true, false); 740​ m_defaultStyle[GeoDataPlacemark::TransportAirportApron] = createWayStyle("#e9d1ff", Qt::transparent, true, false);
741​ m_defaultStyle[GeoDataPlacemark::TransportSpeedCamera] = createOsmPOIStyle(osmFont, "individual/speedcamera");
740 742​
741 m_defaultStyle[GeoDataPlacemark::NaturalWater] = createStyle(4, 0, waterColor, waterColor, true, false, 743​ m_defaultStyle[GeoDataPlacemark::NaturalWater] = createStyle(4, 0, waterColor, waterColor, true, false,
742 Qt::SolidPattern, Qt::SolidLine, Qt::RoundCap, false, QVector< qreal >(), 744​ Qt::SolidPattern, Qt::SolidLine, Qt::RoundCap, false, QVector< qreal >(),
743 osmFont, waterColor.darker(150)); 745​ osmFont, waterColor.darker(150));
744 746​
745 m_defaultStyle[GeoDataPlacemark::NaturalReef] = createStyle(5.5, 0, "#36677c", "#36677c", true, false, 747​ m_defaultStyle[GeoDataPlacemark::NaturalReef] = createStyle(5.5, 0, "#36677c", "#36677c", true, false,
746 Qt::Dense7Pattern, Qt::DotLine, Qt::RoundCap, false, QVector< qreal >(), 748​ Qt::Dense7Pattern, Qt::DotLine, Qt::RoundCap, false, QVector< qreal >(),
747 osmFont, waterColor.darker(150)); 749​ osmFont, waterColor.darker(150));
▲ Show 20 Lines • Show All 415 Lines • ▼ Show 20 Line(s)880{
1163 s_visualCategories[OsmTag("transport", "parking")] = GeoDataPlacemark::TransportParking; 1165​ s_visualCategories[OsmTag("transport", "parking")] = GeoDataPlacemark::TransportParking;
1164 s_visualCategories[OsmTag("public_transport", "platform")] = GeoDataPlacemark::TransportPlatform; 1166​ s_visualCategories[OsmTag("public_transport", "platform")] = GeoDataPlacemark::TransportPlatform;
1165 s_visualCategories[OsmTag("amenity", "bicycle_rental")] = GeoDataPlacemark::TransportRentalBicycle; 1167​ s_visualCategories[OsmTag("amenity", "bicycle_rental")] = GeoDataPlacemark::TransportRentalBicycle;
1166 s_visualCategories[OsmTag("amenity", "car_rental")] = GeoDataPlacemark::TransportRentalCar; 1168​ s_visualCategories[OsmTag("amenity", "car_rental")] = GeoDataPlacemark::TransportRentalCar;
1167 s_visualCategories[OsmTag("amenity", "taxi")] = GeoDataPlacemark::TransportTaxiRank; 1169​ s_visualCategories[OsmTag("amenity", "taxi")] = GeoDataPlacemark::TransportTaxiRank;
1168 s_visualCategories[OsmTag("transport", "train_station")] = GeoDataPlacemark::TransportTrainStation; 1170​ s_visualCategories[OsmTag("transport", "train_station")] = GeoDataPlacemark::TransportTrainStation;
1169 s_visualCategories[OsmTag("transport", "tram_stop")] = GeoDataPlacemark::TransportTramStop; 1171​ s_visualCategories[OsmTag("transport", "tram_stop")] = GeoDataPlacemark::TransportTramStop;
1170 s_visualCategories[OsmTag("transport", "bus_stop")] = GeoDataPlacemark::TransportBusStop; 1172​ s_visualCategories[OsmTag("transport", "bus_stop")] = GeoDataPlacemark::TransportBusStop;
1173​ s_visualCategories[OsmTag("highway", "speed_camera")] = GeoDataPlacemark::TransportSpeedCamera;
1171 s_visualCategories[OsmTag("amenity", "bicycle_parking")] = GeoDataPlacemark::TransportBicycleParking; 1174​ s_visualCategories[OsmTag("amenity", "bicycle_parking")] = GeoDataPlacemark::TransportBicycleParking;
1172 s_visualCategories[OsmTag("amenity", "motorcycle_parking")] = GeoDataPlacemark::TransportMotorcycleParking; 1175​ s_visualCategories[OsmTag("amenity", "motorcycle_parking")] = GeoDataPlacemark::TransportMotorcycleParking;
1173 s_visualCategories[OsmTag("railway", "subway_entrance")] = GeoDataPlacemark::TransportSubwayEntrance; 1176​ s_visualCategories[OsmTag("railway", "subway_entrance")] = GeoDataPlacemark::TransportSubwayEntrance;
1174 1177​
1175 s_visualCategories[OsmTag("place", "city")] = GeoDataPlacemark::PlaceCity; 1178​ s_visualCategories[OsmTag("place", "city")] = GeoDataPlacemark::PlaceCity;
1176 s_visualCategories[OsmTag("place", "suburb")] = GeoDataPlacemark::PlaceSuburb; 1179​ s_visualCategories[OsmTag("place", "suburb")] = GeoDataPlacemark::PlaceSuburb;
1177 s_visualCategories[OsmTag("place", "hamlet")] = GeoDataPlacemark::PlaceHamlet; 1180​ s_visualCategories[OsmTag("place", "hamlet")] = GeoDataPlacemark::PlaceHamlet;
1178 s_visualCategories[OsmTag("place", "locality")] = GeoDataPlacemark::PlaceLocality; 1181​ s_visualCategories[OsmTag("place", "locality")] = GeoDataPlacemark::PlaceLocality;
▲ Show 20 Lines • Show All 395 Lines • ▼ Show 20 Line(s)1465 if (paintLayerOrder.isEmpty()) {
1574 paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataPlacemark::Landmass); 1577​ paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataPlacemark::Landmass);
1575 paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataPlacemark::NaturalCliff); 1578​ paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataPlacemark::NaturalCliff);
1576 paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataPlacemark::NaturalPeak); 1579​ paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataPlacemark::NaturalPeak);
1577 paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataPlacemark::AmenityKindergarten); 1580​ paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataPlacemark::AmenityKindergarten);
1578 paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataPlacemark::EducationCollege); 1581​ paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataPlacemark::EducationCollege);
1579 paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataPlacemark::EducationSchool); 1582​ paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataPlacemark::EducationSchool);
1580 paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataPlacemark::EducationUniversity); 1583​ paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataPlacemark::EducationUniversity);
1581 paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataPlacemark::HealthHospital); 1584​ paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataPlacemark::HealthHospital);
1585​ paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataPlacemark::TransportSpeedCamera);
1582 paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataPlacemark::MilitaryDangerArea); 1586​ paintLayerOrder << Private::createPaintLayerItem("Point", GeoDataPlacemark::MilitaryDangerArea);
1583 1587​
1584 paintLayerOrder << QStringLiteral("Polygon/Building/frame"); 1588​ paintLayerOrder << QStringLiteral("Polygon/Building/frame");
1585 paintLayerOrder << QStringLiteral("Polygon/Building/roof"); 1589​ paintLayerOrder << QStringLiteral("Polygon/Building/roof");
1586 1590​
1587 paintLayerOrder << QStringLiteral("Photo"); 1591​ paintLayerOrder << QStringLiteral("Photo");
1588 1592​
1589 Q_ASSERT(QSet<QString>::fromList(paintLayerOrder).size() == paintLayerOrder.size()); 1593​ Q_ASSERT(QSet<QString>::fromList(paintLayerOrder).size() == paintLayerOrder.size());
▲ Show 20 Lines • Show All 238 Lines • ▼ Show 20 Line(s)1618 if (visualCategoryNames.isEmpty()) {
1828 visualCategoryNames[GeoDataPlacemark::TransportParking] = "TransportParking"; 1832​ visualCategoryNames[GeoDataPlacemark::TransportParking] = "TransportParking";
1829 visualCategoryNames[GeoDataPlacemark::TransportParkingSpace] = "TransportParkingSpace"; 1833​ visualCategoryNames[GeoDataPlacemark::TransportParkingSpace] = "TransportParkingSpace";
1830 visualCategoryNames[GeoDataPlacemark::TransportPlatform] = "TransportPlatform"; 1834​ visualCategoryNames[GeoDataPlacemark::TransportPlatform] = "TransportPlatform";
1831 visualCategoryNames[GeoDataPlacemark::TransportRentalBicycle] = "TransportRentalBicycle"; 1835​ visualCategoryNames[GeoDataPlacemark::TransportRentalBicycle] = "TransportRentalBicycle";
1832 visualCategoryNames[GeoDataPlacemark::TransportRentalCar] = "TransportRentalCar"; 1836​ visualCategoryNames[GeoDataPlacemark::TransportRentalCar] = "TransportRentalCar";
1833 visualCategoryNames[GeoDataPlacemark::TransportTaxiRank] = "TransportTaxiRank"; 1837​ visualCategoryNames[GeoDataPlacemark::TransportTaxiRank] = "TransportTaxiRank";
1834 visualCategoryNames[GeoDataPlacemark::TransportTrainStation] = "TransportTrainStation"; 1838​ visualCategoryNames[GeoDataPlacemark::TransportTrainStation] = "TransportTrainStation";
1835 visualCategoryNames[GeoDataPlacemark::TransportTramStop] = "TransportTramStop"; 1839​ visualCategoryNames[GeoDataPlacemark::TransportTramStop] = "TransportTramStop";
1840​ visualCategoryNames[GeoDataPlacemark::TransportSpeedCamera] = "TransportSpeedCamera";
1836 visualCategoryNames[GeoDataPlacemark::TransportBicycleParking] = "TransportBicycleParking"; 1841​ visualCategoryNames[GeoDataPlacemark::TransportBicycleParking] = "TransportBicycleParking";
1837 visualCategoryNames[GeoDataPlacemark::TransportMotorcycleParking] = "TransportMotorcycleParking"; 1842​ visualCategoryNames[GeoDataPlacemark::TransportMotorcycleParking] = "TransportMotorcycleParking";
1838 visualCategoryNames[GeoDataPlacemark::TransportSubwayEntrance] = "TransportSubwayEntrance"; 1843​ visualCategoryNames[GeoDataPlacemark::TransportSubwayEntrance] = "TransportSubwayEntrance";
1839 visualCategoryNames[GeoDataPlacemark::ReligionPlaceOfWorship] = "ReligionPlaceOfWorship"; 1844​ visualCategoryNames[GeoDataPlacemark::ReligionPlaceOfWorship] = "ReligionPlaceOfWorship";
1840 visualCategoryNames[GeoDataPlacemark::ReligionBahai] = "ReligionBahai"; 1845​ visualCategoryNames[GeoDataPlacemark::ReligionBahai] = "ReligionBahai";
1841 visualCategoryNames[GeoDataPlacemark::ReligionBuddhist] = "ReligionBuddhist"; 1846​ visualCategoryNames[GeoDataPlacemark::ReligionBuddhist] = "ReligionBuddhist";
1842 visualCategoryNames[GeoDataPlacemark::ReligionChristian] = "ReligionChristian"; 1847​ visualCategoryNames[GeoDataPlacemark::ReligionChristian] = "ReligionChristian";
1843 visualCategoryNames[GeoDataPlacemark::ReligionMuslim] = "ReligionMuslim"; 1848​ visualCategoryNames[GeoDataPlacemark::ReligionMuslim] = "ReligionMuslim";
▲ Show 20 Lines • Show All 239 Lines • Show Last 20 Lines