diff --git a/data/colors.txt b/data/colors.txt index 8113534214..6137d4cc49 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -623,6 +623,8 @@ 3005358626 3006477107 3006694172 +3007916315 +3008113177 3008779519 3009559935 3010346311 @@ -630,6 +632,8 @@ 3016153515 3018761472 3019640347 +3019862822 +3019870528 3019898879 3226034505 3226891606 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 149a9c0278..f4915d7bae 100644 Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ diff --git a/data/drules_proto.txt b/data/drules_proto.txt index f29c38640e..7473c0d835 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -25095,6 +25095,16 @@ cont { } cont { name: "highway-motorway" + element { + scale: 6 + lines { + width: 0.8 + color: 3019862822 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -25379,6 +25389,16 @@ cont { } cont { name: "highway-motorway-bridge" + element { + scale: 6 + lines { + width: 0.8 + color: 3019862822 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -25759,6 +25779,16 @@ cont { } cont { name: "highway-motorway-tunnel" + element { + scale: 6 + lines { + width: 0.8 + color: 3019862822 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -37684,6 +37714,16 @@ cont { } cont { name: "highway-trunk" + element { + scale: 6 + lines { + width: 0.8 + color: 3019862822 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -37968,6 +38008,16 @@ cont { } cont { name: "highway-trunk-bridge" + element { + scale: 6 + lines { + width: 0.8 + color: 3019862822 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -38348,6 +38398,16 @@ cont { } cont { name: "highway-trunk-tunnel" + element { + scale: 6 + lines { + width: 0.8 + color: 3019862822 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin index 39e7c6475c..097a96d9ab 100644 Binary files a/data/drules_proto_default_dark.bin and b/data/drules_proto_default_dark.bin differ diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt index c993167b88..ef7d6e56f6 100644 --- a/data/drules_proto_default_dark.txt +++ b/data/drules_proto_default_dark.txt @@ -23415,6 +23415,16 @@ cont { } cont { name: "highway-motorway" + element { + scale: 6 + lines { + width: 0.8 + color: 3007916315 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -23710,6 +23720,16 @@ cont { } cont { name: "highway-motorway-bridge" + element { + scale: 6 + lines { + width: 0.8 + color: 3007916315 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -24101,6 +24121,16 @@ cont { } cont { name: "highway-motorway-tunnel" + element { + scale: 6 + lines { + width: 0.8 + color: 3007916315 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -35387,6 +35417,16 @@ cont { } cont { name: "highway-trunk" + element { + scale: 6 + lines { + width: 0.8 + color: 3007916315 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -35682,6 +35722,16 @@ cont { } cont { name: "highway-trunk-bridge" + element { + scale: 6 + lines { + width: 0.8 + color: 3007916315 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -36073,6 +36123,16 @@ cont { } cont { name: "highway-trunk-tunnel" + element { + scale: 6 + lines { + width: 0.8 + color: 3007916315 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin index 6a56fbf933..f1244c659f 100644 Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt index 9f542675e3..9fa599077b 100644 --- a/data/drules_proto_default_light.txt +++ b/data/drules_proto_default_light.txt @@ -23415,6 +23415,16 @@ cont { } cont { name: "highway-motorway" + element { + scale: 6 + lines { + width: 0.8 + color: 3019862822 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -23699,6 +23709,16 @@ cont { } cont { name: "highway-motorway-bridge" + element { + scale: 6 + lines { + width: 0.8 + color: 3019862822 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -24079,6 +24099,16 @@ cont { } cont { name: "highway-motorway-tunnel" + element { + scale: 6 + lines { + width: 0.8 + color: 3019862822 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -35183,6 +35213,16 @@ cont { } cont { name: "highway-trunk" + element { + scale: 6 + lines { + width: 0.8 + color: 3019862822 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -35467,6 +35507,16 @@ cont { } cont { name: "highway-trunk-bridge" + element { + scale: 6 + lines { + width: 0.8 + color: 3019862822 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -35847,6 +35897,16 @@ cont { } cont { name: "highway-trunk-tunnel" + element { + scale: 6 + lines { + width: 0.8 + color: 3019862822 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index 21ef12b476..2d8378a265 100644 Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index 3cf21cf2cb..43acf047cb 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -24664,6 +24664,16 @@ cont { } cont { name: "highway-motorway" + element { + scale: 6 + lines { + width: 0.8 + color: 1296640283 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -24959,6 +24969,16 @@ cont { } cont { name: "highway-motorway-bridge" + element { + scale: 6 + lines { + width: 0.8 + color: 1296640283 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -25350,6 +25370,16 @@ cont { } cont { name: "highway-motorway-tunnel" + element { + scale: 6 + lines { + width: 0.8 + color: 1296640283 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -37604,6 +37634,16 @@ cont { } cont { name: "highway-trunk" + element { + scale: 6 + lines { + width: 0.8 + color: 1296640283 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -37899,6 +37939,16 @@ cont { } cont { name: "highway-trunk-bridge" + element { + scale: 6 + lines { + width: 0.8 + color: 1296640283 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -38290,6 +38340,16 @@ cont { } cont { name: "highway-trunk-tunnel" + element { + scale: 6 + lines { + width: 0.8 + color: 1296640283 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin index c97c55e254..2df431999f 100644 Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt index a04fb8c6bc..4168abe7ac 100644 --- a/data/drules_proto_outdoors_light.txt +++ b/data/drules_proto_outdoors_light.txt @@ -24664,6 +24664,16 @@ cont { } cont { name: "highway-motorway" + element { + scale: 6 + lines { + width: 0.8 + color: 1308586790 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -24948,6 +24958,16 @@ cont { } cont { name: "highway-motorway-bridge" + element { + scale: 6 + lines { + width: 0.8 + color: 1308586790 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -25328,6 +25348,16 @@ cont { } cont { name: "highway-motorway-tunnel" + element { + scale: 6 + lines { + width: 0.8 + color: 1308586790 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -37400,6 +37430,16 @@ cont { } cont { name: "highway-trunk" + element { + scale: 6 + lines { + width: 0.8 + color: 1308586790 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -37684,6 +37724,16 @@ cont { } cont { name: "highway-trunk-bridge" + element { + scale: 6 + lines { + width: 0.8 + color: 1308586790 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -38064,6 +38114,16 @@ cont { } cont { name: "highway-trunk-tunnel" + element { + scale: 6 + lines { + width: 0.8 + color: 1308586790 + priority: 310 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index ad8e6ff16d..8a2c37da47 100644 Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index c3f7385fc9..c2572ffed6 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -9705,6 +9705,16 @@ cont { } cont { name: "highway-motorway" + element { + scale: 6 + lines { + width: 0.9 + color: 3008113177 + priority: 250 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -10053,6 +10063,16 @@ cont { } cont { name: "highway-motorway-bridge" + element { + scale: 6 + lines { + width: 0.9 + color: 3008113177 + priority: 250 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -10497,6 +10517,16 @@ cont { } cont { name: "highway-motorway-tunnel" + element { + scale: 6 + lines { + width: 0.9 + color: 3008113177 + priority: 250 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -20197,6 +20227,16 @@ cont { } cont { name: "highway-trunk" + element { + scale: 6 + lines { + width: 0.9 + color: 3008113177 + priority: 250 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -20545,6 +20585,16 @@ cont { } cont { name: "highway-trunk-bridge" + element { + scale: 6 + lines { + width: 0.9 + color: 3008113177 + priority: 250 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -20989,6 +21039,16 @@ cont { } cont { name: "highway-trunk-tunnel" + element { + scale: 6 + lines { + width: 0.9 + color: 3008113177 + priority: 250 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin index 04dfb6bec2..bb9736db03 100644 Binary files a/data/drules_proto_vehicle_light.bin and b/data/drules_proto_vehicle_light.bin differ diff --git a/data/drules_proto_vehicle_light.txt b/data/drules_proto_vehicle_light.txt index 6f8fff0a86..ad7c1e116b 100644 --- a/data/drules_proto_vehicle_light.txt +++ b/data/drules_proto_vehicle_light.txt @@ -9705,6 +9705,16 @@ cont { } cont { name: "highway-motorway" + element { + scale: 6 + lines { + width: 0.9 + color: 3019870528 + priority: 250 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -10031,6 +10041,16 @@ cont { } cont { name: "highway-motorway-bridge" + element { + scale: 6 + lines { + width: 0.9 + color: 3019870528 + priority: 250 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -10453,6 +10473,16 @@ cont { } cont { name: "highway-motorway-tunnel" + element { + scale: 6 + lines { + width: 0.9 + color: 3019870528 + priority: 250 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -19789,6 +19819,16 @@ cont { } cont { name: "highway-trunk" + element { + scale: 6 + lines { + width: 0.9 + color: 3019870528 + priority: 250 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -20115,6 +20155,16 @@ cont { } cont { name: "highway-trunk-bridge" + element { + scale: 6 + lines { + width: 0.9 + color: 3019870528 + priority: 250 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { @@ -20537,6 +20587,16 @@ cont { } cont { name: "highway-trunk-tunnel" + element { + scale: 6 + lines { + width: 0.9 + color: 3019870528 + priority: 250 + join: BEVELJOIN + cap: BUTTCAP + } + } element { scale: 7 lines { diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt index b460d63c8b..c61f4fce1b 100644 --- a/data/styles/default/include/priorities_3_FG.prio.txt +++ b/data/styles/default/include/priorities_3_FG.prio.txt @@ -74,18 +74,18 @@ railway-tram-bridge # line z13- railway-tram-tunnel # line z13- === 320 -highway-motorway # line z7- (also has pathtext z10-, shield::shield z10-) -highway-motorway-bridge # line z7- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -highway-motorway-tunnel # line z7- (also has line(casing) z12-, pathtext z10-, shield::shield z10-) -highway-trunk # line z7- (also has pathtext z10-, shield::shield z10-) -highway-trunk-bridge # line z7- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -highway-trunk-tunnel # line z7- (also has line(casing) z12-, pathtext z10-, shield::shield z10-) +highway-motorway # line z6- (also has pathtext z10-, shield::shield z10-) +highway-motorway-bridge # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +highway-motorway-tunnel # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-) +highway-trunk # line z6- (also has pathtext z10-, shield::shield z10-) +highway-trunk-bridge # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +highway-trunk-tunnel # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-) highway-world_level # line z4-9 highway-world_towns_level # line z6-9 === 310 -# highway-motorway-tunnel # line(casing) z12- (also has line z7-, pathtext z10-, shield::shield z10-) -# highway-trunk-tunnel # line(casing) z12- (also has line z7-, pathtext z10-, shield::shield z10-) +# highway-motorway-tunnel # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-) # === 309 highway-primary # line z8- (also has pathtext z10-, shield::shield z10-) @@ -309,7 +309,7 @@ highway-path-tunnel # line z14- (also has line:: highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-) highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z17-, pathtext z15-) highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-) -highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) +highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) highway-path-bridge::bridgewhite # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-) highway-pedestrian-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-) @@ -324,7 +324,7 @@ highway-steps-bridge::bridgewhite # line::bridgewhite z15- (al highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-) highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-) highway-track-bridge::bridgewhite # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-) -highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) +highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-) railway-abandoned-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-) @@ -343,7 +343,7 @@ railway-subway-bridge::bridgewhite # line::bridgewhite z13- (al highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-) highway-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z13-, line::bridgewhite z15-, pathtext z15-) highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-) -highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) highway-path-bridge::bridgeblack # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-) highway-pedestrian-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-) @@ -358,7 +358,7 @@ highway-steps-bridge::bridgeblack # line::bridgeblack z17- (al highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-) highway-track-bridge::bridgeblack # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-) -highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-) railway-abandoned-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-) diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 72f1fd8b4f..7b791132b2 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -78,20 +78,20 @@ amenity-ferry_terminal # icon z11- (also has captio railway-station # icon z12- (also has caption(optional) z12-) === 6800 -highway-motorway # pathtext z10- (also has shield::shield z10-, line z7-) -highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z7-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z7-, line(casing) z12-) -highway-trunk # pathtext z10- (also has shield::shield z10-, line z7-) -highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z7-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z7-, line(casing) z12-) +highway-motorway # pathtext z10- (also has shield::shield z10-, line z6-) +highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-) +highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-) +highway-trunk # pathtext z10- (also has shield::shield z10-, line z6-) +highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-) +highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-) === 6750 -highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z7-) -highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z7-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z7-, line(casing) z12-) -highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z7-) -highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z7-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z7-, line(casing) z12-) +highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z6-) +highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-) +highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-) +highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z6-) +highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-) +highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-) === 6740 boundary-aboriginal_lands # caption z10-16 (also has area z10-16) diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 53872b107b..24ee35f0ca 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -74,18 +74,18 @@ railway-tram-bridge # line z13- railway-tram-tunnel # line z13- === 320 -highway-motorway # line z7- (also has pathtext z10-, shield::shield z10-) -highway-motorway-bridge # line z7- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -highway-motorway-tunnel # line z7- (also has line(casing) z12-, pathtext z10-, shield::shield z10-) -highway-trunk # line z7- (also has pathtext z10-, shield::shield z10-) -highway-trunk-bridge # line z7- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -highway-trunk-tunnel # line z7- (also has line(casing) z12-, pathtext z10-, shield::shield z10-) +highway-motorway # line z6- (also has pathtext z10-, shield::shield z10-) +highway-motorway-bridge # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +highway-motorway-tunnel # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-) +highway-trunk # line z6- (also has pathtext z10-, shield::shield z10-) +highway-trunk-bridge # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +highway-trunk-tunnel # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-) highway-world_level # line z4-9 highway-world_towns_level # line z6-9 === 310 -# highway-motorway-tunnel # line(casing) z12- (also has line z7-, pathtext z10-, shield::shield z10-) -# highway-trunk-tunnel # line(casing) z12- (also has line z7-, pathtext z10-, shield::shield z10-) +# highway-motorway-tunnel # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-) # === 309 highway-primary # line z8- (also has pathtext z10-, shield::shield z10-) @@ -309,7 +309,7 @@ highway-path-tunnel # line z11- (also has line:: highway-bridleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) highway-cycleway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) highway-footway-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) -highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) +highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) highway-path-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) highway-pedestrian-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-) @@ -324,7 +324,7 @@ highway-steps-bridge::bridgewhite # line::bridgewhite z15- (al highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-) highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z18-) highway-track-bridge::bridgewhite # line::bridgewhite z15- (also has line z11-, line::bridgeblack z17-, pathtext z13-) -highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) +highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-) highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-) highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-) railway-abandoned-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-) @@ -343,7 +343,7 @@ railway-subway-bridge::bridgewhite # line::bridgewhite z13- (al highway-bridleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) highway-cycleway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) highway-footway-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) -highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) highway-path-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) highway-pedestrian-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-) @@ -358,7 +358,7 @@ highway-steps-bridge::bridgeblack # line::bridgeblack z17- (al highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-) highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z18-) highway-track-bridge::bridgeblack # line::bridgeblack z17- (also has line z11-, line::bridgewhite z15-, pathtext z13-) -highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-) highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-) railway-abandoned-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-) diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 148c2317b9..51c785860a 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -78,20 +78,20 @@ amenity-ferry_terminal # icon z11- (also has captio railway-station # icon z12- (also has caption(optional) z12-) === 6800 -highway-motorway # pathtext z10- (also has shield::shield z10-, line z7-) -highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z7-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z7-, line(casing) z12-) -highway-trunk # pathtext z10- (also has shield::shield z10-, line z7-) -highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z7-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z7-, line(casing) z12-) +highway-motorway # pathtext z10- (also has shield::shield z10-, line z6-) +highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-) +highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-) +highway-trunk # pathtext z10- (also has shield::shield z10-, line z6-) +highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-) +highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-) === 6750 -highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z7-) -highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z7-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z7-, line(casing) z12-) -highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z7-) -highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z7-, line::bridgeblack z13-, line::bridgewhite z13-) -highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z7-, line(casing) z12-) +highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z6-) +highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-) +highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-) +highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z6-) +highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-) +highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-) === 6740 boundary-aboriginal_lands # caption z10-16 (also has area z10-16) diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt index d0ae8468e7..5f8a41ba47 100644 --- a/data/styles/vehicle/include/priorities_3_FG.prio.txt +++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt @@ -39,22 +39,22 @@ railway-tram-bridge # line z16- (also has line:: railway-tram-tunnel # line z16- (also has line::centerline z16-) === 260 -highway-motorway # line z7- (also has line(casing) z14-, pathtext z10-, shield::shield z10-) -highway-motorway-bridge # line z7- (also has line::bridgeblack z13-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield::shield z10-) -highway-motorway-tunnel # line z7- (also has line(casing) z12-, pathtext z10-, shield::shield z10-) -highway-trunk # line z7- (also has line(casing) z14-, pathtext z10-, shield::shield z10-) -highway-trunk-bridge # line z7- (also has line::bridgeblack z13-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield::shield z10-) -highway-trunk-tunnel # line z7- (also has line(casing) z12-, pathtext z10-, shield::shield z10-) +highway-motorway # line z6- (also has line(casing) z14-, pathtext z10-, shield::shield z10-) +highway-motorway-bridge # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield::shield z10-) +highway-motorway-tunnel # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-) +highway-trunk # line z6- (also has line(casing) z14-, pathtext z10-, shield::shield z10-) +highway-trunk-bridge # line z6- (also has line::bridgeblack z13-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield::shield z10-) +highway-trunk-tunnel # line z6- (also has line(casing) z12-, pathtext z10-, shield::shield z10-) highway-world_level # line z4-9 highway-world_towns_level # line z6-9 === 250 -# highway-motorway # line(casing) z14- (also has line z7-, pathtext z10-, shield::shield z10-) -# highway-motorway-bridge # line(casing) z14- (also has line z7-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -# highway-motorway-tunnel # line(casing) z12- (also has line z7-, pathtext z10-, shield::shield z10-) -# highway-trunk # line(casing) z14- (also has line z7-, pathtext z10-, shield::shield z10-) -# highway-trunk-bridge # line(casing) z14- (also has line z7-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) -# highway-trunk-tunnel # line(casing) z12- (also has line z7-, pathtext z10-, shield::shield z10-) +# highway-motorway # line(casing) z14- (also has line z6-, pathtext z10-, shield::shield z10-) +# highway-motorway-bridge # line(casing) z14- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-motorway-tunnel # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-) +# highway-trunk # line(casing) z14- (also has line z6-, pathtext z10-, shield::shield z10-) +# highway-trunk-bridge # line(casing) z14- (also has line z6-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-) +# highway-trunk-tunnel # line(casing) z12- (also has line z6-, pathtext z10-, shield::shield z10-) # === 249 highway-footway-crossing # line z18- @@ -277,7 +277,7 @@ railway-preserved-bridge # line z16- (also has line:: railway-preserved-tunnel # line z16- === 120 -highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, line(casing) z14-, pathtext z10-, shield::shield z10-) +highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-motorway_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-primary-bridge::bridgewhite # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-primary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, line(casing) z14-, pathtext z11-, shield::shield z11-) @@ -286,7 +286,7 @@ highway-secondary-bridge::bridgewhite # line::bridgewhite z14- (al highway-secondary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::bridgeblack z14-, line(casing) z14-, pathtext z16-) highway-tertiary-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, line(casing) z15-, pathtext z12-, shield::shield z13-) highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, line(casing) z15-, pathtext z18-) -highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, line(casing) z14-, pathtext z10-, shield::shield z10-) +highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z14-) railway-abandoned-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-) @@ -302,7 +302,7 @@ railway-rail-utility-bridge::bridgewhite # line::bridgewhite z14- (al railway-subway-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::bridgeblack z16-, line::dash z16-) === 110 -highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield::shield z10-) +highway-motorway-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-motorway_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-primary-bridge::bridgeblack # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-primary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, line(casing) z14-, pathtext z11-, shield::shield z11-) @@ -311,7 +311,7 @@ highway-secondary-bridge::bridgeblack # line::bridgeblack z14- (al highway-secondary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z13-, line::bridgewhite z14-, line(casing) z14-, pathtext z16-) highway-tertiary-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z13-) highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, line(casing) z15-, pathtext z18-) -highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield::shield z10-) +highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-) highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z14-) railway-abandoned-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-) diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index 0df19c9aa1..c80e64ee68 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -16,20 +16,20 @@ highway-speed_camera # icon z13- === 4400 -highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z7-, line(casing) z14-) -highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z7-, line::bridgeblack z13-, line::bridgewhite z13-, line(casing) z14-) -highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z7-, line(casing) z12-) -highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z7-, line(casing) z14-) -highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z7-, line::bridgeblack z13-, line::bridgewhite z13-, line(casing) z14-) -highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z7-, line(casing) z12-) +highway-motorway::shield # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z14-) +highway-motorway-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-, line(casing) z14-) +highway-motorway-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-) +highway-trunk::shield # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z14-) +highway-trunk-bridge::shield # shield::shield z10- (also has pathtext z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-, line(casing) z14-) +highway-trunk-tunnel::shield # shield::shield z10- (also has pathtext z10-, line z6-, line(casing) z12-) === 4360 -highway-motorway # pathtext z10- (also has shield::shield z10-, line z7-, line(casing) z14-) -highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z7-, line::bridgeblack z13-, line::bridgewhite z13-, line(casing) z14-) -highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z7-, line(casing) z12-) -highway-trunk # pathtext z10- (also has shield::shield z10-, line z7-, line(casing) z14-) -highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z7-, line::bridgeblack z13-, line::bridgewhite z13-, line(casing) z14-) -highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z7-, line(casing) z12-) +highway-motorway # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z14-) +highway-motorway-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-, line(casing) z14-) +highway-motorway-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-) +highway-trunk # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z14-) +highway-trunk-bridge # pathtext z10- (also has shield::shield z10-, line z6-, line::bridgeblack z13-, line::bridgewhite z13-, line(casing) z14-) +highway-trunk-tunnel # pathtext z10- (also has shield::shield z10-, line z6-, line(casing) z12-) === 4350 highway-primary # pathtext z10- (also has shield::shield z10-, line z8-, line(casing) z14-) diff --git a/data/visibility.txt b/data/visibility.txt index 16e9bdb8e3..91ceadf5c6 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -426,9 +426,9 @@ world 000000000000000000000 + bridge 000000000000111111111 - tunnel 000000000000111111111 - {} - motorway 000000011111111111111 + - bridge 000000011111111111111 - - tunnel 000000011111111111111 - + motorway 000000111111111111111 + + bridge 000000111111111111111 - + tunnel 000000111111111111111 - {} motorway_junction 000000000000000111111 - motorway_link 000000000011111111111 + @@ -503,9 +503,9 @@ world 000000000000000000000 + tunnel 000000000000000000000 - {} traffic_signals 000000000000000000000 - - trunk 000000011111111111111 + - bridge 000000011111111111111 - - tunnel 000000011111111111111 - + trunk 000000111111111111111 + + bridge 000000111111111111111 - + tunnel 000000111111111111111 - {} trunk_link 000000000011111111111 + bridge 000000000011111111111 -