Merge #tracks-notunnel-nobridge into #roads-fill #174
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The layer order used to be as follows. (bridges) B direction-pre-bridges.directions R access-pre-bridges.access R waterway-bridges R/B roads-low-zoom R/B aerialways R/B ferry-routes T/R turning-circle-fill R roads-fill R tracks-notunnel-nobridge R buildings ??? buildings-lz ??? highway-area-fill R roads-casing R highway-area-casing R area-barriers.barriers T/R cliffs T/R line-barriers.barriers T/R tracks-tunnels T footbikecycle-tunnels T turning-circle-casing R landuse-overlay T/R castlewalls-poly.castlewalls T/R castlewalls.castlewalls T/R citywalls T/R tunnels T I classified all layers between and including the bridge-layers and the tunnels-layer with one of the following classifications: B Bridge level. R/B Above roads but below bridges. R Road level. T/R Above tunnels but below roads. T Tunnel level. I grouped all of the layers within one class together, without changing the order within the classes. For now, I ignored the buildings-layers, due to the difficulties with ordering buildings, highways and highway-areas described in gravitystorm#172. This change causes a couple of changes in the rendering, which mainly occur in rare cases. - Casings of turning circles are now drawn above foot/bike/track tunnels (they were already drawn above other tunnels), and above cliffs and barriers (just like other roads are drawn above cliffs and barriers). - Landuse-overlays (i.e., military and national park), castlewalls, and citywalls are now drawn above foot/bike/track tunnels (they were already drawn above other tunnels). - Ferry-routes are now drawn below roads (highways, tracks, turning-circles, and highway-areas). - Railways on level 12 (due to the #roads-low-zoom layer), aerialways, and waterway-bridges are now drawn above access and directions markers of roads (they were already drawn above the roads themselves).
The layer #tracks-notunnel-nobridge has been merged into #roads-fill. This unifies the various track-definitions. Rendering changes: The rendering order of tracks versus other roads is now determined by z_order. Therefore, tracks are now leveled at the same level as service roads, footways, cycleways, and paths, instead of below them. The rendering of the tracks themselves has not been altered.
|
This is step 3 of #162. |
Oops, roads should only render from level 13 on.
Make sure that tracks without tracktype render as before merging #tracks-notunnel-nobridge into #roads-fill, by providing defaults.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The layer #tracks-notunnel-nobridge has been merged into #roads-fill.
This unifies the various track-definitions.
Rendering changes:
The rendering order of tracks versus other roads is now determined by z_order.
Therefore, tracks are now rendered at the same level as service roads, footways, cycleways, and paths, instead of below them.
The rendering of the tracks themselves has not been altered.