Rework to use maplibre helpers as library

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>;

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";

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";

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";

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";
 

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";

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";

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";

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";
 

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";

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";

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";

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";

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:

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:

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";

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;
 

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";

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";

src/lib/draw/HoverLayer.svelte

@@ -9,7 +9,7 @@
     overwriteCircleLayer,
     overwriteLineLayer,
     overwriteSource,
-  } from "../../maplibre_helpers";
+  } from "../maplibre";
   import {
     formOpen,
     gjScheme,

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>;

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(

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

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";