Skip to content

fix(SWRDataLabDark): Fix hard-coded bridge line-color #404

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

Merged
awesomephant merged 2 commits into from
Jun 2, 2026
Merged

fix(SWRDataLabDark): Fix hard-coded bridge line-color #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8633886
Fix bridge-street-track colours, refactor some walking layers
awesomephant Jun 2, 2026
49dfe19
Merge branch 'main' into fix-398
awesomephant Jun 2, 2026
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
21 changes: 21 additions & 0 deletions components/src/maplibre/MapStyle/SWRDataLabDark.stories.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,27 @@
</div>
</DesignTokens>
</Story>
<Story asChild name="fix/398">
<DesignTokens theme="dark">
<div class="grid">
<div class="container">
<Map
showDebug
style={SWRDataLabDark()}
maxZoom={20}
initialLocation={{
lng: 6.19604542728689,
lat: 50.029196152971906,
zoom: 16.901165450738834,
pitch: 0
}}
>
<AttributionControl position="bottom-left" />
</Map>
</div>
</div>
</DesignTokens>
</Story>

<style>
.grid {
Expand Down
47 changes: 10 additions & 37 deletions components/src/maplibre/MapStyle/components/Walking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,8 +492,6 @@ export default function makeWalking(tokens): any {
const walkingSurface: Layer[] = [
{
id: 'way-footway:case',
type: 'line',
'source-layer': 'streets',
filter: ['all', ['!=', 'bridge', true], ['!=', 'tunnel', true], ['in', 'kind', 'footway']],
layout: {
'line-cap': 'round'
Expand All @@ -514,8 +512,6 @@ export default function makeWalking(tokens): any {
},
{
id: 'way-steps:case',
type: 'line',
'source-layer': 'streets',
filter: ['all', ['!=', 'bridge', true], ['!=', 'tunnel', true], ['in', 'kind', 'steps']],
minzoom: 15,
layout: {
Expand All @@ -536,8 +532,6 @@ export default function makeWalking(tokens): any {
},
{
id: 'way-path:case',
type: 'line',
'source-layer': 'streets',
filter: ['all', ['!=', 'bridge', true], ['!=', 'tunnel', true], ['in', 'kind', 'path']],
minzoom: 15,
layout: {
Expand All @@ -558,8 +552,6 @@ export default function makeWalking(tokens): any {
},
{
id: 'way-cycleway:case',
type: 'line',
'source-layer': 'streets',
filter: ['all', ['!=', 'bridge', true], ['!=', 'tunnel', true], ['in', 'kind', 'cycleway']],
layout: {
'line-cap': 'round'
Expand All @@ -580,8 +572,6 @@ export default function makeWalking(tokens): any {
},
{
id: 'street-track:case',
type: 'line',
'source-layer': 'streets',
filter: ['all', ['==', 'kind', 'track'], ['!=', 'bridge', true], ['!=', 'tunnel', true]],
paint: {
'line-color': tokens.street_secondary_case,
Expand All @@ -601,15 +591,10 @@ export default function makeWalking(tokens): any {
]
}
},
layout: {
'line-join': 'round',
'line-cap': 'round'
}
layout: street_layout
},
{
id: 'street-pedestrian:case',
type: 'line',
'source-layer': 'streets',
filter: ['all', ['==', 'kind', 'pedestrian'], ['!=', 'bridge', true], ['!=', 'tunnel', true]],
paint: {
'line-color': tokens.street_tertiary_case,
Expand All @@ -634,8 +619,6 @@ export default function makeWalking(tokens): any {
},
{
id: 'way-footway',
type: 'line',
'source-layer': 'streets',
filter: ['all', ['!=', 'bridge', true], ['!=', 'tunnel', true], ['in', 'kind', 'footway']],
layout: {
'line-cap': 'round'
Expand All @@ -656,8 +639,6 @@ export default function makeWalking(tokens): any {
},
{
id: 'way-steps',
type: 'line',
'source-layer': 'streets',
filter: ['all', ['!=', 'bridge', true], ['!=', 'tunnel', true], ['in', 'kind', 'steps']],
layout: {
'line-cap': 'round'
Expand All @@ -678,8 +659,6 @@ export default function makeWalking(tokens): any {
},
{
id: 'way-path',
type: 'line',
'source-layer': 'streets',
filter: ['all', ['!=', 'bridge', true], ['!=', 'tunnel', true], ['in', 'kind', 'path']],
layout: {
'line-cap': 'round'
Expand All @@ -700,8 +679,6 @@ export default function makeWalking(tokens): any {
},
{
id: 'way-cycleway',
type: 'line',
'source-layer': 'streets',
filter: ['all', ['!=', 'bridge', true], ['!=', 'tunnel', true], ['in', 'kind', 'cycleway']],
layout: {
'line-cap': 'round'
Expand All @@ -722,8 +699,6 @@ export default function makeWalking(tokens): any {
},
{
id: 'street-track',
type: 'line',
'source-layer': 'streets',
filter: ['all', ['==', 'kind', 'track'], ['!=', 'bridge', true], ['!=', 'tunnel', true]],
paint: {
'line-color': tokens.street_tertiary,
Expand All @@ -747,8 +722,6 @@ export default function makeWalking(tokens): any {
},
{
id: 'street-pedestrian',
type: 'line',
'source-layer': 'streets',
filter: ['all', ['==', 'kind', 'pedestrian'], ['!=', 'bridge', true], ['!=', 'tunnel', true]],
paint: {
'line-color': tokens.street_tertiary,
Expand All @@ -772,7 +745,7 @@ export default function makeWalking(tokens): any {
layout: street_layout
}
].map((el) => {
return { source: 'versatiles-osm', ...el } as Layer;
return { source: 'versatiles-osm', 'source-layer': 'streets', type: 'line', ...el } as Layer;
});

const walkingBridges: Layer[] = [
Expand Down Expand Up @@ -875,7 +848,7 @@ export default function makeWalking(tokens): any {
id: 'bridge-street-track:case',
filter: ['all', ['==', 'kind', 'track'], ['==', 'bridge', true]],
paint: {
'line-color': tokens.street_tertiary_case,
'line-color': tokens.street_secondary_case,
'line-width': {
stops: [
[14, 2],
Expand Down Expand Up @@ -934,7 +907,7 @@ export default function makeWalking(tokens): any {
[20, 20]
]
},
'line-color': 'rgb(245,245,245)'
'line-color': tokens.street_tertiary
},
minzoom: 15
},
Expand All @@ -954,7 +927,7 @@ export default function makeWalking(tokens): any {
[20, 20]
]
},
'line-color': 'rgb(245,245,245)'
'line-color': tokens.street_tertiary
},
minzoom: 15
},
Expand All @@ -974,7 +947,7 @@ export default function makeWalking(tokens): any {
[20, 20]
]
},
'line-color': 'rgb(245,245,245)'
'line-color': tokens.street_tertiary
},
minzoom: 15
},
Expand All @@ -994,15 +967,15 @@ export default function makeWalking(tokens): any {
[20, 20]
]
},
'line-color': 'hsl(203,0%,97%)'
'line-color': tokens.street_tertiary
},
minzoom: 15
},
{
id: 'bridge-street-track',
filter: ['all', ['==', 'kind', 'track'], ['==', 'bridge', true]],
paint: {
'line-color': 'hsl(0,0%,100%)',
'line-color': tokens.street_tertiary,
'line-width': {
stops: [
[14, 1],
Expand Down Expand Up @@ -1054,7 +1027,7 @@ export default function makeWalking(tokens): any {
['==', 'bridge', true]
],
paint: {
'line-color': 'hsl(0,0%,100%)'
'line-color': tokens.street_tertiary
},
layout: street_layout
},
Expand All @@ -1067,7 +1040,7 @@ export default function makeWalking(tokens): any {
['==', 'bridge', true]
],
paint: {
'line-color': 'hsl(203,0%,97%)',
'line-color': tokens.street_tertiary,
'line-width': {
stops: [
[12, 1],
Expand Down
Loading