diff --git a/components/src/maplibre/GeoJSONSource/GeoJSONSource.mdx b/components/src/maplibre/GeoJSONSource/GeoJSONSource.mdx
index cacf5af0..d8f75675 100644
--- a/components/src/maplibre/GeoJSONSource/GeoJSONSource.mdx
+++ b/components/src/maplibre/GeoJSONSource/GeoJSONSource.mdx
@@ -42,3 +42,7 @@ Loads vector data from a [GeoJSON](https://geojson.org/) object or file.
 ```
 
 <Controls />
+
+## Notes
+
+- If you want to use hover, selection or other interactions relying on `feature-state` make sure to set `promoteId` (to use a field from the feature data as an ID) or `generateId` (to use the index).
\ No newline at end of file
diff --git a/components/src/maplibre/GeoJSONSource/GeoJSONSource.stories.svelte b/components/src/maplibre/GeoJSONSource/GeoJSONSource.stories.svelte
index a74c5cfe..80b4447b 100644
--- a/components/src/maplibre/GeoJSONSource/GeoJSONSource.stories.svelte
+++ b/components/src/maplibre/GeoJSONSource/GeoJSONSource.stories.svelte
@@ -9,36 +9,32 @@
 
 	import { SWRDataLabLight } from '../MapStyle';
 	import { tokens } from '../../DesignTokens';
+	import squareGeo from './test/square.json';
+	import stuttgartGeo from './test/stuttgart-waermenetze.json';
 
 	const { Story } = defineMeta({
 		title: 'Maplibre/Source/GeoJSONSource',
 		component: GeoJSONSource
 	});
 
-	const geoJSON = {
-		type: 'GeometryCollection',
-		geometries: [
-			{
-				type: 'Polygon',
-				coordinates: [
-					[
-						[7.99298752775212, 50.07410328331564],
-						[11.709726710536899, 50.07410328331564],
-						[11.709726710536899, 52.08770466696292],
-						[7.99298752775212, 52.08770466696292],
-						[7.99298752775212, 50.07410328331564]
-					]
-				]
-			}
-		]
-	} as GeoJSON.GeoJSON;
+	let hovered: any = $state();
+	const handleMouseMove = (e) => {
+		hovered = e.features?.[0];
+	};
+	const handleMouseLeave = () => {
+		hovered = null;
+	};
 </script>
 
 <Story asChild name="Default">
 	<DesignTokens theme="light">
 		<div class="container">
 			<Map showDebug={true} style={SWRDataLabLight()}>
-				<GeoJSONSource id="demo" data={geoJSON} attribution="Demo attribution" />
+				<GeoJSONSource
+					id="demo"
+					data={squareGeo as GeoJSON.GeoJSON}
+					attribution="Demo attribution"
+				/>
 				<VectorLayer
 					sourceId="demo"
 					placeBelow="boundary-country"
@@ -57,6 +53,44 @@
 	</DesignTokens>
 </Story>
 
+<Story asChild name="ID Promotion">
+	<DesignTokens theme="light">
+		<div class="container">
+			<Map
+				showDebug={true}
+				style={SWRDataLabLight()}
+				cursor={hovered ? 'pointer' : ''}
+				initialLocation={{
+					lng: 9.223869970354485,
+					lat: 48.798414513866504,
+					zoom: 11.462711766264558
+				}}
+			>
+				<GeoJSONSource
+					id="demo"
+					data={stuttgartGeo as GeoJSON.GeoJSON}
+					attribution="Demo attribution"
+					promoteId="id"
+				/>
+				<VectorLayer
+					bind:hovered
+					onmousemove={handleMouseMove}
+					onmouseleave={handleMouseLeave}
+					sourceId="demo"
+					placeBelow="boundary-country"
+					id="test"
+					type="fill"
+					paint={{
+						'fill-color': tokens.shades.red.dark1,
+						'fill-opacity': ['case', ['boolean', ['feature-state', 'hovered'], false], 1, 0.1]
+					}}
+				/>
+				<AttributionControl />
+			</Map>
+		</div>
+	</DesignTokens>
+</Story>
+
 <style>
 	.container {
 		width: 100%;
diff --git a/components/src/maplibre/GeoJSONSource/GeoJSONSource.svelte b/components/src/maplibre/GeoJSONSource/GeoJSONSource.svelte
index 90f3ac7b..9c83c9ab 100644
--- a/components/src/maplibre/GeoJSONSource/GeoJSONSource.svelte
+++ b/components/src/maplibre/GeoJSONSource/GeoJSONSource.svelte
@@ -14,14 +14,31 @@
 		 */
 		attribution?: string;
 		maxZoom?: number;
+		/**
+		 * Use a field from the feature data for IDs. Must coerce to integer.
+		 */
+		promoteId?: string;
+		/**
+		 * Use the feature index for IDs. Overrides `promoteId`.
+		 */
+		generateId?: boolean;
 	}
 
-	const { maxZoom = 24, id, data, attribution = '' }: GeoJSONSourceProps = $props();
+	const {
+		maxZoom = 24,
+		id,
+		data,
+		attribution = '',
+		promoteId,
+		generateId = false
+	}: GeoJSONSourceProps = $props();
 
 	const sourceSpec: GeoJSONSourceSpecification = {
 		type: 'geojson',
 		maxzoom: maxZoom,
 		attribution,
+		promoteId,
+		generateId,
 		data
 	};
 </script>
diff --git a/components/src/maplibre/GeoJSONSource/test/square.json b/components/src/maplibre/GeoJSONSource/test/square.json
new file mode 100644
index 00000000..2a87d21c
--- /dev/null
+++ b/components/src/maplibre/GeoJSONSource/test/square.json
@@ -0,0 +1,17 @@
+{
+	"type": "GeometryCollection",
+	"geometries": [
+		{
+			"type": "Polygon",
+			"coordinates": [
+				[
+					[7.99298752775212, 50.07410328331564],
+					[11.709726710536899, 50.07410328331564],
+					[11.709726710536899, 52.08770466696292],
+					[7.99298752775212, 52.08770466696292],
+					[7.99298752775212, 50.07410328331564]
+				]
+			]
+		}
+	]
+}
diff --git a/components/src/maplibre/GeoJSONSource/test/stuttgart-waermenetze.json b/components/src/maplibre/GeoJSONSource/test/stuttgart-waermenetze.json
new file mode 100644
index 00000000..264d43ad
--- /dev/null
+++ b/components/src/maplibre/GeoJSONSource/test/stuttgart-waermenetze.json
@@ -0,0 +1,667 @@
+{
+	"type": "FeatureCollection",
+	"features": [
+		{
+			"type": "Feature",
+			"geometry": {
+				"type": "Polygon",
+				"coordinates": [
+					[
+						[9.152268563611626, 48.76663203880369],
+						[9.15427835026409, 48.766071022590374],
+						[9.160955880263804, 48.767599075150144],
+						[9.160581829532044, 48.76655252911521],
+						[9.15909697063249, 48.76590852522363],
+						[9.160742155062286, 48.76399033038021],
+						[9.159491423548872, 48.76276677512078],
+						[9.16064169713447, 48.76305906201727],
+						[9.16084654291238, 48.76311111375299],
+						[9.163066355032393, 48.76367517260253],
+						[9.160884919713563, 48.7664852722936],
+						[9.161731434985569, 48.76773165765339],
+						[9.163449834350043, 48.767617843256325],
+						[9.163418518752206, 48.76835306283199],
+						[9.168209280603048, 48.76988335453898],
+						[9.169122019684055, 48.770706305813306],
+						[9.170698970301727, 48.76860984620523],
+						[9.170729424533885, 48.767651845551505],
+						[9.172984951219313, 48.76693558497398],
+						[9.176563388977216, 48.76869012342951],
+						[9.179459442205552, 48.76803958732263],
+						[9.180097537564322, 48.7674148068861],
+						[9.181974682383611, 48.769574371804836],
+						[9.181992680194163, 48.76959507742109],
+						[9.18178613699271, 48.76972170833578],
+						[9.181588525304294, 48.769876129616016],
+						[9.183809286935146, 48.770605706908434],
+						[9.185274906205757, 48.771603038637984],
+						[9.186204438466469, 48.77205284343262],
+						[9.186895751796197, 48.772283541790124],
+						[9.187159496976504, 48.7723715562653],
+						[9.18696099368235, 48.773374389343],
+						[9.188886520079606, 48.77452970660773],
+						[9.190213414176789, 48.777802391543275],
+						[9.188833145562946, 48.77827249919132],
+						[9.191648312110487, 48.78283484073174],
+						[9.193338666501042, 48.78407958459206],
+						[9.195865858729423, 48.78376342607028],
+						[9.194587908256754, 48.784567597835235],
+						[9.197507435399737, 48.785886560564485],
+						[9.198233324671737, 48.78621449753798],
+						[9.201697491763463, 48.78758605943535],
+						[9.204431756271052, 48.786862898020814],
+						[9.20753990243818, 48.787383274118824],
+						[9.207922377181923, 48.78598437874172],
+						[9.207946989504695, 48.782567888231405],
+						[9.207789548017546, 48.78256034079101],
+						[9.205131261135566, 48.78243290765915],
+						[9.205395676404795, 48.78114031342555],
+						[9.20812656171641, 48.78122452651202],
+						[9.213298843822685, 48.784668158510755],
+						[9.218029295609586, 48.78713216263653],
+						[9.219036160874772, 48.78608318895296],
+						[9.219846936036571, 48.78646037091444],
+						[9.224245354539926, 48.7823973048679],
+						[9.226162971375473, 48.7815247163818],
+						[9.225011941580256, 48.78043534741561],
+						[9.228848553141717, 48.77904655752805],
+						[9.229725079270773, 48.77906709182652],
+						[9.232583417940178, 48.77756873282129],
+						[9.233227062348064, 48.77825805046197],
+						[9.235143741242279, 48.777251645610995],
+						[9.236564791398653, 48.778384916184486],
+						[9.241243927841971, 48.777060814647264],
+						[9.243363313093804, 48.77619308594751],
+						[9.244183485084813, 48.77659179859969],
+						[9.246221432654247, 48.7752830849248],
+						[9.247150129887272, 48.77324043000167],
+						[9.247155144406019, 48.77316426737305],
+						[9.247184276359915, 48.77272179895327],
+						[9.247281865098477, 48.771239579975024],
+						[9.247677745860134, 48.770868914471],
+						[9.247313095749403, 48.7707360292838],
+						[9.24711952045233, 48.77112408238027],
+						[9.245685195051134, 48.7714212189428],
+						[9.249871843590077, 48.766114498414225],
+						[9.251140471530302, 48.76641472254634],
+						[9.252023265552928, 48.765036011357786],
+						[9.250976814141119, 48.76468184591833],
+						[9.252429568715792, 48.76272711435144],
+						[9.255496393544616, 48.76370987393072],
+						[9.257664453738633, 48.760657406450754],
+						[9.261902983127447, 48.75407804200967],
+						[9.262523214831472, 48.754134553886765],
+						[9.263195901062915, 48.75262256364916],
+						[9.265044399517478, 48.75315077407609],
+						[9.266422233722333, 48.751210143505006],
+						[9.266210282242623, 48.75360478809491],
+						[9.268156956105004, 48.75346957663381],
+						[9.270811791432154, 48.756797658437264],
+						[9.27386637022209, 48.75755977710454],
+						[9.273887560705983, 48.756499289226],
+						[9.274993467154093, 48.756636265100695],
+						[9.274359596548125, 48.757383349596],
+						[9.274376610180363, 48.75968240833592],
+						[9.27277291052325, 48.75972483056819],
+						[9.269828536579952, 48.761944718140654],
+						[9.269490914185209, 48.7618237212808],
+						[9.271360428276898, 48.75940141974748],
+						[9.27234620148661, 48.75725148619079],
+						[9.269490365136434, 48.75668193950902],
+						[9.267569685929498, 48.753698178369795],
+						[9.265850968746246, 48.75361749919855],
+						[9.263198101707433, 48.757881304962794],
+						[9.260198138562625, 48.76157736815649],
+						[9.259442319049452, 48.761383025015505],
+						[9.265014843989379, 48.75318982874199],
+						[9.263250295277052, 48.75271600748627],
+						[9.261757166652044, 48.75591483168665],
+						[9.252507714241254, 48.769912730834754],
+						[9.250401157750252, 48.76920888500608],
+						[9.249337019938087, 48.771083661558016],
+						[9.24656342883114, 48.77456945705716],
+						[9.246288206475406, 48.77532471354749],
+						[9.239471747678571, 48.78007204143354],
+						[9.23365420390717, 48.78313606698349],
+						[9.2348456812659, 48.783989842167074],
+						[9.24036142887012, 48.78160753648475],
+						[9.246381504972597, 48.780097743378334],
+						[9.247894210566745, 48.779239024416775],
+						[9.248544189623946, 48.77979903037798],
+						[9.24801087798218, 48.7823933383713],
+						[9.243507365476493, 48.788030359346514],
+						[9.242014614541928, 48.78890234413797],
+						[9.240246576762479, 48.787208461463365],
+						[9.238220505369291, 48.78653096064246],
+						[9.234978359023975, 48.78424688248854],
+						[9.232218609391929, 48.78562424238085],
+						[9.233660214293923, 48.78679092274228],
+						[9.233105453207367, 48.787119532240425],
+						[9.235518108053544, 48.78828422116878],
+						[9.233147158703604, 48.7895722522326],
+						[9.230091296049684, 48.78709885506486],
+						[9.226046514742231, 48.78955966263963],
+						[9.225535966462408, 48.79074362243705],
+						[9.222594540547211, 48.79235001134636],
+						[9.223254345872544, 48.792870039306415],
+						[9.22051002287233, 48.79448601748393],
+						[9.221556854566495, 48.79560013490219],
+						[9.220779834799675, 48.796036045580955],
+						[9.221234913024553, 48.79638143780977],
+						[9.221236583464618, 48.796382705629206],
+						[9.22084515062229, 48.798405146669815],
+						[9.220718492999794, 48.79905955668896],
+						[9.220503426971694, 48.799039918167445],
+						[9.220923395844506, 48.79647687364091],
+						[9.220334730327755, 48.79603689726253],
+						[9.221050882257313, 48.79556100604147],
+						[9.220125626301403, 48.79448675221134],
+						[9.222809062323464, 48.792824117209534],
+						[9.222407718256058, 48.79242054752181],
+						[9.22059168441979, 48.793500062202526],
+						[9.219515650860593, 48.79263327649883],
+						[9.223115116627405, 48.78998642766447],
+						[9.234704667694198, 48.7841137722187],
+						[9.232847091524706, 48.78265053432526],
+						[9.232160423337032, 48.78086673019304],
+						[9.22079961593709, 48.788441289162726],
+						[9.221442846619613, 48.78904156023402],
+						[9.215934630558081, 48.79396986904703],
+						[9.213260230973543, 48.7934568859299],
+						[9.211419254178157, 48.79467442517373],
+						[9.209107756605876, 48.79426093031308],
+						[9.208544106162293, 48.795554071891694],
+						[9.207514918999214, 48.79537770584031],
+						[9.206279129229786, 48.794154637389504],
+						[9.203891367935924, 48.79570720241301],
+						[9.199753830663047, 48.79398790675674],
+						[9.196964188326637, 48.7919876924534],
+						[9.19152220826607, 48.78845466859262],
+						[9.189070123692561, 48.789139122895605],
+						[9.189326461144812, 48.78946396030112],
+						[9.202198419700258, 48.797661916908865],
+						[9.204090790510728, 48.79850254393042],
+						[9.204273332377642, 48.79863477422763],
+						[9.20412979011695, 48.7987181994285],
+						[9.206672776516816, 48.8004424345811],
+						[9.206054949718188, 48.80109702616758],
+						[9.205112312298267, 48.80397701308311],
+						[9.206693780362698, 48.803091983181226],
+						[9.208330335540937, 48.803035570067706],
+						[9.208865526693714, 48.8041395856456],
+						[9.212140201633058, 48.806515855575825],
+						[9.216111115827827, 48.809805235580605],
+						[9.21848678624548, 48.81109584474335],
+						[9.221194850335579, 48.81430760490342],
+						[9.222347703549197, 48.81345908592274],
+						[9.220271835894184, 48.811129742458874],
+						[9.220478807500205, 48.81102241297207],
+						[9.214685441984034, 48.80742600156785],
+						[9.215846766670289, 48.806892505139004],
+						[9.215975151162816, 48.80674339676631],
+						[9.21600003337344, 48.80671449805851],
+						[9.216621996079915, 48.80599213786363],
+						[9.216908789166242, 48.804454423468506],
+						[9.215874861216532, 48.804008578526535],
+						[9.21685445472597, 48.8035856874197],
+						[9.213336809963652, 48.800781892843524],
+						[9.217030739305756, 48.79871651716795],
+						[9.22071597484108, 48.79906206777725],
+						[9.220395341079417, 48.80121305753578],
+						[9.225894348729689, 48.80016314738669],
+						[9.232170756352486, 48.79607882784751],
+						[9.239109146008314, 48.79368535927195],
+						[9.239834278157618, 48.79301551424879],
+						[9.241496794478262, 48.793760582190465],
+						[9.235317003604244, 48.79827127992015],
+						[9.235145280410102, 48.798281583894145],
+						[9.234898455649006, 48.79829639421684],
+						[9.234103011451172, 48.79835334741299],
+						[9.22635894131035, 48.799988468196204],
+						[9.226075519390768, 48.80007066757274],
+						[9.224775254015457, 48.80329649600304],
+						[9.225367779810204, 48.803453576193355],
+						[9.22564622568543, 48.80348861215182],
+						[9.22558997655762, 48.803597238717686],
+						[9.224974152022597, 48.80478649990312],
+						[9.22833695182228, 48.80559525896901],
+						[9.227077612049175, 48.806794069776544],
+						[9.22893568564559, 48.80737351847024],
+						[9.225513479711699, 48.81139696699216],
+						[9.223534474970382, 48.8132303919012],
+						[9.22052133112605, 48.811056583870005],
+						[9.222424909191663, 48.81346896202258],
+						[9.222542511447678, 48.813936683733374],
+						[9.221222006062336, 48.81434616776043],
+						[9.222179483128894, 48.81524435204427],
+						[9.22120381511977, 48.816345269438024],
+						[9.222871142395295, 48.81704900865335],
+						[9.222822407472123, 48.81823131425712],
+						[9.22388774253416, 48.819084719569105],
+						[9.224833584833126, 48.81936209443263],
+						[9.224878811088393, 48.81981829302181],
+						[9.224880691744653, 48.819837263257746],
+						[9.224798645240904, 48.81983559260716],
+						[9.223835224301945, 48.81981597519897],
+						[9.223785283093983, 48.81981495828411],
+						[9.223507509095555, 48.819829087367786],
+						[9.221571016923818, 48.82071058530886],
+						[9.221268612308961, 48.82084824093652],
+						[9.220977957804095, 48.82021907813377],
+						[9.216860813777586, 48.820963550560116],
+						[9.217101688726421, 48.82221477740265],
+						[9.217135394969466, 48.82238986475093],
+						[9.217301537934459, 48.822893340773255],
+						[9.217402775712168, 48.82291782769933],
+						[9.21971470768466, 48.82347702712639],
+						[9.2194120281327, 48.824214257118136],
+						[9.215079262175445, 48.825113534996106],
+						[9.211466723973517, 48.8250830884495],
+						[9.20905888134868, 48.82590730382776],
+						[9.21057301497458, 48.82580388537661],
+						[9.2124121989498, 48.829520740905295],
+						[9.216882702486187, 48.832812502065785],
+						[9.217865498106754, 48.832222515243316],
+						[9.216332351757698, 48.83038971172434],
+						[9.217617390250155, 48.829995203877864],
+						[9.218359595920521, 48.83099778676306],
+						[9.219752066716044, 48.830478295937695],
+						[9.220889567749536, 48.830813259492416],
+						[9.225231638239402, 48.829895923885296],
+						[9.230806284980117, 48.82996064258227],
+						[9.230817981154983, 48.82956852975357],
+						[9.226942713997625, 48.82956839559723],
+						[9.2268424930001, 48.82867933185152],
+						[9.228705243726782, 48.82864677942535],
+						[9.228183518762723, 48.82738898899757],
+						[9.230536006068593, 48.82736121100488],
+						[9.230512523484318, 48.8279617980231],
+						[9.228772188129742, 48.827982587963795],
+						[9.2291274173394, 48.829165639147206],
+						[9.23125269742047, 48.82916139561093],
+						[9.230941215105616, 48.82995146124606],
+						[9.23721749306596, 48.829965451110226],
+						[9.237557250256268, 48.831885098250474],
+						[9.24126982187277, 48.832028877496505],
+						[9.240825166468351, 48.83500612062245],
+						[9.241623846468004, 48.83547673862055],
+						[9.236715820300232, 48.83664536522453],
+						[9.234286226111355, 48.83669488369492],
+						[9.2324657692831, 48.83710847992261],
+						[9.227380454617728, 48.834979954469574],
+						[9.225236116814138, 48.83541189721529],
+						[9.221720783975153, 48.83412659980146],
+						[9.222244574287938, 48.833528546493895],
+						[9.220695150227694, 48.83264486681522],
+						[9.218945381799086, 48.83378437049989],
+						[9.217549902611735, 48.83259292260162],
+						[9.216883523038241, 48.8330026043516],
+						[9.212304448778577, 48.82957440611404],
+						[9.210549199043529, 48.82584617422065],
+						[9.20803126643796, 48.82725771317595],
+						[9.207465996645787, 48.828731047515646],
+						[9.20732187953955, 48.831602667836414],
+						[9.207568064067429, 48.833109853862794],
+						[9.205183128641556, 48.83426662730571],
+						[9.207281432263967, 48.83537049216373],
+						[9.20982721118133, 48.837771226759656],
+						[9.212832407695489, 48.83903307577627],
+						[9.215987074722378, 48.83967144899059],
+						[9.217213402037215, 48.84021305258017],
+						[9.216596306837685, 48.84181425185838],
+						[9.213685588300471, 48.84213652258897],
+						[9.213317572161253, 48.84401975667454],
+						[9.208900002466713, 48.84372156767606],
+						[9.207108763746447, 48.84393602535353],
+						[9.20527730639451, 48.84214387904486],
+						[9.203290895938418, 48.841566526867666],
+						[9.202381091627593, 48.84211731541943],
+						[9.201241799922448, 48.841306089080184],
+						[9.203219716649876, 48.83979235255144],
+						[9.199275737998676, 48.83777146517441],
+						[9.20028077561817, 48.83704099294574],
+						[9.202402804818002, 48.83757855441472],
+						[9.20058302511727, 48.83660745356109],
+						[9.20195243028331, 48.834991821711455],
+						[9.203266291162185, 48.83548589468788],
+						[9.202565753126574, 48.834343864908014],
+						[9.203403536940492, 48.833820924650986],
+						[9.206242203121242, 48.83358485252643],
+						[9.20499900552144, 48.832760646345044],
+						[9.206846269729084, 48.832163272366046],
+						[9.20740900198943, 48.828729169818835],
+						[9.207996705969052, 48.82724094340998],
+						[9.209218165157235, 48.82634663046381],
+						[9.208878736641818, 48.825860104354135],
+						[9.211232147352069, 48.824929058933286],
+						[9.209766640084606, 48.82410151461925],
+						[9.211453434072208, 48.82299345275962],
+						[9.211392907210314, 48.82143708583587],
+						[9.209722620751478, 48.822176790278945],
+						[9.203928123317915, 48.822032726467455],
+						[9.203924556402578, 48.82115350093007],
+						[9.205770664886378, 48.81874549262885],
+						[9.203295997641701, 48.81745331254546],
+						[9.202998864943433, 48.81655158316911],
+						[9.20415383495272, 48.81437076905777],
+						[9.203530986641638, 48.81300178175488],
+						[9.202778563779834, 48.812114220801334],
+						[9.201136110129456, 48.8105957258243],
+						[9.199443659866853, 48.810230338881226],
+						[9.19537733344422, 48.81003531644032],
+						[9.195208997235692, 48.81069502675555],
+						[9.198807981953001, 48.81097403280404],
+						[9.198612750158716, 48.811645675911755],
+						[9.194320340942511, 48.81116584872979],
+						[9.190682617442045, 48.81015605238653],
+						[9.188217732227175, 48.81005911028907],
+						[9.18766430553973, 48.811194698943936],
+						[9.184714074660155, 48.811211345578066],
+						[9.183953322268145, 48.80979271893161],
+						[9.18578433520154, 48.80874420739665],
+						[9.189329903344449, 48.807428499016794],
+						[9.189042633073408, 48.807123928453365],
+						[9.182802937886398, 48.80942638640714],
+						[9.181421980653038, 48.80949762947756],
+						[9.18148799148331, 48.810965637478354],
+						[9.178027574908759, 48.814865204045425],
+						[9.177041260743541, 48.814492455040394],
+						[9.174156664545825, 48.811440326336175],
+						[9.177150013885033, 48.81089218515486],
+						[9.176785293156543, 48.80884986394058],
+						[9.177037866971203, 48.80778013803228],
+						[9.178496054995893, 48.80809869083226],
+						[9.181158556279422, 48.80940447667515],
+						[9.182743571963904, 48.809332913448046],
+						[9.188959651232107, 48.807031074955944],
+						[9.184693683217764, 48.80546793398143],
+						[9.189816611958205, 48.80364173557261],
+						[9.190426718662222, 48.803491374783476],
+						[9.191775365747999, 48.80315900072703],
+						[9.192741905002789, 48.80288022686954],
+						[9.193180556319405, 48.802707868854604],
+						[9.194863902718893, 48.80176374869667],
+						[9.194872771964436, 48.80176513895975],
+						[9.19487825794889, 48.801761945405],
+						[9.195820065266478, 48.801897998129945],
+						[9.196611530265313, 48.801796483713595],
+						[9.197960433478029, 48.80122293319989],
+						[9.19979755265444, 48.80111265570985],
+						[9.202459285195632, 48.799989329197714],
+						[9.203892927822473, 48.79895610494463],
+						[9.204136063136804, 48.79877516204392],
+						[9.204081117484378, 48.798728683650126],
+						[9.20407585922532, 48.79872423570157],
+						[9.204230581905364, 48.798625938810595],
+						[9.204088504456406, 48.79851628603088],
+						[9.202179355804175, 48.79767308931155],
+						[9.18939546914996, 48.789584147893066],
+						[9.188068125177344, 48.78891705432203],
+						[9.18405542185465, 48.78415604690283],
+						[9.181378637083014, 48.78508482616921],
+						[9.18669319329881, 48.790913166381706],
+						[9.190224315677867, 48.791837497326696],
+						[9.192327218524227, 48.79288107111343],
+						[9.193674325227608, 48.79464991175896],
+						[9.194429860289883, 48.79928801827979],
+						[9.193878079142102, 48.800491955158485],
+						[9.192516685179525, 48.80164154936112],
+						[9.190967755979399, 48.80226790728701],
+						[9.188775134414191, 48.80212671252856],
+						[9.189219558695505, 48.79924099418236],
+						[9.189002808603377, 48.795403977112606],
+						[9.18827320884556, 48.794168745718366],
+						[9.186252817195943, 48.79263485018843],
+						[9.182700560489558, 48.79401062870293],
+						[9.18191867344742, 48.794585522219194],
+						[9.182929726070512, 48.79826607167197],
+						[9.185399600695122, 48.79865644474904],
+						[9.18705339587379, 48.79994366433009],
+						[9.185512118453373, 48.80093457248946],
+						[9.1858365646061, 48.80203680636706],
+						[9.184932934029492, 48.80392074242953],
+						[9.182996114664311, 48.80458103141751],
+						[9.181950230776351, 48.79981521526443],
+						[9.178877310561885, 48.79865043422194],
+						[9.178491959324303, 48.799341647012426],
+						[9.180114539800098, 48.80043074085437],
+						[9.179188940995006, 48.80093343642365],
+						[9.178189129017174, 48.7995314778228],
+						[9.175676221607823, 48.7993682506441],
+						[9.177389345454976, 48.79746086491907],
+						[9.181149846753298, 48.797622100869944],
+						[9.18167155966754, 48.79735394470785],
+						[9.179056055570802, 48.794042020664186],
+						[9.181115242801862, 48.79254606800266],
+						[9.180978352570586, 48.792391862078915],
+						[9.177702197619029, 48.79175723187964],
+						[9.177565638428424, 48.79127846648655],
+						[9.175406744852253, 48.79099215873044],
+						[9.176262444658935, 48.789826830470865],
+						[9.176094245011424, 48.78752688850132],
+						[9.173263663158549, 48.78549831390147],
+						[9.17056808941729, 48.78593675478827],
+						[9.168516795177403, 48.78749922954058],
+						[9.168520058812748, 48.78847388545371],
+						[9.166118742114474, 48.78874470673771],
+						[9.16519482671216, 48.78973740350402],
+						[9.163372105438354, 48.78910507975301],
+						[9.1606023327366, 48.787510528934384],
+						[9.157916005415235, 48.78559276637422],
+						[9.158345112276294, 48.78535825902072],
+						[9.156309060742462, 48.783801580242155],
+						[9.15536564148301, 48.78396994057716],
+						[9.154198701678641, 48.7827072325897],
+						[9.156170255744891, 48.78252635430196],
+						[9.156022650520667, 48.78112861091926],
+						[9.154904302027733, 48.779208642992614],
+						[9.152154300299845, 48.77831004744223],
+						[9.15342439506626, 48.777523064426155],
+						[9.151609818547533, 48.776600928668515],
+						[9.149097217310963, 48.7761252293557],
+						[9.147814428114758, 48.77546968055978],
+						[9.150772514397, 48.77558280842355],
+						[9.151815483626148, 48.7749409466862],
+						[9.150615903732112, 48.77393444064465],
+						[9.14994088422668, 48.773628998131876],
+						[9.150030901640939, 48.772732190950364],
+						[9.148597981069242, 48.772572531710885],
+						[9.15368583523246, 48.7693076988354],
+						[9.151291175638898, 48.76871214510467],
+						[9.152401736108063, 48.76818157866858],
+						[9.1545923256654, 48.76817587641172],
+						[9.154324441778014, 48.766678037482244],
+						[9.152268563611626, 48.76663203880369]
+					]
+				]
+			},
+			"properties": {
+				"id": 1,
+				"Quartier": "Fernwärme",
+				"Gebietsbez": "bestehende Wärmenetze",
+				"Anzahl Wohneinheiten": 67370,
+				"geschätzer Wärmeverbrauch 2035": 1280000,
+				"Anteil des Wärmeverbrauchs im Wärmenetz 2035": 0.95,
+				"identifizierte Potenziale": "Wärme aus Bestandsnetz",
+				"geplante Leitungslänge": 108,
+				"angestrebter Beginn Leitungsbau": "-",
+				"Steckbrief": "qs_fernwaerme"
+			}
+		},
+		{
+			"type": "Feature",
+			"geometry": {
+				"type": "Polygon",
+				"coordinates": [
+					[
+						[9.197507435399737, 48.785886560564485],
+						[9.200213200503626, 48.7853438210338],
+						[9.20491236490288, 48.785707562477405],
+						[9.20501608735389, 48.78257744754936],
+						[9.207789548017546, 48.78256034079101],
+						[9.207946989504695, 48.782567888231405],
+						[9.207922377181923, 48.78598437874172],
+						[9.20753990243818, 48.787383274118824],
+						[9.204431756271052, 48.786862898020814],
+						[9.201697491763463, 48.78758605943535],
+						[9.198233324671737, 48.78621449753798],
+						[9.197507435399737, 48.785886560564485]
+					]
+				]
+			},
+			"properties": {
+				"id": 2,
+				"Quartier": "Ostheim",
+				"Gebietsbez": "Erweiterung bestehender Netze",
+				"Anzahl Wohneinheiten": 1760,
+				"geschätzer Wärmeverbrauch 2035": 15000,
+				"Anteil des Wärmeverbrauchs im Wärmenetz 2035": 0.66,
+				"identifizierte Potenziale": "Wärme aus Bestandsnetz",
+				"geplante Leitungslänge": 12.8,
+				"angestrebter Beginn Leitungsbau": "2031",
+				"Steckbrief": "qs_ostheim"
+			}
+		},
+		{
+			"type": "Feature",
+			"geometry": {
+				"type": "Polygon",
+				"coordinates": [
+					[
+						[9.215975151162816, 48.80674339676631],
+						[9.215581921317362, 48.80671246809646],
+						[9.215029081773444, 48.806861017327655],
+						[9.2114861335788, 48.80484723490379],
+						[9.21119550506248, 48.80269274089684],
+						[9.211163173299498, 48.80192956126062],
+						[9.215086903824972, 48.80221734016636],
+						[9.216783516787517, 48.803559087362345],
+						[9.215834304711285, 48.80398860435751],
+						[9.215947492258751, 48.80442949486233],
+						[9.216858315897053, 48.80448125191706],
+						[9.21647226022387, 48.80601811264252],
+						[9.21600003337344, 48.80671449805851],
+						[9.215975151162816, 48.80674339676631]
+					]
+				]
+			},
+			"properties": {
+				"id": 3,
+				"Quartier": "Bad Cannstatt-Mitte",
+				"Gebietsbez": "Erweiterung bestehender Netze",
+				"Anzahl Wohneinheiten": 1270,
+				"geschätzer Wärmeverbrauch 2035": 22000,
+				"Anteil des Wärmeverbrauchs im Wärmenetz 2035": 0.91,
+				"identifizierte Potenziale": "Wärme aus Bestandsnetz",
+				"geplante Leitungslänge": 12.4,
+				"angestrebter Beginn Leitungsbau": "2025",
+				"Steckbrief": "qs_cannstattmitte"
+			}
+		},
+		{
+			"type": "Feature",
+			"geometry": {
+				"type": "Polygon",
+				"coordinates": [
+					[
+						[9.235145280410102, 48.798281583894145],
+						[9.230366867600317, 48.805946285985975],
+						[9.225014652991753, 48.80479310422206],
+						[9.22558997655762, 48.803597238717686],
+						[9.22564622568543, 48.80348861215182],
+						[9.225367779810204, 48.803453576193355],
+						[9.224775254015457, 48.80329649600304],
+						[9.226075519390768, 48.80007066757274],
+						[9.22635894131035, 48.799988468196204],
+						[9.234103011451172, 48.79835334741299],
+						[9.234898455649006, 48.79829639421684],
+						[9.235145280410102, 48.798281583894145]
+					]
+				]
+			},
+			"properties": {
+				"id": 4,
+				"Quartier": "Seelberg",
+				"Gebietsbez": "Erweiterung bestehender Netze",
+				"Anzahl Wohneinheiten": 3120,
+				"geschätzer Wärmeverbrauch 2035": 28000,
+				"Anteil des Wärmeverbrauchs im Wärmenetz 2035": 0.89,
+				"identifizierte Potenziale": "Wärme aus Bestandsnetz",
+				"geplante Leitungslänge": 17.75,
+				"angestrebter Beginn Leitungsbau": "2028",
+				"Steckbrief": "qs_seelberg"
+			}
+		},
+		{
+			"type": "Feature",
+			"geometry": {
+				"type": "Polygon",
+				"coordinates": [
+					[
+						[9.217101688726421, 48.82221477740265],
+						[9.21842072490266, 48.82183770579817],
+						[9.221169449276708, 48.82092118827261],
+						[9.221571016923818, 48.82071058530886],
+						[9.223507509095555, 48.819829087367786],
+						[9.223785283093983, 48.81981495828411],
+						[9.223835224301945, 48.81981597519897],
+						[9.224798645240904, 48.81983559260716],
+						[9.224880691744653, 48.819837263257746],
+						[9.224878811088393, 48.81981829302181],
+						[9.22491363221324, 48.81981077871191],
+						[9.224833866642062, 48.81934914405702],
+						[9.226679692528153, 48.819448149377436],
+						[9.226590604847097, 48.82123134778115],
+						[9.225701173983373, 48.82215667273793],
+						[9.222756272231452, 48.82393259558176],
+						[9.217402775712168, 48.82291782769933],
+						[9.217301537934459, 48.822893340773255],
+						[9.217135394969466, 48.82238986475093],
+						[9.217101688726421, 48.82221477740265]
+					]
+				]
+			},
+			"properties": {
+				"id": 5,
+				"Quartier": "Münster",
+				"Gebietsbez": "Wärmenetzeignungsgebiete - vertiefte Untersuchung ausstehend",
+				"Anzahl Wohneinheiten": 1240,
+				"geschätzer Wärmeverbrauch 2035": 10000,
+				"Anteil des Wärmeverbrauchs im Wärmenetz 2035": 0.73,
+				"identifizierte Potenziale": "Wärme aus Bestandsnetz",
+				"geplante Leitungslänge": 11.8,
+				"angestrebter Beginn Leitungsbau": "2030",
+				"Steckbrief": "qs_muenster"
+			}
+		},
+		{
+			"type": "Feature",
+			"geometry": {
+				"type": "Polygon",
+				"coordinates": [
+					[
+						[9.144708091648518, 48.77465811083097],
+						[9.14637521610371, 48.77398897040289],
+						[9.150508927381429, 48.77395799123178],
+						[9.15173461138794, 48.77495693698713],
+						[9.150765910099967, 48.77552262256475],
+						[9.146224016957294, 48.77538737070813],
+						[9.144708091648518, 48.77465811083097]
+					]
+				]
+			},
+			"properties": {
+				"id": 6,
+				"Quartier": "Bebelstraße",
+				"Gebietsbez": "Erweiterung bestehender Netze",
+				"Anzahl Wohneinheiten": 1080,
+				"geschätzer Wärmeverbrauch 2035": 9400,
+				"Anteil des Wärmeverbrauchs im Wärmenetz 2035": 0.71,
+				"identifizierte Potenziale": "Wärme aus Bestandsnetz",
+				"geplante Leitungslänge": 6.14,
+				"angestrebter Beginn Leitungsbau": "2031",
+				"Steckbrief": "qs_bebelstr"
+			}
+		}
+	]
+}
diff --git a/components/src/maplibre/VectorLayer/VectorLayer.svelte b/components/src/maplibre/VectorLayer/VectorLayer.svelte
index ef91426f..6f36b805 100644
--- a/components/src/maplibre/VectorLayer/VectorLayer.svelte
+++ b/components/src/maplibre/VectorLayer/VectorLayer.svelte
@@ -54,6 +54,7 @@
 	}: VectorLayerProps = $props();
 
 	const { map, styleLoaded } = $derived(getMapContext());
+
 	let beforeId: string | undefined = $state();
 	let prevSelected: string | number | undefined = $state();
 	let prevHovered: string | number | undefined = $state();
@@ -92,7 +93,7 @@
 	$effect(() => {
 		if (styleLoaded) {
 			if (hovered) {
-				if (prevHovered) {
+				if (prevHovered || prevHovered === 0) {
 					map?.setFeatureState(
 						{ source: sourceId, sourceLayer: sourceLayer, id: prevHovered },
 						{ hovered: false }
@@ -104,7 +105,7 @@
 				);
 				prevHovered = hovered.id;
 			} else {
-				if (prevHovered) {
+				if (prevHovered || prevHovered === 0) {
 					map?.setFeatureState(
 						{ source: sourceId, sourceLayer: sourceLayer, id: prevHovered },
 						{ hovered: false }
@@ -118,7 +119,7 @@
 	$effect(() => {
 		if (styleLoaded) {
 			if (selected) {
-				if (prevSelected) {
+				if (prevSelected || prevSelected === 0) {
 					map?.setFeatureState(
 						{ source: sourceId, sourceLayer: sourceLayer, id: prevSelected },
 						{ selected: false }
@@ -130,7 +131,7 @@
 				);
 				prevSelected = selected.id;
 			} else {
-				if (prevSelected) {
+				if (prevSelected || prevSelected === 0) {
 					map?.setFeatureState(
 						{ source: sourceId, sourceLayer: sourceLayer, id: prevSelected },
 						{ selected: false }