Skip to content

Commit 9688778

Browse files
author
Andy Townsend
committed
Copy bridge logic for service, living_street, unclassified,
and `tertiary` to `motorway` from svwd01 to svwd03.
1 parent 51a7acb commit 9688778

File tree

2 files changed

+156
-39
lines changed

2 files changed

+156
-39
lines changed

‎resources/changelog_svwd03.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
See also the [changelog](https://github.com/SomeoneElseOSM/SomeoneElse-vector-web-display/blob/main/changelog.md) for the scripts here.
33

44
## As yet unreleased
5-
Copy bridge logic for `service`, `living_street`, `unclassified`, `tertiary` and `secondary` from svwd01 to svwd03.
5+
Copy bridge logic for `service`, `living_street`, `unclassified`, and `tertiary` to `motorway` from svwd01 to svwd03.
66

77
## 30/11/2025
88
Merge `highway=living_street` processing from [parent style](https://github.com/SomeoneElseOSM/SomeoneElse-vector-web-display/blob/main/resources/README_svwd01.md). This added a casing (the previous version did not work if _not_ over residential) and also improved the bridge display for living streets.

‎resources/svwd03_style.json‎

Lines changed: 155 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3730,21 +3730,18 @@
37303730
"source": "someoneelse",
37313731
"source-layer": "streets",
37323732
"minzoom": 7,
3733-
"filter": [
3734-
"all",
3735-
[ "in", "kind", "primary",
3736-
"primary_link" ],
3737-
[ "==", "bridge", true ]
3738-
],
3733+
"filter": [ "all", [ "in", "kind", "primary",
3734+
"primary_link" ],
3735+
[ "==", "bridge", true ] ],
37393736
"layout": { "line-cap": "butt", "line-join": "round", "visibility": "visible" },
37403737
"paint": {
37413738
"line-color": "black",
37423739
"line-width": {
37433740
"base": 2.0,
37443741
"stops": [
3745-
[ 7, 1.4 ],
3746-
[ 9, 2.8 ],
3747-
[ 20, 86.0 ]
3742+
[ 6, 2.4 ],
3743+
[ 9, 4.8 ],
3744+
[ 20, 120.0 ]
37483745
]
37493746
}
37503747
}
@@ -3755,21 +3752,18 @@
37553752
"source": "someoneelse",
37563753
"source-layer": "streets",
37573754
"minzoom": 6,
3758-
"filter": [
3759-
"all",
3760-
[ "in", "kind", "trunk",
3761-
"trunk_link" ],
3762-
[ "==", "bridge", true ]
3763-
],
3755+
"filter": [ "all", [ "in", "kind", "trunk",
3756+
"trunk_link" ],
3757+
[ "==", "bridge", true ] ],
37643758
"layout": { "line-cap": "butt", "line-join": "round", "visibility": "visible" },
37653759
"paint": {
37663760
"line-color": "black",
37673761
"line-width": {
37683762
"base": 2.0,
37693763
"stops": [
3770-
[ 6, 1.0 ],
3771-
[ 9, 2.8 ],
3772-
[ 20, 86.0 ]
3764+
[ 6, 2.4 ],
3765+
[ 9, 4.8 ],
3766+
[ 20, 120.0 ]
37733767
]
37743768
}
37753769
}
@@ -3780,20 +3774,18 @@
37803774
"source": "someoneelse",
37813775
"source-layer": "streets",
37823776
"minzoom": 5,
3783-
"filter": [
3784-
"all",
3785-
[ "in", "kind", "motorway",
3786-
"motorway_link" ],
3787-
[ "==", "bridge", true ]
3788-
],
3777+
"filter": [ "all", [ "in", "kind", "motorway",
3778+
"motorway_link" ],
3779+
[ "==", "bridge", true ] ],
37893780
"layout": { "line-cap": "butt", "line-join": "round", "visibility": "visible" },
37903781
"paint": {
37913782
"line-color": "black",
37923783
"line-width": {
37933784
"base": 2.0,
37943785
"stops": [
3795-
[ 5, 1.0 ],
3796-
[ 20, 86.0 ]
3786+
[ 6, 2.4 ],
3787+
[ 9, 4.8 ],
3788+
[ 20, 120.0 ]
37973789
]
37983790
}
37993791
}
@@ -4005,6 +3997,72 @@
40053997
}
40063998
}
40073999
},
4000+
{
4001+
"id": "highway-primary-bridgeprefill-7",
4002+
"type": "line",
4003+
"source": "someoneelse",
4004+
"source-layer": "streets",
4005+
"minzoom": 7,
4006+
"filter": [ "all", [ "in", "kind", "primary",
4007+
"primary_link" ],
4008+
[ "==", "bridge", true ] ],
4009+
"layout": { "line-cap": "butt", "line-join": "round", "visibility": "visible" },
4010+
"paint": {
4011+
"line-color": "#f2efe9",
4012+
"line-width": {
4013+
"base": 2.0,
4014+
"stops": [
4015+
[ 6, 2.0 ],
4016+
[ 9, 4.0 ],
4017+
[ 20, 100.0 ]
4018+
]
4019+
}
4020+
}
4021+
},
4022+
{
4023+
"id": "highway-trunk-bridgeprefill-6",
4024+
"type": "line",
4025+
"source": "someoneelse",
4026+
"source-layer": "streets",
4027+
"minzoom": 6,
4028+
"filter": [ "all", [ "in", "kind", "trunk",
4029+
"trunk_link" ],
4030+
[ "==", "bridge", true ] ],
4031+
"layout": { "line-cap": "butt", "line-join": "round", "visibility": "visible" },
4032+
"paint": {
4033+
"line-color": "#f2efe9",
4034+
"line-width": {
4035+
"base": 2.0,
4036+
"stops": [
4037+
[ 6, 2.0 ],
4038+
[ 9, 4.0 ],
4039+
[ 20, 100.0 ]
4040+
]
4041+
}
4042+
}
4043+
},
4044+
{
4045+
"id": "highway-motorway-bridgeprefill-5",
4046+
"type": "line",
4047+
"source": "someoneelse",
4048+
"source-layer": "streets",
4049+
"minzoom": 5,
4050+
"filter": [ "all", [ "in", "kind", "motorway",
4051+
"motorway_link" ],
4052+
[ "==", "bridge", true ] ],
4053+
"layout": { "line-cap": "butt", "line-join": "round", "visibility": "visible" },
4054+
"paint": {
4055+
"line-color": "#f2efe9",
4056+
"line-width": {
4057+
"base": 2.0,
4058+
"stops": [
4059+
[ 6, 2.0 ],
4060+
[ 9, 4.0 ],
4061+
[ 20, 100.0 ]
4062+
]
4063+
}
4064+
}
4065+
},
40084066
{
40094067
"id": "highway-service-bridgeinnercasing-12",
40104068
"type": "line",
@@ -4111,6 +4169,71 @@
41114169
}
41124170
}
41134171
},
4172+
{
4173+
"id": "highway-primary-bridgeinnercasing-7",
4174+
"type": "line",
4175+
"source": "someoneelse",
4176+
"source-layer": "streets",
4177+
"minzoom": 7,
4178+
"filter": [ "all", [ "in", "kind", "primary",
4179+
"primary_link" ],
4180+
[ "==", "bridge", true ] ],
4181+
"layout": { "line-cap": "butt", "line-join": "round", "visibility": "visible" },
4182+
"paint": {
4183+
"line-color": "#c57b7e",
4184+
"line-width": {
4185+
"base": 2.0,
4186+
"stops": [
4187+
[ 7, 1.4 ],
4188+
[ 9, 2.8 ],
4189+
[ 20, 86.0 ]
4190+
]
4191+
}
4192+
}
4193+
},
4194+
{
4195+
"id": "highway-trunk-bridgeinnercasing-6",
4196+
"type": "line",
4197+
"source": "someoneelse",
4198+
"source-layer": "streets",
4199+
"minzoom": 6,
4200+
"filter": [ "all", [ "in", "kind", "trunk",
4201+
"trunk_link" ],
4202+
[ "==", "bridge", true ] ],
4203+
"layout": { "line-cap": "butt", "line-join": "round", "visibility": "visible" },
4204+
"paint": {
4205+
"line-color": "#800000",
4206+
"line-width": {
4207+
"base": 2.0,
4208+
"stops": [
4209+
[ 6, 1.0 ],
4210+
[ 9, 2.8 ],
4211+
[ 20, 86.0 ]
4212+
]
4213+
}
4214+
}
4215+
},
4216+
{
4217+
"id": "highway-motorway-bridgeinnercasing-5",
4218+
"type": "line",
4219+
"source": "someoneelse",
4220+
"source-layer": "streets",
4221+
"minzoom": 5,
4222+
"filter": [ "all", [ "in", "kind", "motorway",
4223+
"motorway_link" ],
4224+
[ "==", "bridge", true ] ],
4225+
"layout": { "line-cap": "butt", "line-join": "round", "visibility": "visible" },
4226+
"paint": {
4227+
"line-color": "#7788a1",
4228+
"line-width": {
4229+
"base": 2.0,
4230+
"stops": [
4231+
[ 6, 1.0 ],
4232+
[ 20, 86.0 ]
4233+
]
4234+
}
4235+
}
4236+
},
41144237
{
41154238
"id": "highway-footwaynarrow-bridgefill-12",
41164239
"type": "line",
@@ -5015,12 +5138,9 @@
50155138
"source": "someoneelse",
50165139
"source-layer": "streets",
50175140
"minzoom": 7,
5018-
"filter": [
5019-
"all",
5020-
[ "in", "kind", "primary",
5021-
"primary_link" ],
5022-
[ "==", "bridge", true ]
5023-
],
5141+
"filter": [ "all", [ "in", "kind", "primary",
5142+
"primary_link" ],
5143+
[ "==", "bridge", true ] ],
50245144
"layout": { "line-cap": "round", "line-join": "round", "visibility": "visible" },
50255145
"paint": {
50265146
"line-color": "#dd9f9f",
@@ -5040,12 +5160,9 @@
50405160
"source": "someoneelse",
50415161
"source-layer": "streets",
50425162
"minzoom": 6,
5043-
"filter": [
5044-
"all",
5045-
[ "in", "kind", "trunk",
5046-
"trunk_link" ],
5047-
[ "==", "bridge", true ]
5048-
],
5163+
"filter": [ "all", [ "in", "kind", "trunk",
5164+
"trunk_link" ],
5165+
[ "==", "bridge", true ] ],
50495166
"layout": { "line-cap": "round", "line-join": "round", "visibility": "visible" },
50505167
"paint": {
50515168
"line-color": "#dd9f9f",

0 commit comments

Comments
 (0)