Differential D3570 Diff 8701 src/lib/marble/StyleBuilder.cpp

Changeset View

Standalone View

View Options

src/lib/marble/StyleBuilder.cpp

Context not available.
151 m_defaultMinZoomLevels[GeoDataPlacemark::HighwaySecondary] = 9; 151​ m_defaultMinZoomLevels[GeoDataPlacemark::HighwaySecondary] = 9;
152 m_defaultMinZoomLevels[GeoDataPlacemark::HighwayPrimaryLink] = 10; 152​ m_defaultMinZoomLevels[GeoDataPlacemark::HighwayPrimaryLink] = 10;
153 m_defaultMinZoomLevels[GeoDataPlacemark::HighwayPrimary] = 8; 153​ m_defaultMinZoomLevels[GeoDataPlacemark::HighwayPrimary] = 8;
154​ m_defaultMinZoomLevels[GeoDataPlacemark::HighwayRaceway] = 5;
rahnUnsubmitted
Done

This value marks the minimum zoom level where the street appears. Zoomlevels are exactly organized like in OpenStreetMap: level 0 is the lowest one which contains the whole earth in a single picture. Level 19 the highest one where you can see all details of a small street.
As you can see the biggest streets only appear at level 7. Raceways are less prominent in general so they should probably rather appear around level 11 or 13.

rahn: This value marks the minimum zoom level where the street appears. Zoomlevels are exactly…
xdizzasterAuthorUnsubmitted
Done

I had trouble with displaying it on the higher zoom levels, but I suspect it was because of the way my example (https://www.openstreetmap.org/way/27852990) was rendered in particular. i have checked on OSM and the lowest zoom level I can see the raceway is 12.

xdizzaster: I had trouble with displaying it on the higher zoom levels, but I suspect it was because of the…
154 m_defaultMinZoomLevels[GeoDataPlacemark::HighwayTrunkLink] = 10; 155​ m_defaultMinZoomLevels[GeoDataPlacemark::HighwayTrunkLink] = 10;
155 m_defaultMinZoomLevels[GeoDataPlacemark::HighwayTrunk] = 7; 156​ m_defaultMinZoomLevels[GeoDataPlacemark::HighwayTrunk] = 7;
156 m_defaultMinZoomLevels[GeoDataPlacemark::HighwayMotorwayLink] = 10; 157​ m_defaultMinZoomLevels[GeoDataPlacemark::HighwayMotorwayLink] = 10;
Context not available.
728 m_defaultStyle[GeoDataPlacemark::HighwaySecondaryLink] = createHighwayStyle("#f7fabf", "#707d05", osmFont, "000000", 6, 6); 729​ m_defaultStyle[GeoDataPlacemark::HighwaySecondaryLink] = createHighwayStyle("#f7fabf", "#707d05", osmFont, "000000", 6, 6);
729 m_defaultStyle[GeoDataPlacemark::HighwayPrimary] = createHighwayStyle("#fcd6a4", "#a06b00", osmFont, "000000", 9, 6); 730​ m_defaultStyle[GeoDataPlacemark::HighwayPrimary] = createHighwayStyle("#fcd6a4", "#a06b00", osmFont, "000000", 9, 6);
730 m_defaultStyle[GeoDataPlacemark::HighwayPrimaryLink] = createHighwayStyle("#fcd6a4", "#a06b00", osmFont, "000000", 6, 6); 731​ m_defaultStyle[GeoDataPlacemark::HighwayPrimaryLink] = createHighwayStyle("#fcd6a4", "#a06b00", osmFont, "000000", 6, 6);
732​ m_defaultStyle[GeoDataPlacemark::HighwayRaceway] = createHighwayStyle("#ff6200", "#ff6200", osmFont, "000000", 0, 5);
rahnUnsubmitted
Done

Should we really not display any outline?

rahn: Should we really not display any outline?
xdizzasterAuthorUnsubmitted
Done

We probably should, my bad.

xdizzaster: We probably should, my bad.
731 m_defaultStyle[GeoDataPlacemark::HighwayTrunk] = createHighwayStyle("#f9b29c", "#c84e2f", osmFont, "000000", 9, 6); 733​ m_defaultStyle[GeoDataPlacemark::HighwayTrunk] = createHighwayStyle("#f9b29c", "#c84e2f", osmFont, "000000", 9, 6);
732 m_defaultStyle[GeoDataPlacemark::HighwayTrunkLink] = createHighwayStyle("#f9b29c", "#c84e2f", osmFont, "000000", 9, 6); 734​ m_defaultStyle[GeoDataPlacemark::HighwayTrunkLink] = createHighwayStyle("#f9b29c", "#c84e2f", osmFont, "000000", 9, 6);
733 m_defaultStyle[GeoDataPlacemark::HighwayMotorway] = createHighwayStyle("#e892a2", "#dc2a67", osmFont, "000000", 9, 10); 735​ m_defaultStyle[GeoDataPlacemark::HighwayMotorway] = createHighwayStyle("#e892a2", "#dc2a67", osmFont, "000000", 9, 10);
Context not available.
1066 s_visualCategories[OsmTag("highway", "trunk")] = GeoDataPlacemark::HighwayTrunk; 1068​ s_visualCategories[OsmTag("highway", "trunk")] = GeoDataPlacemark::HighwayTrunk;
1067 s_visualCategories[OsmTag("highway", "motorway_link")] = GeoDataPlacemark::HighwayMotorwayLink; 1069​ s_visualCategories[OsmTag("highway", "motorway_link")] = GeoDataPlacemark::HighwayMotorwayLink;
1068 s_visualCategories[OsmTag("highway", "motorway")] = GeoDataPlacemark::HighwayMotorway; 1070​ s_visualCategories[OsmTag("highway", "motorway")] = GeoDataPlacemark::HighwayMotorway;
1071​ s_visualCategories[OsmTag("highway", "raceway")] = GeoDataPlacemark::HighwayRaceway;
1069 1072​
1070 s_visualCategories[OsmTag("natural", "water")] = GeoDataPlacemark::NaturalWater; 1073​ s_visualCategories[OsmTag("natural", "water")] = GeoDataPlacemark::NaturalWater;
1071 s_visualCategories[OsmTag("natural", "reef")] = GeoDataPlacemark::NaturalReef; 1074​ s_visualCategories[OsmTag("natural", "reef")] = GeoDataPlacemark::NaturalReef;
Context not available.
1689 visualCategoryNames[GeoDataPlacemark::HighwaySecondary] = "HighwaySecondary"; 1692​ visualCategoryNames[GeoDataPlacemark::HighwaySecondary] = "HighwaySecondary";
1690 visualCategoryNames[GeoDataPlacemark::HighwayPrimaryLink] = "HighwayPrimaryLink"; 1693​ visualCategoryNames[GeoDataPlacemark::HighwayPrimaryLink] = "HighwayPrimaryLink";
1691 visualCategoryNames[GeoDataPlacemark::HighwayPrimary] = "HighwayPrimary"; 1694​ visualCategoryNames[GeoDataPlacemark::HighwayPrimary] = "HighwayPrimary";
1695​ visualCategoryNames[GeoDataPlacemark::HighwayRaceway] = "HighwayRaceway";
1692 visualCategoryNames[GeoDataPlacemark::HighwayTrunkLink] = "HighwayTrunkLink"; 1696​ visualCategoryNames[GeoDataPlacemark::HighwayTrunkLink] = "HighwayTrunkLink";
1693 visualCategoryNames[GeoDataPlacemark::HighwayTrunk] = "HighwayTrunk"; 1697​ visualCategoryNames[GeoDataPlacemark::HighwayTrunk] = "HighwayTrunk";
1694 visualCategoryNames[GeoDataPlacemark::HighwayMotorwayLink] = "HighwayMotorwayLink"; 1698​ visualCategoryNames[GeoDataPlacemark::HighwayMotorwayLink] = "HighwayMotorwayLink";
Context not available.