@rcpch/imd-map 0.1.2 → 0.2.1

package/CHANGELOG.md

@@ -8,6 +8,19 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
+## [0.2.0] — 2026-04-26
+
+### Changed
+
+- Switched local authority boundary overlay to zoom-tiered pg_tileserv tables (`public.la_tiles_z0_4`, `public.la_tiles_z5_7`, `public.la_tiles_z8_10`, `public.la_tiles_z11_14`) with tier-matched layer zoom windows.
+- Switched health boundary overlays to zoom-tiered pg_tileserv tables for NHS England regions (`public.nhser_tiles_2021_*`), ICBs (`public.icb_tiles_2023_*`), and Welsh LHBs (`public.lhb_tiles_2022_*`).
+- Corrected overlay `source-layer` usage to match deployed overlay vector tiles by using schema-qualified layer names (for example `public.la_tiles_z5_7`) and keeping `source-layer` equal to the URL table id.
+- Updated overlay visibility handling so hide/show applies across all zoom-tier boundary layers.
+
+### Added
+
+- Unit tests covering tiered overlay source/layer creation, source-layer naming, and overlay hide behavior across tiers.
+
 ## [0.1.0] — 2026-04-20
 
 ### Added

package/README.md

@@ -201,6 +201,17 @@ Tile URL resolution precedence:
 
 The library source contains **no hardcoded tile URLs**.
 
+### Overlay boundary tile contract
+
+Boundary overlays (local authority, NHSER, ICB, LHB) are requested from schema-qualified table ids and rendered with the same schema-qualified `source-layer` name. Example:
+
+- URL table id: `public.la_tiles_z5_7`
+- `source-layer`: `public.la_tiles_z5_7`
+
+If you self-host boundary tiles, ensure each overlay PBF exposes the exact same layer name string as the table id used in the URL path.
+
+Bring your own overlay configuration (custom overlay table/layer names via library options) could be enabled in a future release. If you need this, please open a GitHub issue so contributors can prioritise and scope it.
+
 ---
 
 ## Nation and era rules

package/dist/index.esm.js

@@ -882,55 +882,79 @@ function normalizeLeadCentreInput(data) {
     properties: { label }
   };
 }
+
+// src/overlays/mvtLayerName.ts
+var DEFAULT_TILES_SCHEMA = "public";
+function buildMvtLayerName(baseName, tier, schema = DEFAULT_TILES_SCHEMA) {
+  return `${schema}.${baseName}_${tier}`;
+}
+
+// src/overlays/localAuthority.ts
 var LOCAL_AUTHORITY_SOURCE_ID = "rcpch-imd-la-overlay";
 var LOCAL_AUTHORITY_LAYER_ID = "rcpch-imd-la-overlay-line";
-var LOCAL_AUTHORITY_FULL_TABLE_NAME = "public.la_tiles";
-var LOCAL_AUTHORITY_SOURCE_LAYER = "public.la_tiles";
+var LOCAL_AUTHORITY_TABLE_PREFIX = "la_tiles";
+function localAuthoritySourceId(tier) {
+  return `${LOCAL_AUTHORITY_SOURCE_ID}-${tier}`;
+}
+function localAuthorityLayerId(tier) {
+  return `${LOCAL_AUTHORITY_LAYER_ID}-${tier}`;
+}
 function addOrUpdateLocalAuthorityOverlay(map, tilesBaseUrl, style) {
-  const tileUrl = buildTileUrl(tilesBaseUrl, LOCAL_AUTHORITY_FULL_TABLE_NAME);
-  const existing = map.getSource(LOCAL_AUTHORITY_SOURCE_ID);
-  if (existing instanceof VectorTileSource) {
-    existing.setTiles([tileUrl]);
-  } else {
-    if (existing) map.removeSource(LOCAL_AUTHORITY_SOURCE_ID);
-    map.addSource(LOCAL_AUTHORITY_SOURCE_ID, {
-      type: "vector",
-      tiles: [tileUrl],
-      minzoom: 0,
-      maxzoom: 14
+  for (const { tier, minzoom, maxzoom } of ZOOM_TIERS) {
+    const sourceId = localAuthoritySourceId(tier);
+    const layerId = localAuthorityLayerId(tier);
+    const fullTableName = buildMvtLayerName(LOCAL_AUTHORITY_TABLE_PREFIX, tier);
+    const sourceLayer = fullTableName;
+    const tileUrl = buildTileUrl(tilesBaseUrl, fullTableName);
+    const existing = map.getSource(sourceId);
+    if (existing instanceof VectorTileSource) {
+      existing.setTiles([tileUrl]);
+    } else {
+      if (existing) map.removeSource(sourceId);
+      map.addSource(sourceId, {
+        type: "vector",
+        tiles: [tileUrl],
+        minzoom: 0,
+        maxzoom: 14
+      });
+    }
+    if (map.getLayer(layerId)) {
+      map.setPaintProperty(
+        layerId,
+        "line-color",
+        style.boundaries.localAuthorityColor ?? "#0d0d58"
+      );
+      map.setPaintProperty(
+        layerId,
+        "line-width",
+        style.boundaries.localAuthorityWidth ?? 1
+      );
+      map.setLayoutProperty(layerId, "visibility", "visible");
+      continue;
+    }
+    map.addLayer({
+      id: layerId,
+      type: "line",
+      source: sourceId,
+      "source-layer": sourceLayer,
+      minzoom,
+      maxzoom,
+      paint: {
+        "line-color": style.boundaries.localAuthorityColor ?? "#0d0d58",
+        "line-width": style.boundaries.localAuthorityWidth ?? 1
+      },
+      layout: {
+        visibility: "visible"
+      }
     });
   }
-  if (map.getLayer(LOCAL_AUTHORITY_LAYER_ID)) {
-    map.setPaintProperty(
-      LOCAL_AUTHORITY_LAYER_ID,
-      "line-color",
-      style.boundaries.localAuthorityColor ?? "#0d0d58"
-    );
-    map.setPaintProperty(
-      LOCAL_AUTHORITY_LAYER_ID,
-      "line-width",
-      style.boundaries.localAuthorityWidth ?? 1
-    );
-    map.setLayoutProperty(LOCAL_AUTHORITY_LAYER_ID, "visibility", "visible");
-    return;
-  }
-  map.addLayer({
-    id: LOCAL_AUTHORITY_LAYER_ID,
-    type: "line",
-    source: LOCAL_AUTHORITY_SOURCE_ID,
-    "source-layer": LOCAL_AUTHORITY_SOURCE_LAYER,
-    paint: {
-      "line-color": style.boundaries.localAuthorityColor ?? "#0d0d58",
-      "line-width": style.boundaries.localAuthorityWidth ?? 1
-    },
-    layout: {
-      visibility: "visible"
-    }
-  });
 }
 function hideLocalAuthorityOverlay(map) {
-  if (map.getLayer(LOCAL_AUTHORITY_LAYER_ID)) {
-    map.setLayoutProperty(LOCAL_AUTHORITY_LAYER_ID, "visibility", "none");
+  for (const { tier } of ZOOM_TIERS) {
+    const layerId = localAuthorityLayerId(tier);
+    if (map.getLayer(layerId)) {
+      map.setLayoutProperty(layerId, "visibility", "none");
+    }
   }
 }
 var NHSER_SOURCE_ID = "rcpch-imd-nhser-overlay";
@@ -939,52 +963,62 @@ var ICB_SOURCE_ID = "rcpch-imd-icb-overlay";
 var ICB_LAYER_ID = "rcpch-imd-icb-overlay-line";
 var LHB_SOURCE_ID = "rcpch-imd-lhb-overlay";
 var LHB_LAYER_ID = "rcpch-imd-lhb-overlay-line";
-var NHSER_FULL_TABLE_NAME = "public.nhser_tiles_2021";
-var NHSER_SOURCE_LAYER = "public.nhser_tiles_2021";
-var ICB_FULL_TABLE_NAME = "public.icb_tiles_2023";
-var ICB_SOURCE_LAYER = "public.icb_tiles_2023";
-var LHB_FULL_TABLE_NAME = "public.lhb_tiles_2022";
-var LHB_SOURCE_LAYER = "public.lhb_tiles_2022";
+var NHSER_TABLE_PREFIX = "nhser_tiles_2021";
+var ICB_TABLE_PREFIX = "icb_tiles_2023";
+var LHB_TABLE_PREFIX = "lhb_tiles_2022";
+function overlaySourceId(baseSourceId, tier) {
+  return `${baseSourceId}-${tier}`;
+}
+function overlayLayerId(baseLayerId, tier) {
+  return `${baseLayerId}-${tier}`;
+}
 function addOrUpdateBoundaryOverlay(map, tilesBaseUrl, input) {
-  const tileUrl = buildTileUrl(tilesBaseUrl, input.fullTableName);
-  const existing = map.getSource(input.sourceId);
-  if (existing instanceof VectorTileSource) {
-    existing.setTiles([tileUrl]);
-  } else {
-    if (existing) map.removeSource(input.sourceId);
-    map.addSource(input.sourceId, {
-      type: "vector",
-      tiles: [tileUrl],
-      minzoom: 0,
-      maxzoom: 14
+  for (const { tier, minzoom, maxzoom } of ZOOM_TIERS) {
+    const sourceId = overlaySourceId(input.sourceId, tier);
+    const layerId = overlayLayerId(input.layerId, tier);
+    const fullTableName = buildMvtLayerName(input.tablePrefix, tier);
+    const sourceLayer = fullTableName;
+    const tileUrl = buildTileUrl(tilesBaseUrl, fullTableName);
+    const existing = map.getSource(sourceId);
+    if (existing instanceof VectorTileSource) {
+      existing.setTiles([tileUrl]);
+    } else {
+      if (existing) map.removeSource(sourceId);
+      map.addSource(sourceId, {
+        type: "vector",
+        tiles: [tileUrl],
+        minzoom: 0,
+        maxzoom: 14
+      });
+    }
+    if (map.getLayer(layerId)) {
+      map.setPaintProperty(layerId, "line-color", input.lineColor);
+      map.setPaintProperty(layerId, "line-width", input.lineWidth);
+      map.setLayoutProperty(layerId, "visibility", "visible");
+      continue;
+    }
+    map.addLayer({
+      id: layerId,
+      type: "line",
+      source: sourceId,
+      "source-layer": sourceLayer,
+      minzoom,
+      maxzoom,
+      paint: {
+        "line-color": input.lineColor,
+        "line-width": input.lineWidth
+      },
+      layout: {
+        visibility: "visible"
+      }
     });
   }
-  if (map.getLayer(input.layerId)) {
-    map.setPaintProperty(input.layerId, "line-color", input.lineColor);
-    map.setPaintProperty(input.layerId, "line-width", input.lineWidth);
-    map.setLayoutProperty(input.layerId, "visibility", "visible");
-    return;
-  }
-  map.addLayer({
-    id: input.layerId,
-    type: "line",
-    source: input.sourceId,
-    "source-layer": input.sourceLayer,
-    paint: {
-      "line-color": input.lineColor,
-      "line-width": input.lineWidth
-    },
-    layout: {
-      visibility: "visible"
-    }
-  });
 }
 function addOrUpdateNhserOverlay(map, tilesBaseUrl, style) {
   addOrUpdateBoundaryOverlay(map, tilesBaseUrl, {
     sourceId: NHSER_SOURCE_ID,
     layerId: NHSER_LAYER_ID,
-    fullTableName: NHSER_FULL_TABLE_NAME,
-    sourceLayer: NHSER_SOURCE_LAYER,
+    tablePrefix: NHSER_TABLE_PREFIX,
     lineColor: style.boundaries.nhserColor ?? "#e00087",
     lineWidth: style.boundaries.nhserWidth ?? 1.5
   });
@@ -993,8 +1027,7 @@ function addOrUpdateIcbOverlay(map, tilesBaseUrl, style) {
   addOrUpdateBoundaryOverlay(map, tilesBaseUrl, {
     sourceId: ICB_SOURCE_ID,
     layerId: ICB_LAYER_ID,
-    fullTableName: ICB_FULL_TABLE_NAME,
-    sourceLayer: ICB_SOURCE_LAYER,
+    tablePrefix: ICB_TABLE_PREFIX,
     lineColor: style.boundaries.icbColor ?? "#57c7f2",
     lineWidth: style.boundaries.icbWidth ?? 1
   });
@@ -1003,15 +1036,17 @@ function addOrUpdateLhbOverlay(map, tilesBaseUrl, style) {
   addOrUpdateBoundaryOverlay(map, tilesBaseUrl, {
     sourceId: LHB_SOURCE_ID,
     layerId: LHB_LAYER_ID,
-    fullTableName: LHB_FULL_TABLE_NAME,
-    sourceLayer: LHB_SOURCE_LAYER,
+    tablePrefix: LHB_TABLE_PREFIX,
     lineColor: style.boundaries.lhbColor ?? "#57c7f2",
     lineWidth: style.boundaries.lhbWidth ?? 1
   });
 }
 function hideOverlay(map, layerId) {
-  if (map.getLayer(layerId)) {
-    map.setLayoutProperty(layerId, "visibility", "none");
+  for (const { tier } of ZOOM_TIERS) {
+    const tierLayerId = overlayLayerId(layerId, tier);
+    if (map.getLayer(tierLayerId)) {
+      map.setLayoutProperty(tierLayerId, "visibility", "none");
+    }
   }
 }
 function hideNhserOverlay(map) {