Differential D2368 Diff 5725 src/lib/marble/StyleBuilder.cpp

Changeset View

Standalone View

View Options

src/lib/marble/StyleBuilder.cpp

Context not available.
118 m_defaultMinZoomLevels[GeoDataFeature::HighwayTrunk] = 7; 118​ m_defaultMinZoomLevels[GeoDataFeature::HighwayTrunk] = 7;
119 m_defaultMinZoomLevels[GeoDataFeature::HighwayMotorwayLink] = 10; 119​ m_defaultMinZoomLevels[GeoDataFeature::HighwayMotorwayLink] = 10;
120 m_defaultMinZoomLevels[GeoDataFeature::HighwayMotorway] = 6; 120​ m_defaultMinZoomLevels[GeoDataFeature::HighwayMotorway] = 6;
121​ m_defaultMinZoomLevels[GeoDataFeature::TransportAirportRunway] = 15;
121 122​
122#if 0 // not needed as long as default min zoom level is 15 123​#if 0 // not needed as long as default min zoom level is 15
123 for(int i = GeoDataFeature::AccomodationCamping; i <= GeoDataFeature::ReligionSikh; i++) 124​ for(int i = GeoDataFeature::AccomodationCamping; i <= GeoDataFeature::ReligionSikh; i++)
Context not available.
669 m_defaultStyle[GeoDataFeature::HighwayTrunkLink] = StyleBuilder::Private::createHighwayStyle( "highway_trunk", "#f9b29c", "#c84e2f", QFont(QStringLiteral("Arial")), "000000", 9.0, 6 ); 670​ m_defaultStyle[GeoDataFeature::HighwayTrunkLink] = StyleBuilder::Private::createHighwayStyle( "highway_trunk", "#f9b29c", "#c84e2f", QFont(QStringLiteral("Arial")), "000000", 9.0, 6 );
670 m_defaultStyle[GeoDataFeature::HighwayMotorway] = StyleBuilder::Private::createHighwayStyle( "highway_motorway", "#e892a2", "#dc2a67", QFont(QStringLiteral("Arial")), "000000", 9.0, 10 ); 671​ m_defaultStyle[GeoDataFeature::HighwayMotorway] = StyleBuilder::Private::createHighwayStyle( "highway_motorway", "#e892a2", "#dc2a67", QFont(QStringLiteral("Arial")), "000000", 9.0, 10 );
671 m_defaultStyle[GeoDataFeature::HighwayMotorwayLink] = StyleBuilder::Private::createHighwayStyle( "highway_motorway", "#e892a2", "#dc2a67", QFont(QStringLiteral("Arial")), "000000", 9.0, 10 ); 672​ m_defaultStyle[GeoDataFeature::HighwayMotorwayLink] = StyleBuilder::Private::createHighwayStyle( "highway_motorway", "#e892a2", "#dc2a67", QFont(QStringLiteral("Arial")), "000000", 9.0, 10 );
673​ m_defaultStyle[GeoDataFeature::TransportAirportRunway] = StyleBuilder::Private::createHighwayStyle( "", "#bbbbcc", "#bbbbcc", QFont(QStringLiteral("Arial")), "000000", 0, 1 );
672 674​
673 m_defaultStyle[GeoDataFeature::NaturalWater] = StyleBuilder::Private::createStyle( 4, 0, waterColor, waterColor, true, true, 675​ m_defaultStyle[GeoDataFeature::NaturalWater] = StyleBuilder::Private::createStyle( 4, 0, waterColor, waterColor, true, true,
674 Qt::SolidPattern, Qt::SolidLine, Qt::RoundCap, false, QVector< qreal >(), 676​ Qt::SolidPattern, Qt::SolidLine, Qt::RoundCap, false, QVector< qreal >(),
Context not available.
1419 visualCategoryNames[GeoDataFeature::TransportHelipad] = "TransportHelipad"; 1421​ visualCategoryNames[GeoDataFeature::TransportHelipad] = "TransportHelipad";
1420 visualCategoryNames[GeoDataFeature::TransportAirportTerminal] = "TransportAirportTerminal"; 1422​ visualCategoryNames[GeoDataFeature::TransportAirportTerminal] = "TransportAirportTerminal";
1421 visualCategoryNames[GeoDataFeature::TransportAirportGate] = "TransportAirportGate"; 1423​ visualCategoryNames[GeoDataFeature::TransportAirportGate] = "TransportAirportGate";
1424​ visualCategoryNames[GeoDataFeature::TransportAirportRunway] = "TransportAirportRunway";
1422 visualCategoryNames[GeoDataFeature::TransportBusStation] = "TransportBusStation"; 1425​ visualCategoryNames[GeoDataFeature::TransportBusStation] = "TransportBusStation";
1423 visualCategoryNames[GeoDataFeature::TransportBusStop] = "TransportBusStop"; 1426​ visualCategoryNames[GeoDataFeature::TransportBusStop] = "TransportBusStop";
1424 visualCategoryNames[GeoDataFeature::TransportCarShare] = "TransportCarShare"; 1427​ visualCategoryNames[GeoDataFeature::TransportCarShare] = "TransportCarShare";
Context not available.