Skip to content

fix(SWRDataLabLight): Improve roads at z13 #105

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 1 commit into from
Jul 29, 2025
Merged

fix(SWRDataLabLight): Improve roads at z13 #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion components/src/maplibre/MapStyle/SWRDataLabLight.stories.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

const locations = {
germany: { lng: 10.962488768573053, lat: 50.958636214954396, zoom: 6 },
stugge: { lng: 9.17985, lat: 48.7763, zoom: 10.3418 },
stugge: { lng: 9.181, lat: 48.772, zoom: 13.5 },
berlin: { lng: 13.399, lat: 52.5159, zoom: 12.1977 },
frankfurt: { lng: 8.68834, lat: 50.1082, zoom: 11.7923 },
badenBaden: { lng: 8.23986, lat: 48.7595, zoom: 14.99, pitch: 0 },
Expand Down Expand Up @@ -77,6 +77,17 @@
</div>
</DesignTokens>
</Story>
<Story asChild name="Stuttgart z13">
<DesignTokens>
<div class="grid">
<div class="container">
<Map showDebug style={SWRDataLabLight()} initialLocation={locations.stugge}>
<AttributionControl position="bottom-left" />
</Map>
</div>
</div>
</DesignTokens>
</Story>
<Story asChild name="Baden-Baden z15">
<DesignTokens>
<div class="grid">
Expand Down
39 changes: 20 additions & 19 deletions components/src/maplibre/MapStyle/components/Roads.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,8 @@ const street_primary = {
line_width: {
stops: [
[8, 0],
[10, 1],
[12, 2],
[14, 3],
[13, 1],
[15, 2],
[16, 10],
[18, 34],
[19, 70],
Expand All @@ -87,9 +86,9 @@ const street_primary_case = {
line_color: tokens.street_primary_case,
line_width: {
stops: [
[11, 0],
[12, 2],
[14, 5],
[8, 0],
[13, 2],
[15, 4],
[16, 12],
[18, 36],
[19, 74],
Expand All @@ -105,11 +104,12 @@ const street_primary_case = {
};

const street_secondary = {
line_color: tokens.street_secondary,
line_width: {
stops: [
[11, 1],
[14, 4],
[16, 6],
[12, 1],
[14, 2],
[16, 8],
[18, 28],
[19, 64],
[20, 130]
Expand All @@ -119,10 +119,11 @@ const street_secondary = {
const street_secondary_case = {
line_width: {
stops: [
[12, 2],
[14, 5],
[16, 7],
[18, 14],
[12, 0],
[14, 3],
[16, 10],
[18, 30],
[19, 66],
[20, 40]
]
}
Expand Down Expand Up @@ -1227,8 +1228,8 @@ export default function makeRoads() {
},
'line-opacity': {
stops: [
[12, 0],
[13, 1]
[13, 0],
[14, 1]
]
}
},
Expand Down Expand Up @@ -1271,8 +1272,8 @@ export default function makeRoads() {
},
'line-opacity': {
stops: [
[12, 0],
[13, 1]
[13, 0],
[14, 1]
]
}
},
Expand Down Expand Up @@ -1478,7 +1479,7 @@ export default function makeRoads() {
['!=', 'service', 'driveway']
],
paint: {
'line-color': 'hsl(0,0%,100%)',
'line-color': street_residential.line_color,
'line-width': {
stops: [
[14, 1],
Expand Down Expand Up @@ -1536,7 +1537,7 @@ export default function makeRoads() {
['!=', 'tunnel', true]
],
paint: {
'line-color': 'hsl(0,0%,100%)',
'line-color': street_secondary.line_color,
'line-width': {
stops: [
[12, 1],
Expand Down
49 changes: 8 additions & 41 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 @@ -491,23 +491,6 @@ export default function makeWalking(): any {
});

const walkingSurface: Layer[] = [
{
id: 'street-pedestrian-zone',
type: 'fill',
'source-layer': 'street_polygons',
filter: ['all', ['!=', 'bridge', true], ['!=', 'tunnel', true], ['==', 'kind', 'pedestrian']],
paint: {
'fill-color': 'rgba(245,245,245,0.25)',
'fill-opacity': {
stops: [
[12, 0],
[13, 1],
[14, 0],
[15, 1]
]
}
}
},
{
id: 'way-footway:case',
type: 'line',
Expand Down Expand Up @@ -630,7 +613,7 @@ export default function makeWalking(): any {
'source-layer': 'streets',
filter: ['all', ['==', 'kind', 'pedestrian'], ['!=', 'bridge', true], ['!=', 'tunnel', true]],
paint: {
'line-color': 'hsl(36,0%,80%)',
'line-color': tokens.street_tertiary_case,
'line-width': {
stops: [
[12, 2],
Expand All @@ -643,15 +626,12 @@ export default function makeWalking(): any {
},
'line-opacity': {
stops: [
[12, 0],
[13, 1]
[14, 0],
[15, 1]
]
}
},
layout: {
'line-join': 'round',
'line-cap': 'round'
}
layout: street_layout
},
{
id: 'way-footway',
Expand Down Expand Up @@ -764,10 +744,7 @@ export default function makeWalking(): any {
]
}
},
layout: {
'line-join': 'round',
'line-cap': 'round'
}
layout: street_layout
},
{
id: 'street-pedestrian',
Expand All @@ -788,16 +765,12 @@ export default function makeWalking(): any {
},
'line-opacity': {
stops: [
[12, 0],
[13, 0],
[14, 1]
]
}
},
layout: {
'line-join': 'round',
'line-cap': 'round'
}
layout: street_layout
},
{
id: 'street-track-bicycle',
Expand All @@ -813,10 +786,7 @@ export default function makeWalking(): any {
paint: {
'line-color': 'hsl(0,0%,100%)'
},
layout: {
'line-join': 'round',
'line-cap': 'round'
}
layout: street_layout
},
{
id: 'street-pedestrian-bicycle',
Expand Down Expand Up @@ -865,10 +835,7 @@ export default function makeWalking(): any {
paint: {
'line-color': 'hsl(0,0%,100%)'
},
layout: {
'line-join': 'round',
'line-cap': 'round'
}
layout: street_layout
},
{
id: 'street-livingstreet-bicycle',
Expand Down
10 changes: 5 additions & 5 deletions components/src/maplibre/MapStyle/tokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ const tokens = {
water_light: 'hsl(210, 41%, 90%)',
water_ocean: 'hsl(210, 25%, 96%)',
marsh: 'hsl(200, 14%, 97%)',
grass: 'hsl(149, 37%, 97%)',
grass_dark: 'hsl(149, 37%, 93%)',
street_primary: 'hsl(0, 0%, 95%)',
street_primary_case: 'hsla(0, 0%, 0%, 20%)',
grass: 'hsl(140, 27%, 96%)',
grass_dark: 'hsl(148, 52%, 94%)',
street_primary: 'hsl(0, 0%, 96%)',
street_primary_case: 'hsl(0, 0%, 75%)',
street_secondary: 'hsl(0, 0%, 95%)',
street_secondary_case: 'hsl(0, 0%, 50%)',
street_tertiary: 'hsl(0, 0%, 95%)',
street_tertiary_case: 'hsl(0, 0%, 50%)',
street_tertiary_case: 'hsl(0, 0%, 70%)',
label_primary: 'hsl(240, 5%, 10%)',
label_secondary: 'hsl(240, 2%, 30%)',
label_tertiary: 'hsl(240, 2%, 50%)',
Expand Down