diff --git a/src/lib/common/StreetViewTool.svelte b/src/lib/common/StreetViewTool.svelte
index 73c5fbf..4c23f69 100644
--- a/src/lib/common/StreetViewTool.svelte
+++ b/src/lib/common/StreetViewTool.svelte
@@ -5,38 +5,38 @@
   import { onDestroy } from "svelte";
   import cameraCursorUrl from "$lib/assets/camera_cursor.svg?url";
   import StreetViewHelp from "./StreetViewHelp.svelte";
-  import { map, type Config } from "$lib/config";
   import type { Map } from "maplibre-gl";
 
   export let cfg: { getStreetViewRoadLayerNames: (map: Map) => string[] };
+  export let map: Map | null;
   export let enabled: boolean;
   export let showControls = true;
 
   let defaultLineColorPerLayer: [string, any][] = [];
 
   function on() {
-    if (!$map) {
+    if (!map) {
       return;
     }
-    $map.on("click", onClick);
-    $map.getCanvas().style.cursor = `url(${cameraCursorUrl}), auto`;
+    map.on("click", onClick);
+    map.getCanvas().style.cursor = `url(${cameraCursorUrl}), auto`;
 
-    for (let layer of cfg.getStreetViewRoadLayerNames($map)) {
+    for (let layer of cfg.getStreetViewRoadLayerNames(map)) {
       defaultLineColorPerLayer.push([
         layer,
-        $map.getPaintProperty(layer, "line-color"),
+        map.getPaintProperty(layer, "line-color"),
       ]);
-      $map.setPaintProperty(layer, "line-color", "cyan");
+      map.setPaintProperty(layer, "line-color", "cyan");
     }
   }
 
   function off() {
-    if ($map) {
-      $map.off("click", onClick);
-      $map.getCanvas().style.cursor = "inherit";
+    if (map) {
+      map.off("click", onClick);
+      map.getCanvas().style.cursor = "inherit";
 
       for (let [layer, value] of defaultLineColorPerLayer) {
-        $map.setPaintProperty(layer, "line-color", value);
+        map.setPaintProperty(layer, "line-color", value);
       }
       defaultLineColorPerLayer = [];
     }
diff --git a/src/lib/draw/StreetViewMode.svelte b/src/lib/draw/StreetViewMode.svelte
index 119524e..d133e2c 100644
--- a/src/lib/draw/StreetViewMode.svelte
+++ b/src/lib/draw/StreetViewMode.svelte
@@ -2,7 +2,7 @@
   import { StreetViewHelp, StreetViewTool } from "$lib/common";
   import { mode, userSettings } from "$lib/draw/stores";
   import { DefaultButton, Radio } from "govuk-svelte";
-  import type { Config } from "$lib/config";
+  import { type Config, map } from "$lib/config";
 
   export let cfg: Config<F, S>;
 
@@ -12,7 +12,7 @@
   }
 </script>
 
-<StreetViewTool {cfg} bind:enabled showControls={false} />
+<StreetViewTool {cfg} map={$map} bind:enabled showControls={false} />
 
 <DefaultButton on:click={() => (enabled = false)}>Finish</DefaultButton>