Move two components to common/

src/lib/BaselayerSwitcher.svelte → src/lib/common/BaselayerSwitcher.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { Select } from "./govuk";
+  import { Select } from "../govuk";
 
   // TODO Be specific about "streets" | "hybrid", but then we need actual error
   // handling when we parse it from URL params

src/lib/ZoomOutMap.svelte → src/lib/common/ZoomOutMap.svelte

@@ -1,9 +1,9 @@
 <script lang="ts">
   import type { GeoJSON } from "geojson";
-  import icon from "../../assets/zoom_out_map.svg";
-  import { bbox } from "../maplibre_helpers";
-  import { map } from "../stores";
-  import { SecondaryButton } from "./govuk";
+  import icon from "../../../assets/zoom_out_map.svg";
+  import { bbox } from "../../maplibre_helpers";
+  import { map } from "../../stores";
+  import { SecondaryButton } from "../govuk";
 
   export let boundaryGeojson: GeoJSON;
 

src/lib/common/index.ts

@@ -1,3 +1,4 @@
+export { default as BaselayerSwitcher } from "./BaselayerSwitcher.svelte";
 export { default as CollapsibleCard } from "./CollapsibleCard.svelte";
 export { default as ColorLegend } from "./ColorLegend.svelte";
 export { default as ConfirmationModal } from "./ConfirmationModal.svelte";
@@ -8,3 +9,4 @@ export { default as HelpIcon } from "./HelpIcon.svelte";
 export { default as Layout } from "./Layout.svelte";
 export { default as MapTooltips } from "./MapTooltips.svelte";
 export { default as Modal } from "./Modal.svelte";
+export { default as ZoomOutMap } from "./ZoomOutMap.svelte";

src/pages/App.svelte

@@ -6,9 +6,8 @@
   import type { FeatureCollection, Polygon } from "geojson";
   import { onMount } from "svelte";
   import authoritiesUrl from "../../assets/authorities.geojson?url";
-  import BaselayerSwitcher from "../lib/BaselayerSwitcher.svelte";
   import BoundaryLayer from "../lib/BoundaryLayer.svelte";
-  import { Layout } from "../lib/common";
+  import { BaselayerSwitcher, Layout, ZoomOutMap } from "../lib/common";
   import HoverLayer from "../lib/draw/HoverLayer.svelte";
   import InterventionLayer from "../lib/draw/InterventionLayer.svelte";
   import Toolbox from "../lib/draw/Toolbox.svelte";
@@ -20,7 +19,6 @@
   import EntireScheme from "../lib/sidebar/EntireScheme.svelte";
   import Instructions from "../lib/sidebar/Instructions.svelte";
   import InterventionList from "../lib/sidebar/InterventionList.svelte";
-  import ZoomOutMap from "../lib/ZoomOutMap.svelte";
   import { routeInfo } from "../stores";
   import { schemaTitle, type Schema } from "../types";
   import { type RouteInfo } from "../worker";

src/pages/BrowseSchemes.svelte

@@ -3,24 +3,24 @@
   import { initAll } from "govuk-frontend";
   import "../style/main.css";
   import { onDestroy, onMount } from "svelte";
-  import BaselayerSwitcher from "../lib/BaselayerSwitcher.svelte";
   import { processInput, type Scheme } from "../lib/browse/data";
   import Filters from "../lib/browse/Filters.svelte";
   import HospitalsLayer from "../lib/browse/HospitalsLayer.svelte";
   import SchemeCard from "../lib/browse/SchemeCard.svelte";
   import SchoolsLayer from "../lib/browse/SchoolsLayer.svelte";
   import {
+    BaselayerSwitcher,
     CollapsibleCard,
     FileInput,
     Layout,
     MapTooltips,
+    ZoomOutMap,
   } from "../lib/common";
   import PmTiles from "../lib/common/PmTiles.svelte";
   import InterventionLayer from "../lib/draw/InterventionLayer.svelte";
   import { CheckboxGroup, ErrorMessage, SecondaryButton } from "../lib/govuk";
   import Legend from "../lib/Legend.svelte";
   import MapLibreMap from "../lib/Map.svelte";
-  import ZoomOutMap from "../lib/ZoomOutMap.svelte";
   import { bbox, emptyGeojson, prettyPrintMeters } from "../maplibre_helpers";
   import { gjScheme, map } from "../stores";
   import type { Scheme as GjScheme } from "../types";