From 171bde628c9b8eb61ec1e3eaa2b1b1c05c0ca122 Mon Sep 17 00:00:00 2001
From: Peter York <peter.york@dft.gov.uk>
Date: Thu, 17 Aug 2023 12:00:23 +0100
Subject: [PATCH] Rework to use maplibre helpers as library

---
 src/lib/BoundaryLayer.svelte                         |  2 +-
 src/lib/browse/InterventionColorSelector.svelte      |  2 +-
 src/lib/browse/SchemeCard.svelte                     |  2 +-
 src/lib/browse/layers/BusRoutesLayerControl.svelte   | 10 +++++-----
 .../layers/CensusOutputAreaLayerControl.svelte       |  8 ++++----
 .../layers/CombinedAuthoritiesLayerControl.svelte    | 12 ++++++------
 .../browse/layers/CycleParkingLayerControl.svelte    |  5 +----
 src/lib/browse/layers/CyclePathsLayerControl.svelte  | 12 ++++++------
 src/lib/browse/layers/ImdLayerControl.svelte         |  8 ++++----
 .../LocalAuthorityDistrictsLayerControl.svelte       | 12 ++++++------
 .../LocalPlanningAuthoritiesLayerControl.svelte      | 12 ++++++------
 src/lib/browse/layers/MrnLayerControl.svelte         | 10 +++++-----
 .../ParliamentaryConstituenciesLayerControl.svelte   | 12 ++++++------
 .../browse/layers/PointAmenityLayerControl.svelte    |  5 +----
 .../browse/layers/PolygonAmenityLayerControl.svelte  |  8 ++++----
 src/lib/browse/layers/WardsLayerControl.svelte       | 12 ++++++------
 src/lib/common/ZoomOutMap.svelte                     |  2 +-
 src/lib/draw/AttributeMode.svelte                    |  2 +-
 src/lib/draw/GeometryMode.svelte                     |  2 +-
 src/lib/draw/HoverLayer.svelte                       |  2 +-
 src/lib/draw/InterventionLayer.svelte                |  2 +-
 src/lib/draw/common.ts                               |  2 +-
 src/lib/draw/point/point_tool.ts                     |  2 +-
 src/lib/draw/polygon/PolygonMode.svelte              |  2 +-
 src/lib/draw/polygon/polygon_tool.ts                 |  4 ++--
 src/lib/draw/route/RouteMode.svelte                  |  2 +-
 src/lib/draw/route/SplitRouteMode.svelte             |  8 ++++----
 src/lib/draw/route/route_tool.ts                     |  4 ++--
 src/lib/draw/snap_polygon/SnapPolygonMode.svelte     |  2 +-
 src/lib/forms/FormV1.svelte                          |  2 +-
 src/lib/layers/SpeedLimits.svelte                    |  2 +-
 .../layers/lane_details/IntersectionMarkings.svelte  |  2 +-
 .../layers/lane_details/IntersectionPolygons.svelte  |  2 +-
 src/lib/layers/lane_details/LaneMarkings.svelte      |  2 +-
 src/lib/layers/lane_details/LanePolygons.svelte      |  2 +-
 src/lib/layers/lane_details/Layer.svelte             |  2 +-
 src/lib/maplibre/index.ts                            |  1 +
 src/{maplibre_helpers.ts => lib/maplibre/utils.ts}   |  0
 src/pages/BrowseSchemes.svelte                       |  2 +-
 src/pages/ChooseArea.svelte                          |  2 +-
 src/schemas.ts                                       |  2 +-
 src/stores.ts                                        |  2 +-
 42 files changed, 93 insertions(+), 98 deletions(-)
 create mode 100644 src/lib/maplibre/index.ts
 rename src/{maplibre_helpers.ts => lib/maplibre/utils.ts} (100%)

diff --git a/src/lib/BoundaryLayer.svelte b/src/lib/BoundaryLayer.svelte
index a6d506be9..d0996c153 100644
--- a/src/lib/BoundaryLayer.svelte
+++ b/src/lib/BoundaryLayer.svelte
@@ -6,7 +6,7 @@
     bbox,
     overwritePolygonLayer,
     overwriteSource,
-  } from "../maplibre_helpers";
+  } from "../lib/maplibre";
   import { map } from "../stores";
 
   export let boundaryGeojson: FeatureCollection<Polygon>;
diff --git a/src/lib/browse/InterventionColorSelector.svelte b/src/lib/browse/InterventionColorSelector.svelte
index 557ad7609..97a354840 100644
--- a/src/lib/browse/InterventionColorSelector.svelte
+++ b/src/lib/browse/InterventionColorSelector.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { constructMatchExpression } from "../../maplibre_helpers";
+  import { constructMatchExpression } from "../maplibre";
   import { colorInterventionsBySchema, schemaLegend } from "../../schemas";
   import { map } from "../../stores";
   import { Legend } from "../common";
diff --git a/src/lib/browse/SchemeCard.svelte b/src/lib/browse/SchemeCard.svelte
index b465f8399..6ea107ea6 100644
--- a/src/lib/browse/SchemeCard.svelte
+++ b/src/lib/browse/SchemeCard.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import type { FeatureCollection } from "geojson";
-  import { bbox } from "../../maplibre_helpers";
+  import { bbox } from "../maplibre";
   import { gjScheme, map } from "../../stores";
   import { CollapsibleCard } from "../common";
   import { SecondaryButton } from "../govuk";
diff --git a/src/lib/browse/layers/BusRoutesLayerControl.svelte b/src/lib/browse/layers/BusRoutesLayerControl.svelte
index aae2d6eba..74cddf1b7 100644
--- a/src/lib/browse/layers/BusRoutesLayerControl.svelte
+++ b/src/lib/browse/layers/BusRoutesLayerControl.svelte
@@ -1,10 +1,5 @@
 <script lang="ts">
   import type { MapGeoJSONFeature } from "maplibre-gl";
-  import {
-    hoveredToggle,
-    overwriteLineLayer,
-    overwritePmtilesSource,
-  } from "../../../maplibre_helpers";
   import { map } from "../../../stores";
   import {
     ColorLegend,
@@ -13,6 +8,11 @@
     InteractiveLayer,
   } from "../../common";
   import { Checkbox } from "../../govuk";
+  import {
+    hoveredToggle,
+    overwriteLineLayer,
+    overwritePmtilesSource,
+  } from "../../maplibre";
   import { colors } from "../colors";
 
   let name = "bus_routes";
diff --git a/src/lib/browse/layers/CensusOutputAreaLayerControl.svelte b/src/lib/browse/layers/CensusOutputAreaLayerControl.svelte
index 98a19d64c..93441b2a5 100644
--- a/src/lib/browse/layers/CensusOutputAreaLayerControl.svelte
+++ b/src/lib/browse/layers/CensusOutputAreaLayerControl.svelte
@@ -1,15 +1,15 @@
 <script lang="ts">
   import type { MapGeoJSONFeature } from "maplibre-gl";
+  import { map } from "../../../stores";
+  import { ExternalLink, HelpButton, InteractiveLayer } from "../../common";
+  import { Checkbox } from "../../govuk";
   import {
     hoveredToggle,
     makeColorRamp,
     overwriteLineLayer,
     overwritePmtilesSource,
     overwritePolygonLayer,
-  } from "../../../maplibre_helpers";
-  import { map } from "../../../stores";
-  import { ExternalLink, HelpButton, InteractiveLayer } from "../../common";
-  import { Checkbox } from "../../govuk";
+  } from "../../maplibre";
   import { colors } from "../colors";
   import SequentialLegend from "./SequentialLegend.svelte";
 
diff --git a/src/lib/browse/layers/CombinedAuthoritiesLayerControl.svelte b/src/lib/browse/layers/CombinedAuthoritiesLayerControl.svelte
index 023dd91bc..9af12c02f 100644
--- a/src/lib/browse/layers/CombinedAuthoritiesLayerControl.svelte
+++ b/src/lib/browse/layers/CombinedAuthoritiesLayerControl.svelte
@@ -1,11 +1,5 @@
 <script lang="ts">
   import type { MapGeoJSONFeature } from "maplibre-gl";
-  import {
-    hoveredToggle,
-    overwriteLineLayer,
-    overwritePolygonLayer,
-    overwriteSource,
-  } from "../../../maplibre_helpers";
   import { map } from "../../../stores";
   import {
     ColorLegend,
@@ -14,6 +8,12 @@
     InteractiveLayer,
   } from "../../common";
   import { Checkbox } from "../../govuk";
+  import {
+    hoveredToggle,
+    overwriteLineLayer,
+    overwritePolygonLayer,
+    overwriteSource,
+  } from "../../maplibre";
   import { colors } from "../colors";
 
   let name = "combined_authorities";
diff --git a/src/lib/browse/layers/CycleParkingLayerControl.svelte b/src/lib/browse/layers/CycleParkingLayerControl.svelte
index 5e8edf451..71c717181 100644
--- a/src/lib/browse/layers/CycleParkingLayerControl.svelte
+++ b/src/lib/browse/layers/CycleParkingLayerControl.svelte
@@ -1,9 +1,5 @@
 <script lang="ts">
   import type { MapGeoJSONFeature } from "maplibre-gl";
-  import {
-    overwriteCircleLayer,
-    overwritePmtilesSource,
-  } from "../../../maplibre_helpers";
   import { map } from "../../../stores";
   import {
     ColorLegend,
@@ -12,6 +8,7 @@
     InteractiveLayer,
   } from "../../common";
   import { Checkbox } from "../../govuk";
+  import { overwriteCircleLayer, overwritePmtilesSource } from "../../maplibre";
   import { colors } from "../colors";
 
   let name = "cycle_parking";
diff --git a/src/lib/browse/layers/CyclePathsLayerControl.svelte b/src/lib/browse/layers/CyclePathsLayerControl.svelte
index 8750ea211..9dbde3dbd 100644
--- a/src/lib/browse/layers/CyclePathsLayerControl.svelte
+++ b/src/lib/browse/layers/CyclePathsLayerControl.svelte
@@ -1,11 +1,5 @@
 <script lang="ts">
   import type { MapGeoJSONFeature } from "maplibre-gl";
-  import {
-    constructMatchExpression,
-    hoveredToggle,
-    overwriteLineLayer,
-    overwritePmtilesSource,
-  } from "../../../maplibre_helpers";
   import { map } from "../../../stores";
   import {
     ColorLegend,
@@ -14,6 +8,12 @@
     InteractiveLayer,
   } from "../../common";
   import { Checkbox } from "../../govuk";
+  import {
+    constructMatchExpression,
+    hoveredToggle,
+    overwriteLineLayer,
+    overwritePmtilesSource,
+  } from "../../maplibre";
   import { colors } from "../colors";
 
   let name = "cycle_paths";
diff --git a/src/lib/browse/layers/ImdLayerControl.svelte b/src/lib/browse/layers/ImdLayerControl.svelte
index b3591b6b9..f977fda64 100644
--- a/src/lib/browse/layers/ImdLayerControl.svelte
+++ b/src/lib/browse/layers/ImdLayerControl.svelte
@@ -1,15 +1,15 @@
 <script lang="ts">
   import type { MapGeoJSONFeature } from "maplibre-gl";
+  import { map } from "../../../stores";
+  import { ExternalLink, HelpButton, InteractiveLayer } from "../../common";
+  import { Checkbox } from "../../govuk";
   import {
     hoveredToggle,
     makeColorRamp,
     overwriteLineLayer,
     overwritePmtilesSource,
     overwritePolygonLayer,
-  } from "../../../maplibre_helpers";
-  import { map } from "../../../stores";
-  import { ExternalLink, HelpButton, InteractiveLayer } from "../../common";
-  import { Checkbox } from "../../govuk";
+  } from "../../maplibre";
   import { colors } from "../colors";
   import SequentialLegend from "./SequentialLegend.svelte";
 
diff --git a/src/lib/browse/layers/LocalAuthorityDistrictsLayerControl.svelte b/src/lib/browse/layers/LocalAuthorityDistrictsLayerControl.svelte
index 04b0a8d32..f55b28e31 100644
--- a/src/lib/browse/layers/LocalAuthorityDistrictsLayerControl.svelte
+++ b/src/lib/browse/layers/LocalAuthorityDistrictsLayerControl.svelte
@@ -1,11 +1,5 @@
 <script lang="ts">
   import type { MapGeoJSONFeature } from "maplibre-gl";
-  import {
-    hoveredToggle,
-    overwriteLineLayer,
-    overwritePolygonLayer,
-    overwriteSource,
-  } from "../../../maplibre_helpers";
   import { map } from "../../../stores";
   import {
     ColorLegend,
@@ -14,6 +8,12 @@
     InteractiveLayer,
   } from "../../common";
   import { Checkbox } from "../../govuk";
+  import {
+    hoveredToggle,
+    overwriteLineLayer,
+    overwritePolygonLayer,
+    overwriteSource,
+  } from "../../maplibre";
   import { colors } from "../colors";
 
   let name = "local_authority_districts";
diff --git a/src/lib/browse/layers/LocalPlanningAuthoritiesLayerControl.svelte b/src/lib/browse/layers/LocalPlanningAuthoritiesLayerControl.svelte
index 6e68fefed..8fbe68f39 100644
--- a/src/lib/browse/layers/LocalPlanningAuthoritiesLayerControl.svelte
+++ b/src/lib/browse/layers/LocalPlanningAuthoritiesLayerControl.svelte
@@ -1,11 +1,5 @@
 <script lang="ts">
   import type { MapGeoJSONFeature } from "maplibre-gl";
-  import {
-    hoveredToggle,
-    overwriteLineLayer,
-    overwritePmtilesSource,
-    overwritePolygonLayer,
-  } from "../../../maplibre_helpers";
   import { map } from "../../../stores";
   import {
     ColorLegend,
@@ -14,6 +8,12 @@
     InteractiveLayer,
   } from "../../common";
   import { Checkbox } from "../../govuk";
+  import {
+    hoveredToggle,
+    overwriteLineLayer,
+    overwritePmtilesSource,
+    overwritePolygonLayer,
+  } from "../../maplibre";
   import { colors } from "../colors";
 
   let name = "local_planning_authorities";
diff --git a/src/lib/browse/layers/MrnLayerControl.svelte b/src/lib/browse/layers/MrnLayerControl.svelte
index d1d575aad..dc8118e90 100644
--- a/src/lib/browse/layers/MrnLayerControl.svelte
+++ b/src/lib/browse/layers/MrnLayerControl.svelte
@@ -1,10 +1,5 @@
 <script lang="ts">
   import type { MapGeoJSONFeature } from "maplibre-gl";
-  import {
-    hoveredToggle,
-    overwriteLineLayer,
-    overwritePmtilesSource,
-  } from "../../../maplibre_helpers";
   import { map } from "../../../stores";
   import {
     ColorLegend,
@@ -13,6 +8,11 @@
     InteractiveLayer,
   } from "../../common";
   import { Checkbox } from "../../govuk";
+  import {
+    hoveredToggle,
+    overwriteLineLayer,
+    overwritePmtilesSource,
+  } from "../../maplibre";
   import { colors } from "../colors";
 
   let name = "mrn";
diff --git a/src/lib/browse/layers/ParliamentaryConstituenciesLayerControl.svelte b/src/lib/browse/layers/ParliamentaryConstituenciesLayerControl.svelte
index 34039625b..1e08d0049 100644
--- a/src/lib/browse/layers/ParliamentaryConstituenciesLayerControl.svelte
+++ b/src/lib/browse/layers/ParliamentaryConstituenciesLayerControl.svelte
@@ -1,11 +1,5 @@
 <script lang="ts">
   import type { MapGeoJSONFeature } from "maplibre-gl";
-  import {
-    hoveredToggle,
-    overwriteLineLayer,
-    overwritePmtilesSource,
-    overwritePolygonLayer,
-  } from "../../../maplibre_helpers";
   import { map } from "../../../stores";
   import {
     ColorLegend,
@@ -14,6 +8,12 @@
     InteractiveLayer,
   } from "../../common";
   import { Checkbox } from "../../govuk";
+  import {
+    hoveredToggle,
+    overwriteLineLayer,
+    overwritePmtilesSource,
+    overwritePolygonLayer,
+  } from "../../maplibre";
   import { colors } from "../colors";
 
   let name = "parliamentary_constituencies";
diff --git a/src/lib/browse/layers/PointAmenityLayerControl.svelte b/src/lib/browse/layers/PointAmenityLayerControl.svelte
index b7cfed82c..961354563 100644
--- a/src/lib/browse/layers/PointAmenityLayerControl.svelte
+++ b/src/lib/browse/layers/PointAmenityLayerControl.svelte
@@ -1,12 +1,9 @@
 <script lang="ts">
   import type { MapGeoJSONFeature } from "maplibre-gl";
-  import {
-    overwriteCircleLayer,
-    overwriteSource,
-  } from "../../../maplibre_helpers";
   import { map } from "../../../stores";
   import { ColorLegend, HelpButton, InteractiveLayer } from "../../common";
   import { Checkbox } from "../../govuk";
+  import { overwriteCircleLayer, overwriteSource } from "../../maplibre";
   import { colors } from "../colors";
 
   // This name is used for multiple things:
diff --git a/src/lib/browse/layers/PolygonAmenityLayerControl.svelte b/src/lib/browse/layers/PolygonAmenityLayerControl.svelte
index 7e0e39a2d..985ea4f91 100644
--- a/src/lib/browse/layers/PolygonAmenityLayerControl.svelte
+++ b/src/lib/browse/layers/PolygonAmenityLayerControl.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
   import type { MapGeoJSONFeature } from "maplibre-gl";
+  import { map } from "../../../stores";
+  import { ColorLegend, HelpButton, InteractiveLayer } from "../../common";
+  import { Checkbox } from "../../govuk";
   import {
     hoveredToggle,
     overwritePmtilesSource,
     overwritePolygonLayer,
-  } from "../../../maplibre_helpers";
-  import { map } from "../../../stores";
-  import { ColorLegend, HelpButton, InteractiveLayer } from "../../common";
-  import { Checkbox } from "../../govuk";
+  } from "../../maplibre";
   import { colors } from "../colors";
 
   // This name is used for multiple things:
diff --git a/src/lib/browse/layers/WardsLayerControl.svelte b/src/lib/browse/layers/WardsLayerControl.svelte
index e0569d1e7..9e8f332d9 100644
--- a/src/lib/browse/layers/WardsLayerControl.svelte
+++ b/src/lib/browse/layers/WardsLayerControl.svelte
@@ -1,11 +1,5 @@
 <script lang="ts">
   import type { MapGeoJSONFeature } from "maplibre-gl";
-  import {
-    hoveredToggle,
-    overwriteLineLayer,
-    overwritePmtilesSource,
-    overwritePolygonLayer,
-  } from "../../../maplibre_helpers";
   import { map } from "../../../stores";
   import {
     ColorLegend,
@@ -14,6 +8,12 @@
     InteractiveLayer,
   } from "../../common";
   import { Checkbox } from "../../govuk";
+  import {
+    hoveredToggle,
+    overwriteLineLayer,
+    overwritePmtilesSource,
+    overwritePolygonLayer,
+  } from "../../maplibre";
   import { colors } from "../colors";
 
   let name = "wards";
diff --git a/src/lib/common/ZoomOutMap.svelte b/src/lib/common/ZoomOutMap.svelte
index e82c54d78..854248209 100644
--- a/src/lib/common/ZoomOutMap.svelte
+++ b/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 { bbox } from "../maplibre";
 
   export let boundaryGeojson: GeoJSON;
 
diff --git a/src/lib/draw/AttributeMode.svelte b/src/lib/draw/AttributeMode.svelte
index d71a020d7..2bd667a95 100644
--- a/src/lib/draw/AttributeMode.svelte
+++ b/src/lib/draw/AttributeMode.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { type MapMouseEvent } from "maplibre-gl";
   import { onDestroy } from "svelte";
-  import { bbox } from "../../maplibre_helpers";
   import { schemaSingularNoun } from "../../schemas";
   import {
     currentMode,
@@ -12,6 +11,7 @@
     openFromSidebar,
   } from "../../stores";
   import type { Mode, Schema } from "../../types";
+  import { bbox } from "../maplibre";
   import type { EventHandler } from "./event_handler";
 
   const thisMode = "edit-attribute";
diff --git a/src/lib/draw/GeometryMode.svelte b/src/lib/draw/GeometryMode.svelte
index 221d0f396..19a4658e8 100644
--- a/src/lib/draw/GeometryMode.svelte
+++ b/src/lib/draw/GeometryMode.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { LineString, Point, Polygon } from "geojson";
   import { MapMouseEvent } from "maplibre-gl";
-  import type { FeatureWithProps } from "../../maplibre_helpers";
+  import type { FeatureWithProps } from "../maplibre";
   import { schemaSingularNoun } from "../../schemas";
   import { currentMode, gjScheme, map, mapHover } from "../../stores";
   import type { Feature, FeatureUnion, Schema } from "../../types";
diff --git a/src/lib/draw/HoverLayer.svelte b/src/lib/draw/HoverLayer.svelte
index ee88e165c..e06b70e83 100644
--- a/src/lib/draw/HoverLayer.svelte
+++ b/src/lib/draw/HoverLayer.svelte
@@ -9,7 +9,7 @@
     overwriteCircleLayer,
     overwriteLineLayer,
     overwriteSource,
-  } from "../../maplibre_helpers";
+  } from "../maplibre";
   import {
     formOpen,
     gjScheme,
diff --git a/src/lib/draw/InterventionLayer.svelte b/src/lib/draw/InterventionLayer.svelte
index 12f7a7654..a539dbb43 100644
--- a/src/lib/draw/InterventionLayer.svelte
+++ b/src/lib/draw/InterventionLayer.svelte
@@ -13,7 +13,7 @@
     overwriteLineLayer,
     overwritePolygonLayer,
     overwriteSource,
-  } from "../../maplibre_helpers";
+  } from "../maplibre";
   import { gjScheme, map } from "../../stores";
 
   export let colorInterventions: DataDrivenPropertyValueSpecification<string>;
diff --git a/src/lib/draw/common.ts b/src/lib/draw/common.ts
index 1d14e1622..024eb39ae 100644
--- a/src/lib/draw/common.ts
+++ b/src/lib/draw/common.ts
@@ -1,8 +1,8 @@
 import type { LineString, Polygon } from "geojson";
 import { get } from "svelte/store";
-import type { FeatureWithProps } from "../../maplibre_helpers";
 import { currentMode, formOpen, gjScheme, newFeatureId } from "../../stores";
 import type { FeatureUnion, Mode } from "../../types";
+import type { FeatureWithProps } from "../maplibre/utils";
 
 interface Tool {
   addEventListenerSuccess(
diff --git a/src/lib/draw/point/point_tool.ts b/src/lib/draw/point/point_tool.ts
index 45348a2e4..29af46d5d 100644
--- a/src/lib/draw/point/point_tool.ts
+++ b/src/lib/draw/point/point_tool.ts
@@ -1,7 +1,7 @@
 import type { Point } from "geojson";
 import type { Map, MapMouseEvent } from "maplibre-gl";
-import { pointFeature, type FeatureWithProps } from "../../../maplibre_helpers";
 import { isAToolInUse } from "../../../stores";
+import { pointFeature, type FeatureWithProps } from "../../maplibre/utils";
 import type { EventHandler } from "../event_handler";
 
 // Note this uses the geojson FeatureWithProps, not our specialization in types.ts
diff --git a/src/lib/draw/polygon/PolygonMode.svelte b/src/lib/draw/polygon/PolygonMode.svelte
index 25600c94d..7947cdb58 100644
--- a/src/lib/draw/polygon/PolygonMode.svelte
+++ b/src/lib/draw/polygon/PolygonMode.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import type { Polygon } from "geojson";
-  import type { FeatureWithProps } from "../../../maplibre_helpers";
+  import type { FeatureWithProps } from "../../maplibre";
   import { currentMode } from "../../../stores";
   import type { Mode } from "../../../types";
   import { handleUnsavedFeature, setupEventListeners } from "../common";
diff --git a/src/lib/draw/polygon/polygon_tool.ts b/src/lib/draw/polygon/polygon_tool.ts
index 4dc5baf11..b778a4df1 100644
--- a/src/lib/draw/polygon/polygon_tool.ts
+++ b/src/lib/draw/polygon/polygon_tool.ts
@@ -7,6 +7,7 @@ import type {
   MapMouseEvent,
 } from "maplibre-gl";
 import { circleRadius, colors } from "../../../colors";
+import { isAToolInUse } from "../../../stores";
 import {
   emptyGeojson,
   isLine,
@@ -19,8 +20,7 @@ import {
   pointFeature,
   setPrecision,
   type FeatureWithProps,
-} from "../../../maplibre_helpers";
-import { isAToolInUse } from "../../../stores";
+} from "../../maplibre/utils";
 import type { EventHandler } from "../event_handler";
 
 const source = "edit-polygon-mode";
diff --git a/src/lib/draw/route/RouteMode.svelte b/src/lib/draw/route/RouteMode.svelte
index 8117eae9f..292c4f256 100644
--- a/src/lib/draw/route/RouteMode.svelte
+++ b/src/lib/draw/route/RouteMode.svelte
@@ -2,9 +2,9 @@
   import type { LineString } from "geojson";
   import init from "route-snapper";
   import { onMount } from "svelte";
-  import type { FeatureWithProps } from "../../../maplibre_helpers";
   import { currentMode, map } from "../../../stores";
   import type { Mode } from "../../../types";
+  import type { FeatureWithProps } from "../../maplibre";
   import { handleUnsavedFeature, setupEventListeners } from "../common";
   import type { EventHandler } from "../event_handler";
   import { RouteTool } from "./route_tool";
diff --git a/src/lib/draw/route/SplitRouteMode.svelte b/src/lib/draw/route/SplitRouteMode.svelte
index 689c9e607..cd1f66067 100644
--- a/src/lib/draw/route/SplitRouteMode.svelte
+++ b/src/lib/draw/route/SplitRouteMode.svelte
@@ -8,15 +8,15 @@
   import type { Feature, LineString, Point, Position } from "geojson";
   import type { GeoJSONSource, MapMouseEvent } from "maplibre-gl";
   import splitIcon from "../../../../assets/split_route.svg";
+  import { currentMode, gjScheme, map, newFeatureId } from "../../../stores";
+  import type { Mode, Feature as OurFeature } from "../../../types";
+  import { CollapsibleCard } from "../../common";
   import {
     emptyGeojson,
     overwriteCircleLayer,
     overwriteSource,
     setPrecision,
-  } from "../../../maplibre_helpers";
-  import { currentMode, gjScheme, map, newFeatureId } from "../../../stores";
-  import type { Mode, Feature as OurFeature } from "../../../types";
-  import { CollapsibleCard } from "../../common";
+  } from "../../maplibre";
   import type { EventHandler } from "../event_handler";
 
   const thisMode = "split-route";
diff --git a/src/lib/draw/route/route_tool.ts b/src/lib/draw/route/route_tool.ts
index b34d6237b..5ff2e31f9 100644
--- a/src/lib/draw/route/route_tool.ts
+++ b/src/lib/draw/route/route_tool.ts
@@ -1,6 +1,7 @@
 import type { LineString, Polygon } from "geojson";
 import type { GeoJSONSource, Map, MapMouseEvent } from "maplibre-gl";
 import { JsRouteSnapper } from "route-snapper";
+import { isAToolInUse } from "../../../stores";
 import {
   constructMatchExpression,
   emptyGeojson,
@@ -12,8 +13,7 @@ import {
   overwritePolygonLayer,
   overwriteSource,
   type FeatureWithProps,
-} from "../../../maplibre_helpers";
-import { isAToolInUse } from "../../../stores";
+} from "../../maplibre/utils";
 import type { EventHandler } from "../event_handler";
 
 const source = "route-snapper";
diff --git a/src/lib/draw/snap_polygon/SnapPolygonMode.svelte b/src/lib/draw/snap_polygon/SnapPolygonMode.svelte
index 04e664291..1ab0f80b9 100644
--- a/src/lib/draw/snap_polygon/SnapPolygonMode.svelte
+++ b/src/lib/draw/snap_polygon/SnapPolygonMode.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import type { Polygon } from "geojson";
-  import type { FeatureWithProps } from "../../../maplibre_helpers";
+  import type { FeatureWithProps } from "../../maplibre";
   import { currentMode } from "../../../stores";
   import type { Mode } from "../../../types";
   import { handleUnsavedFeature, setupEventListeners } from "../common";
diff --git a/src/lib/forms/FormV1.svelte b/src/lib/forms/FormV1.svelte
index 5e8544ed4..23cd0a444 100644
--- a/src/lib/forms/FormV1.svelte
+++ b/src/lib/forms/FormV1.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import type { Feature, LineString } from "geojson";
-  import { prettyPrintMeters } from "../../maplibre_helpers";
   import { gjScheme, routeInfo } from "../../stores";
   import { FormElement, Radio, SecondaryButton, TextArea } from "../govuk";
+  import { prettyPrintMeters } from "../maplibre";
   import RouteInfoLayers from "./RouteInfoLayers.svelte";
 
   export let id: number;
diff --git a/src/lib/layers/SpeedLimits.svelte b/src/lib/layers/SpeedLimits.svelte
index a66f52dfa..9c2533a4a 100644
--- a/src/lib/layers/SpeedLimits.svelte
+++ b/src/lib/layers/SpeedLimits.svelte
@@ -13,7 +13,7 @@
     emptyGeojson,
     overwriteLineLayer,
     overwriteSource,
-  } from "../../maplibre_helpers";
+  } from "../maplibre";
   import { gjScheme, map, routeInfo } from "../../stores";
   import type { Feature } from "../../types";
   import { DiscreteLegend, HelpButton, InteractiveLayer } from "../common";
diff --git a/src/lib/layers/lane_details/IntersectionMarkings.svelte b/src/lib/layers/lane_details/IntersectionMarkings.svelte
index 90aa21ded..0c77fe0d8 100644
--- a/src/lib/layers/lane_details/IntersectionMarkings.svelte
+++ b/src/lib/layers/lane_details/IntersectionMarkings.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import type { GeoJSON } from "geojson";
-  import { constructMatchExpression } from "../../../maplibre_helpers";
+  import { constructMatchExpression } from "../../maplibre";
   import Layer from "./Layer.svelte";
 
   export let gj: GeoJSON;
diff --git a/src/lib/layers/lane_details/IntersectionPolygons.svelte b/src/lib/layers/lane_details/IntersectionPolygons.svelte
index a314898b4..16d2d40b9 100644
--- a/src/lib/layers/lane_details/IntersectionPolygons.svelte
+++ b/src/lib/layers/lane_details/IntersectionPolygons.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import type { GeoJSON } from "geojson";
-  import { constructMatchExpression } from "../../../maplibre_helpers";
+  import { constructMatchExpression } from "../../maplibre";
   import Layer from "./Layer.svelte";
 
   export let gj: GeoJSON;
diff --git a/src/lib/layers/lane_details/LaneMarkings.svelte b/src/lib/layers/lane_details/LaneMarkings.svelte
index 2e984a821..6c5398874 100644
--- a/src/lib/layers/lane_details/LaneMarkings.svelte
+++ b/src/lib/layers/lane_details/LaneMarkings.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import type { GeoJSON } from "geojson";
-  import { constructMatchExpression } from "../../../maplibre_helpers";
+  import { constructMatchExpression } from "../../maplibre";
   import Layer from "./Layer.svelte";
 
   export let gj: GeoJSON;
diff --git a/src/lib/layers/lane_details/LanePolygons.svelte b/src/lib/layers/lane_details/LanePolygons.svelte
index e2a3cf46b..a76eea7f6 100644
--- a/src/lib/layers/lane_details/LanePolygons.svelte
+++ b/src/lib/layers/lane_details/LanePolygons.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import type { GeoJSON } from "geojson";
-  import { constructMatchExpression } from "../../../maplibre_helpers";
+  import { constructMatchExpression } from "../../maplibre";
   import Layer from "./Layer.svelte";
 
   export let gj: GeoJSON;
diff --git a/src/lib/layers/lane_details/Layer.svelte b/src/lib/layers/lane_details/Layer.svelte
index 8e5bb5985..8c29916f9 100644
--- a/src/lib/layers/lane_details/Layer.svelte
+++ b/src/lib/layers/lane_details/Layer.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import type { GeoJSON } from "geojson";
   import { onDestroy } from "svelte";
-  import { overwriteLayer, overwriteSource } from "../../../maplibre_helpers";
   import { map } from "../../../stores";
+  import { overwriteLayer, overwriteSource } from "../../maplibre";
 
   // This component manages a source with exactly one layer. Both are torn down
   // when this component is destroyed.
diff --git a/src/lib/maplibre/index.ts b/src/lib/maplibre/index.ts
new file mode 100644
index 000000000..178cd64f8
--- /dev/null
+++ b/src/lib/maplibre/index.ts
@@ -0,0 +1 @@
+export * from "./utils";
diff --git a/src/maplibre_helpers.ts b/src/lib/maplibre/utils.ts
similarity index 100%
rename from src/maplibre_helpers.ts
rename to src/lib/maplibre/utils.ts
diff --git a/src/pages/BrowseSchemes.svelte b/src/pages/BrowseSchemes.svelte
index de1571c63..6c022d2bc 100644
--- a/src/pages/BrowseSchemes.svelte
+++ b/src/pages/BrowseSchemes.svelte
@@ -20,7 +20,7 @@
   import PmTiles from "../lib/common/PmTiles.svelte";
   import InterventionLayer from "../lib/draw/InterventionLayer.svelte";
   import { ErrorMessage, SecondaryButton } from "../lib/govuk";
-  import { bbox, emptyGeojson, prettyPrintMeters } from "../maplibre_helpers";
+  import { bbox, emptyGeojson, prettyPrintMeters } from "../lib/maplibre";
   import { colorInterventionsBySchema } from "../schemas";
   import { gjScheme, map } from "../stores";
   import type { Scheme as GjScheme } from "../types";
diff --git a/src/pages/ChooseArea.svelte b/src/pages/ChooseArea.svelte
index 4fed4b7c0..426f5e56c 100644
--- a/src/pages/ChooseArea.svelte
+++ b/src/pages/ChooseArea.svelte
@@ -15,8 +15,8 @@
   import "maplibre-gl/dist/maplibre-gl.css";
   import { FileInput, InteractiveLayer } from "../lib/common";
   import { getAuthoritiesGeoJson } from "../lib/common/data_getter";
+  import { bbox, hoveredToggle } from "../lib/maplibre";
   import About from "../lib/sidebar/About.svelte";
-  import { bbox, hoveredToggle } from "../maplibre_helpers";
   import { map as mapStore } from "../stores";
   import type { Schema } from "../types";
 
diff --git a/src/schemas.ts b/src/schemas.ts
index 0eb93db8f..1d30c4487 100644
--- a/src/schemas.ts
+++ b/src/schemas.ts
@@ -1,6 +1,6 @@
 import type { DataDrivenPropertyValueSpecification } from "maplibre-gl";
 import { colors } from "./colors";
-import { constructMatchExpression } from "./maplibre_helpers";
+import { constructMatchExpression } from "./lib/maplibre/utils";
 import type { Schema } from "./types";
 
 export function schemaTitle(schema: Schema): string {
diff --git a/src/stores.ts b/src/stores.ts
index ac03fe220..0c5a29aed 100644
--- a/src/stores.ts
+++ b/src/stores.ts
@@ -1,7 +1,7 @@
 import { type Remote } from "comlink";
 import type { Map } from "maplibre-gl";
 import { writable, type Writable } from "svelte/store";
-import { emptyGeojson } from "./maplibre_helpers";
+import { emptyGeojson } from "./lib/maplibre/utils";
 import {
   isStreetViewImagery,
   type Mode,