Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix layering order for highway=construction by adding z-order for construction=* values #4055

Closed
wants to merge 12 commits into from
Closed

Fix layering order for highway=construction by adding z-order for construction=* values #4055

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fd1171b
Add z-order for construction=platform
jeisenbe Mar 7, 2020
69e9526
Add test for construction=service z_order in test.lua
jeisenbe Mar 7, 2020
b59a0e8
Change construction=* z_order to be divided by 10
jeisenbe Mar 7, 2020
ade1912
Add lua tests for different construction= and highway= combinations
jeisenbe Mar 7, 2020
dab64a6
Merge remote-tracking branch 'upstream/master' into construction-z-order
jeisenbe Mar 7, 2020
4b0b83f
Add comments to explain inelegant z_order solution
jeisenbe Mar 7, 2020
623ff0c
Fix error in order of z_order operations
jeisenbe Mar 7, 2020
b0a5426
move highway construction lua transform to end
jeisenbe Mar 7, 2020
0d24484
order by constuction, add construction to lua but remove highway=cons…
jeisenbe Mar 8, 2020
dd1a0e9
Remove order by highway=construction - not needed
jeisenbe Mar 8, 2020
618a1b0
Improve comment for construction=null test
jeisenbe Mar 8, 2020
0cc1807
Set z_order=33 if no construction
jeisenbe Mar 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion openstreetmap-carto.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,33 @@ local roads_info = {
cycleway = {z = 100, roads = false},
steps = {z = 90, roads = false},
platform = {z = 90, roads = false},
construction = {z = 10, roads = false}
construction = {z = 33, roads = false}
},
construction = {
motorway = {z = 38, roads = false},
trunk = {z = 37, roads = false},
primary = {z = 36, roads = false},
secondary = {z = 35, roads = false},
tertiary = {z = 34, roads = false},
residential = {z = 33, roads = false},
unclassified = {z = 33, roads = false},
road = {z = 33, roads = false},
living_street = {z = 32, roads = false},
pedestrian = {z = 31, roads = false},
raceway = {z = 30, roads = false},
motorway_link = {z = 24, roads = false},
trunk_link = {z = 23, roads = false},
primary_link = {z = 22, roads = false},
secondary_link = {z = 21, roads = false},
tertiary_link = {z = 20, roads = false},
service = {z = 15, roads = false},
track = {z = 11, roads = false},
path = {z = 10, roads = false},
footway = {z = 10, roads = false},
bridleway = {z = 10, roads = false},
cycleway = {z = 10, roads = false},
steps = {z = 9, roads = false},
platform = {z = 9, roads = false},
},
railway = {
rail = {z = 440, roads = true},
Expand Down