From b24cbc84bf62cb58fd7cbf01d8fcb25f6100d276 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Wed, 23 Oct 2024 11:24:05 +0200
Subject: [PATCH] feat: make map reactive

---
 src/app.html            |  2 ++
 src/routes/+page.svelte | 75 ++++++++++++++++++++++++-----------------
 2 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/src/app.html b/src/app.html
index 3169684..2e7a40f 100644
--- a/src/app.html
+++ b/src/app.html
@@ -11,8 +11,10 @@
 	</body>
 
 	<style>
+		html,
 		body {
 			margin: 0;
+			height: 100%;
 		}
 	</style>
 </html>
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 28ce39f..709bdeb 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
 	import type { PageData } from "./$types";
-	import { page } from "$app/stores";
 	import L from "leaflet";
 
 	import "leaflet/dist/leaflet.css";
@@ -12,60 +11,76 @@
 	let { data }: Props = $props();
 
 	const lignes = data.lines;
-	const params = $page.url.searchParams;
-	const center = L.latLng(45.75388713, 4.84715287);
+	const point = L.latLng(45.75388713, 4.84715287);
+
+	const bbox = lignes.bbox || [0, 0, 0, 0];
+	const center = L.latLng((bbox[1] + bbox[3]) / 2, (bbox[0] + bbox[2]) / 2);
+
+	const linesJson = lignes.features.map((feature) => {
+		let color = "rgb(" + feature.properties?.couleur?.replaceAll(" ", ",") + ")";
+		return L.geoJSON(feature, { style: { color } });
+	});
 
 	let latlng = $state(L.latLng(0, 0));
-	let distance = $derived(Math.max(0, latlng.distanceTo(center) - 20));
+	let distance = $derived(Math.max(0, latlng.distanceTo(point) - 20));
 	let points = $derived(5000 * Math.exp(-distance / 750));
 
-	function createMap(node: HTMLElement) {
-		const bbox = lignes.bbox || [0, 0, 0, 0];
-		const centerLat = (bbox[1] + bbox[3]) / 2;
-		const centerLon = (bbox[0] + bbox[2]) / 2;
+	let lines = $state(true);
+	let labels = $state(false);
 
-		const map = L.map(node).setView([centerLat, centerLon], 13);
-		const mapSuffix = params.has("labels") ? "all" : "nolabels";
+	let map: L.Map | null = $state(null);
+	let tileLayer = $derived(
+		L.tileLayer(
+			`https://basemaps.cartocdn.com/light_${labels ? "all" : "nolabels"}/{z}/{x}/{y}{r}.png`,
+			{
+				attribution:
+					'&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>',
+				maxZoom: 20,
+			},
+		),
+	);
 
-		L.tileLayer(`https://basemaps.cartocdn.com/light_${mapSuffix}/{z}/{x}/{y}{r}.png`, {
-			attribution:
-				'&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>',
-			maxZoom: 20,
-		}).addTo(map);
+	$effect(() => {
+		if (!map) return;
+		tileLayer.addTo(map);
 
-		if (params.has("lines")) {
-			lignes.features.forEach((feature) => {
-				let color = "black";
-
-				if (feature.properties && feature.properties.couleur) {
-					color = "rgb(" + feature.properties.couleur.replaceAll(" ", ",") + ")";
-				}
-
-				L.geoJSON(feature, { style: { color } }).addTo(map);
-			});
+		if (lines) {
+			linesJson.forEach((line) => map && line.addTo(map));
+		} else {
+			linesJson.forEach((line) => map && line.removeFrom(map));
 		}
+	});
+
+	function createMap(node: HTMLElement) {
+		map = L.map(node).setView(center, 13);
 
 		const marker = L.marker([0, 0]);
 		map.on("click", (e) => {
-			marker.setLatLng(e.latlng).addTo(map);
+			if (map) marker.setLatLng(e.latlng).addTo(map);
 			latlng = e.latlng;
 		});
 	}
 </script>
 
-<div id="info">
+<div class="banner">
 	<span>distance: {distance}, points: {points}</span>
 </div>
 
+<div class="banner">
+	<label>lines: <input type="checkbox" bind:checked={lines} /></label>
+	<label>labels: <input type="checkbox" bind:checked={labels} /></label>
+</div>
+
 <div id="map" use:createMap></div>
 
 <style>
-	#info {
-		height: 5vh;
+	.banner {
+		padding: 4px;
+		text-align: center;
 	}
 
 	#map {
-		height: 95vh;
+		height: 100%;
 		width: 100%;
 	}
 </style>