From f8a1c2a9601aeeb2952081781cc6db22ddcac7b6 Mon Sep 17 00:00:00 2001
From: Dustin Carlino <dabreegster@gmail.com>
Date: Mon, 18 Sep 2023 11:30:11 +0100
Subject: [PATCH] Feedback for #343

---
 .../layers/CrossingsLayerControl.svelte       | 20 +++++++++----------
 .../layers/RailwayStationsLayerControl.svelte |  8 +-------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/lib/browse/layers/CrossingsLayerControl.svelte b/src/lib/browse/layers/CrossingsLayerControl.svelte
index a4b9bba26..db8a2eecc 100644
--- a/src/lib/browse/layers/CrossingsLayerControl.svelte
+++ b/src/lib/browse/layers/CrossingsLayerControl.svelte
@@ -15,18 +15,18 @@
   let show = false;
 
   function tooltip(feature: MapGeoJSONFeature): string {
-    const crossingTypeString = feature.properties.crossing;
-    if (crossingTypeString === "no")
-      return "Location where crossing is impossible/illegal but where there is a clear desire line to cross.";
-    let result = "Crossing with the following features.";
-    const initialTooltipSentence =
-      initialTooltipSentences.get(crossingTypeString);
-    if (initialTooltipSentence) result = initialTooltipSentence;
-
-    return `<p>${result}. Click for details.</p>`;
+    const crossingType = feature.properties.crossing;
+    let description =
+      descriptions.get(crossingType) ??
+      `Crossing with unknown type (${crossingType}).`;
+    return `<p>${description}. Click for details.</p>`;
   }
 
-  const initialTooltipSentences: Map<string, string> = new Map<string, string>([
+  const descriptions: Map<string, string> = new Map([
+    [
+      "no",
+      "Location where crossing is impossible/illegal but where there is a clear desire line to cross.",
+    ],
     ["traffic_signals", "Signalised crossing"],
     ["marked", "Crossing with no traffic signals"],
     ["uncontrolled", "Crossing with no traffic signals"],
diff --git a/src/lib/browse/layers/RailwayStationsLayerControl.svelte b/src/lib/browse/layers/RailwayStationsLayerControl.svelte
index a8e19ce37..c20d94762 100644
--- a/src/lib/browse/layers/RailwayStationsLayerControl.svelte
+++ b/src/lib/browse/layers/RailwayStationsLayerControl.svelte
@@ -55,10 +55,4 @@
   </span>
 </Checkbox>
 
-<InteractiveLayer
-  layer={name}
-  {tooltip}
-  {show}
-  clickable={false}
-  on:click={() => {}}
-/>
+<InteractiveLayer layer={name} {tooltip} {show} clickable={false} />