Skip to content

fix(Map): Allow passing layers as snippets #456

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

Draft
awesomephant wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(Map): Allow passing layers as snippets #456

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
3 changes: 2 additions & 1 deletion mock-sveltekit/src/routes/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
const charts = [
{ title: '348 Repro', slug: '348-repro' },
{ title: 'Encapsulation Test', slug: 'encapsulation-test' },
{ title: 'Hero Scrolly', slug: 'hero-scrolly' }
{ title: 'Hero Scrolly', slug: 'hero-scrolly' },
{ title: '#425 Repro', slug: '452-repro' }
];
</script>

Expand Down
5 changes: 5 additions & 0 deletions mock-sveltekit/src/routes/452-repro/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<script lang="ts">
import Component from './Component.svelte';
</script>

<repro-452></repro-452>
49 changes: 49 additions & 0 deletions mock-sveltekit/src/routes/452-repro/Component.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<svelte:options customElement="repro-452" />

<script>
import MapComponent from './MapComponent.svelte';
import VectorLayer from '../../../../components/src/maplibre/VectorLayer/VectorLayer.svelte';
import VectorTileSource from '../../../../components/src/maplibre/VectorTileSource/VectorTileSource.svelte';
</script>

<h1>#452 Repro</h1>

<MapComponent>
{#snippet controls()}
[controls]
{/snippet}
<VectorTileSource
id="demo-source"
tiles={[
'https://static.datenhub.net/data/p118_correctiv_waermewende/heating_merged_2.versatiles?{z}/{x}/{y}'
]}
attribution="Demo attribution"
>
<VectorLayer
type="fill"
id="demo-10km"
sourceId="demo-source"
sourceLayer="heating_10km_squares"
placeBelow="street-residential"
minZoom={5}
paint={{
'fill-color': [
'match',
['get', 'dominant_source'],
'Gas',
'#CCDCFF',
'Heizoel',
'#5BCFE1',
'Holz_Holzpellets',
'#499F73',
'Fernwaerme',
'#A86C07',
'Strom',
'#FFD584',
'gray'
],
'fill-opacity': 1
}}
/>
</VectorTileSource>
</MapComponent>
161 changes: 161 additions & 0 deletions mock-sveltekit/src/routes/452-repro/MapComponent.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
<script lang="ts">
import type { Snippet } from 'svelte';
import { isDarkMode, Map, tokens, VectorTileSource } from '../../../../components/src';
import VectorLayer from '../../../../components/src/maplibre/VectorLayer/VectorLayer.svelte';
import AttributionControl from '../../../../components/src/maplibre/AttributionControl/AttributionControl.svelte';
let mapContext = $state();
const maskState = 'Rheinland-Pfalz';
const { children, controls }: { children: Snippet; controls: Snippet } = $props();
</script>

<div class="container">
<div class="controls">
{@render controls?.()}
</div>
<Map bind:mapContext>
{@render children?.()}

<VectorTileSource
id="boundaries"
tiles={[
'https://static.datenhub.net/data/boundaries/admin_boundaries_2025-01-01.versatiles?{z}/{x}/{y}'
]}
attribution="© BKG (2025) dl-de/by-2-0"
maxZoom={8}
>
<VectorLayer
type="line"
id="kreise-outline"
sourceLayer="administrative"
sourceId="boundaries"
filter={['==', 'admin_level', 6]}
paint={{
'line-color': isDarkMode() ? '#999' : '#494949',
'line-width': 1.25,
'line-opacity': ['interpolate', ['linear'], ['zoom'], 7.9, 0, 8, 0.25, 8.3, 0.25, 9, 0.5]
}}
/>
<VectorLayer
type="line"
id="gemeinden-outline"
sourceLayer="administrative"
sourceId="boundaries"
filter={['==', 'admin_level', 8]}
minZoom={9}
paint={{
'line-color': isDarkMode() ? '#888' : '#494949',
'line-opacity': ['interpolate', ['linear'], ['zoom'], 9.7, 0, 9.8, 0.15]
}}
/>

{#if maskState}
<VectorLayer
type="fill"
id="laender-mask"
sourceLayer="administrative"
sourceId="boundaries"
filter={['all', ['==', 'admin_level', 4], ['!=', 'name', maskState]]}
paint={{
'fill-color': isDarkMode() ? tokens.semantics.pageFill.dark : 'white'
}}
/>
{/if}
<VectorLayer
type="line"
id="laender-outline"
sourceLayer="administrative"
sourceId="boundaries"
filter={maskState
? ['all', ['==', 'admin_level', 4], ['==', 'name', maskState]]
: undefined}
paint={{
'line-color': isDarkMode() ? '#bbb' : 'black',
'line-opacity': isDarkMode() ? 0.95 : 0.5,
'line-width': 1
}}
/>
</VectorTileSource>
<VectorTileSource
id="admin_labels"
tiles={[
'https://static.datenhub.net/data/boundaries/admin_labels_2025-01-01.versatiles?{z}/{x}/{y}'
]}
maxZoom={7}
attribution="© BKG (2025) dl-de/by-2-0"
>
<VectorLayer
type="symbol"
sourceLayer="administrative"
id="laender-labels"
sourceId="admin_labels"
filter={['==', 'admin_level', 4]}
maxZoom={7.4}
layout={{
'text-size': 15,
'text-max-width': 5,
'text-font': ['swr_sans_medium'],
'text-field': '{name}'
}}
paint={{
'text-halo-color': isDarkMode() ? 'rgba(2,2,2,.85)' : 'white',
'text-halo-width': isDarkMode() ? 1 : 2,
'text-halo-blur': 0,
'text-color': isDarkMode() ? 'white' : 'black',
'text-opacity': ['interpolate', ['linear'], ['zoom'], 7.3, 1, 7.4, 0]
}}
/>
<VectorLayer
type="symbol"
sourceLayer="administrative"
id="kreise-labels"
sourceId="admin_labels"
filter={['==', 'admin_level', 6]}
minZoom={8}
maxZoom={10}
layout={{
'text-size': 15,
'text-max-width': 5,
'text-font': ['swr_sans_medium'],
'text-field': '{name}'
}}
paint={{
'text-halo-color': isDarkMode() ? 'rgba(2,2,2,.85)' : 'white',
'text-halo-width': isDarkMode() ? 1 : 2,
'text-halo-blur': 1,
'text-color': isDarkMode() ? 'white' : 'black',
'text-opacity': ['interpolate', ['linear'], ['zoom'], 7.4, 0, 7.5, 1]
}}
/>
<VectorLayer
type="symbol"
sourceLayer="administrative"
id="gemeinde-labels"
sourceId="admin_labels"
filter={['==', 'admin_level', 8]}
minZoom={10}
layout={{
'text-size': 16,
'text-max-width': 5,
'text-font': ['swr_sans_regular'],
'text-field': '{name}'
}}
paint={{
'text-halo-color': isDarkMode() ? 'rgba(2,2,2,.85)' : '#fcfcfcff',
'text-halo-width': 2,
'text-halo-blur': 0.5,
'text-color': isDarkMode() ? 'white' : '#1b1b1b',
'text-opacity': ['interpolate', ['linear'], ['zoom'], 11, 0, 11.5, 1]
}}
/>
</VectorTileSource>
<AttributionControl position="bottom-left" />
</Map>
</div>

<style lang="scss">
.container {
aspect-ratio: 3 / 3.2;
margin-bottom: 1em;
width: 400px;
}
</style>
Loading