@chrtco/sdk 0.10.11 → 0.10.13

package/CHANGELOG.md

@@ -5,6 +5,18 @@ All notable changes to `@chrtco/sdk` will be documented in this file.
 ## [Unreleased]
 
 ### Added
+- **`StyleGeneratorOptions.labels`** — `"legacy"` (default) or `"placename"`.
+  `"placename"` swaps the 9 orientation classes' 54-layer per-band label fan
+  for 2 collision-managed `PLACENAME` symbol layers over the tile pipeline's
+  place-name index: one label per named place, per-feature zoom windows
+  (`min_z`/`max_z` from place extent, S-57 SCAMIN and class floors), and a
+  build-side `rank` driving `symbol-sort-key` so the most important names
+  survive density. Requires tiles carrying the `PLACENAME` layer; the default
+  stays `"legacy"` until the deconfliction rollout flips it
+  (docs/design/chart-label-deconfliction.md §2.3). New exports:
+  `buildPlaceNameLayers()`, `PLACENAME_SOURCE_LAYER`,
+  `PLACENAME_WATER_CLASSES`, `PLACENAME_LAND_CLASSES`, and the per-class
+  tier expression builders (`buildSeaAreaTierExpression()` et al.).
 - **CHRTland on the Style API** — `StyleUrlOptions.land` / `.relief` thread
   `?land=` / `?relief=` to `GET /v1/styles/{region}/style.json`. `generateStyle`
   learned to emit CHRTland and the first-party app learned to ask for it, but

package/dist/index.cjs

@@ -70,6 +70,9 @@ __export(index_exports, {
   NON_SOLAS_DISCLAIMER_SHORT: () => NON_SOLAS_DISCLAIMER_SHORT,
   OfflineError: () => OfflineError,
   OfflineStyleError: () => OfflineStyleError,
+  PLACENAME_LAND_CLASSES: () => PLACENAME_LAND_CLASSES,
+  PLACENAME_SOURCE_LAYER: () => PLACENAME_SOURCE_LAYER,
+  PLACENAME_WATER_CLASSES: () => PLACENAME_WATER_CLASSES,
   RASTER_ATON_CLASSES: () => RASTER_ATON_CLASSES,
   RASTER_GLYPH_NAMES: () => RASTER_GLYPH_NAMES,
   RASTER_ICON_PREFIX: () => RASTER_ICON_PREFIX,
@@ -109,10 +112,18 @@ __export(index_exports, {
   applyS101SymbolSet: () => applyS101SymbolSet,
   atonIconExpression: () => atonIconExpression,
   bandFilterExpression: () => bandFilterExpression,
+  buildAirportTierExpression: () => buildAirportTierExpression,
+  buildBuiltUpAreaTierExpression: () => buildBuiltUpAreaTierExpression,
   buildFlashPattern: () => buildFlashPattern,
   buildLabelLayer: () => buildLabelLayer,
+  buildLakeTierExpression: () => buildLakeTierExpression,
+  buildLandAreaTierExpression: () => buildLandAreaTierExpression,
+  buildLandRegionTierExpression: () => buildLandRegionTierExpression,
   buildLayersForClass: () => buildLayersForClass,
   buildOfflineStyle: () => buildOfflineStyle,
+  buildPlaceNameLayers: () => buildPlaceNameLayers,
+  buildRiverTierExpression: () => buildRiverTierExpression,
+  buildSeaAreaTierExpression: () => buildSeaAreaTierExpression,
   buildSectorArcGeoJSON: () => buildSectorArcGeoJSON,
   buildSectorArcsFC: () => buildSectorArcsFC,
   buildSectorsFromFeatures: () => buildSectorsFromFeatures,
@@ -5477,16 +5488,23 @@ function patternSpriteId(patternName) {
 // src/atlas/s52-conditional.ts
 var DEFAULT_SAFETY_CONTOUR_M = 10;
 var DEPARE_DEEP_CUT_M = 18.2;
-function depareColor(props, ct = "DAY") {
+var DEPARE_SHALLOW_CUT_M = 2;
+function effectiveSafetyContour(safetyContourM) {
+  if (!Number.isFinite(safetyContourM)) return DEFAULT_SAFETY_CONTOUR_M;
+  return Math.min(Math.max(safetyContourM, DEPARE_SHALLOW_CUT_M), DEPARE_DEEP_CUT_M);
+}
+function depareColor(props, ct = "DAY", safetyContourM = DEFAULT_SAFETY_CONTOUR_M) {
   const drval1 = Number(props.DRVAL1 ?? props.drval1 ?? -1);
   const drval2 = Number(props.DRVAL2 ?? props.drval2 ?? drval1);
+  const safety = effectiveSafetyContour(safetyContourM);
   if (drval1 < 0 && drval2 <= 0) return resolveColor("DEPIT", ct);
-  if (drval1 < 2) return resolveColor("DEPVS", ct);
-  if (drval1 < 5) return resolveColor("DEPMS", ct);
+  if (drval1 < DEPARE_SHALLOW_CUT_M) return resolveColor("DEPVS", ct);
+  if (drval1 < safety) return resolveColor("DEPMS", ct);
   if (drval1 < DEPARE_DEEP_CUT_M) return resolveColor("DEPMD", ct);
   return resolveColor("DEPDW", ct);
 }
-function depareFillExpression(ct = "DAY") {
+function depareFillExpression(ct = "DAY", safetyContourM = DEFAULT_SAFETY_CONTOUR_M) {
+  const safety = effectiveSafetyContour(safetyContourM);
   return [
     "case",
     [
@@ -5495,9 +5513,9 @@ function depareFillExpression(ct = "DAY") {
       ["<=", ["coalesce", ["get", "DRVAL2"], ["get", "drval2"], 0], 0]
     ],
     resolveColor("DEPIT", ct),
-    ["<", ["coalesce", ["get", "DRVAL1"], ["get", "drval1"], -1], 2],
+    ["<", ["coalesce", ["get", "DRVAL1"], ["get", "drval1"], -1], DEPARE_SHALLOW_CUT_M],
     resolveColor("DEPVS", ct),
-    ["<", ["coalesce", ["get", "DRVAL1"], ["get", "drval1"], -1], 5],
+    ["<", ["coalesce", ["get", "DRVAL1"], ["get", "drval1"], -1], safety],
     resolveColor("DEPMS", ct),
     ["<", ["coalesce", ["get", "DRVAL1"], ["get", "drval1"], -1], DEPARE_DEEP_CUT_M],
     resolveColor("DEPMD", ct),
@@ -22276,15 +22294,32 @@ function isVisibleInMode(displayCategory, mode) {
   if (mode === "STANDARD") return displayCategory === "BASE" || displayCategory === "STANDARD";
   return displayCategory === "BASE";
 }
+var SCAMIN_ZOOM_BUCKETS = [
+  [12e3, 14],
+  [22e3, 12],
+  [45e3, 11],
+  [9e4, 10],
+  [35e4, 8],
+  [15e5, 6]
+];
 function scaminToMinZoom(scamin) {
   if (scamin === void 0 || scamin === null || scamin === 0) return void 0;
-  if (scamin >= 15e5) return 6;
-  if (scamin >= 35e4) return 8;
-  if (scamin >= 9e4) return 10;
-  if (scamin >= 45e3) return 11;
-  if (scamin >= 22e3) return 12;
-  if (scamin >= 12e3) return 14;
-  return void 0;
+  let zoom;
+  for (const [denom, z] of SCAMIN_ZOOM_BUCKETS) {
+    if (scamin >= denom) zoom = z;
+  }
+  return zoom;
+}
+function scaminZoomGateFilter() {
+  const step = [
+    "step",
+    ["to-number", ["coalesce", ["get", "SCAMIN"], ["get", "scamin"], 0]],
+    0
+  ];
+  for (const [denom, z] of SCAMIN_ZOOM_BUCKETS) {
+    step.push(denom, z);
+  }
+  return [">=", ["zoom"], step];
 }
 var SAFETY_CRITICAL_GROUPS = /* @__PURE__ */ new Set([24020, 27010, 27070, 27080]);
 var OPAQUE_FILL_LAYERS = /* @__PURE__ */ new Set(["DEPARE", "LNDARE", "UNSARE", "LAKARE", "DRGARE", "SEAARE"]);
@@ -22318,7 +22353,7 @@ var ZOOM_SCALED_LINES = {
   BRIDGE: [8, 1, 14, 2],
   DAMCON: [8, 1, 14, 2]
 };
-function resolvePaint(layerName, paint, geomType, ct = "DAY") {
+function resolvePaint(layerName, paint, geomType, ct = "DAY", opts = {}) {
   const resolved = {};
   for (const [key, value] of Object.entries(paint)) {
     if (typeof value === "string" && /^[A-Z]{4,5}[0-9]?$/.test(value)) {
@@ -22328,7 +22363,7 @@ function resolvePaint(layerName, paint, geomType, ct = "DAY") {
     }
   }
   if (layerName === "DEPARE" && geomType === "fill") {
-    resolved["fill-color"] = depareFillExpression(ct);
+    resolved["fill-color"] = depareFillExpression(ct, opts.safetyContour);
   } else if (layerName === "LIGHTS" && geomType === "circle") {
     resolved["circle-color"] = lightFillExpression(ct);
   } else if ((layerName === "BOYLAT" || layerName === "BCNLAT") && geomType === "circle") {
@@ -22340,7 +22375,7 @@ function resolvePaint(layerName, paint, geomType, ct = "DAY") {
   }
   return resolved;
 }
-function resolveStyle(layerName, geomKind, ct = "DAY") {
+function resolveStyle(layerName, geomKind, ct = "DAY", opts = {}) {
   const entry = S52_LOOKUP[layerName];
   if (!entry) {
     const type = geomKind ?? "circle";
@@ -22376,7 +22411,7 @@ function resolveStyle(layerName, geomKind, ct = "DAY") {
     const paint2 = effectiveType === "fill" ? { "fill-color": hexColor, "fill-opacity": 0.3 } : effectiveType === "line" ? { "line-color": hexColor, "line-width": 1 } : { "circle-color": hexColor, "circle-radius": 3, "circle-stroke-width": 0 };
     return { type: effectiveType, paint: paint2 };
   }
-  const paint = resolvePaint(layerName, { ...entry.style.paint }, effectiveType, ct);
+  const paint = resolvePaint(layerName, { ...entry.style.paint }, effectiveType, ct, opts);
   if (effectiveType === "fill" && OPAQUE_FILL_LAYERS.has(layerName)) {
     paint["fill-opacity"] = 1;
   }
@@ -23325,21 +23360,19 @@ function getLabelConfig(layerName, opts = {}) {
         layout: orientationLabelLayout({
           "text-letter-spacing": 0.15,
           "text-max-width": 9,
-          // SEAARE is always-paint, unlike the other orientation classes.
-          // MapLibre places symbols topmost-layer-first, so with
-          // allow-overlap:false the dense sounding field (drawn above)
-          // collision-starves big-water names — observed on staging at z8:
-          // only 2 SEAARE labels survived viewport-wide, with Cape Cod Bay
-          // and Gulf of Maine dropped entirely. Always-paint is safe for
-          // this class because (a) the dominance composition in
-          // fanOrientationLabelByCellBand suppresses cross-band duplicate
-          // copies, and (b) tier sizing zeroes relief/anchorage names at
-          // the zooms where density is a problem. Rivers/lakes/land keep
-          // collision-dedup — their within-band multi-polygon stacking was
-          // the original complaint, and they lack big-water headline value.
-          "text-allow-overlap": true,
-          "text-ignore-placement": true,
-          "text-optional": false,
+          // SEAARE was always-paint (allow-overlap + ignore-placement)
+          // because collision starved big-water names at z8. That trade
+          // inverted in the field on 2026-08-21: the always-paint copies —
+          // per band, per adjacent cell, and one per TILE-CLIPPED piece of
+          // a big polygon — stack into unreadable black smears (dozens of
+          // "Chesapeake Bay" at z9, owner screenshot). With collision ON
+          // the duplicates collide with EACH OTHER, so MapLibre keeps one
+          // and drops the rest: a possibly-starved name beats an illegible
+          // smear categorically. This is the interim state until the
+          // PLACENAME layer (one anchor per named place, PR #1308) reaches
+          // the tiles and replaces this fan outright — do not restore
+          // always-paint on a starvation report; flip `labels: "placename"`
+          // instead once the build carries the layer.
           "text-padding": 2
         })
       };
@@ -24032,6 +24065,102 @@ function computePolygonCentroid(geom) {
   }
   return [sumX / coords.length, sumY / coords.length];
 }
+var PLACENAME_SOURCE_LAYER = "PLACENAME";
+var PLACENAME_WATER_CLASSES = [
+  "SEAARE",
+  "LAKARE",
+  "RIVERS",
+  "CANALS",
+  "PRDARE"
+];
+var PLACENAME_LAND_CLASSES = [
+  "LNDRGN",
+  "LNDARE",
+  "BUAARE",
+  "AIRARE"
+];
+var PLACENAME_FITS = ["<=", ["coalesce", ["get", "min_z"], 0], ["zoom"]];
+var PLACENAME_RETIRES = [">=", ["coalesce", ["get", "max_z"], 14], ["zoom"]];
+var PLACENAME_TIER = [
+  "to-number",
+  ["coalesce", ["get", "tier"], 9]
+];
+var PLACENAME_TEXT_OPACITY = [
+  "interpolate",
+  ["linear"],
+  ["zoom"],
+  3,
+  0.55,
+  9,
+  0.5,
+  12,
+  0.4,
+  16,
+  0.3
+];
+var PLACENAME_WATER_SIZE_STOPS = [
+  [3, [14, 9, 0, 0, 0, 0, 0, 0, 0, 0]],
+  [5, [16, 13, 9, 0, 0, 0, 0, 0, 0, 0]],
+  [7, [14, 14, 12, 9, 0, 0, 0, 0, 0, 0]],
+  [9, [12, 13, 14, 11, 10, 9, 0, 9, 9, 9]],
+  [11, [10, 12, 13, 12, 10, 9, 9, 11, 11, 9]],
+  [13, [9, 11, 12, 11, 10, 10, 10, 11, 11, 10]],
+  [16, [9, 10, 11, 10, 9, 9, 9, 10, 10, 9]]
+];
+var PLACENAME_LAND_SIZE_STOPS = [
+  [3, [0, 0, 11, 0, 0, 0, 0, 0, 0, 0]],
+  [5, [0, 0, 13, 0, 0, 0, 0, 0, 0, 0]],
+  [7, [0, 0, 13, 9, 9, 0, 0, 0, 0, 0]],
+  [9, [0, 0, 12, 12, 11, 0, 0, 0, 0, 0]],
+  [11, [0, 0, 11, 12, 11, 9, 9, 0, 0, 9]],
+  [13, [0, 0, 10, 11, 10, 11, 10, 10, 10, 10]],
+  [16, [0, 0, 10, 10, 9, 10, 9, 9, 9, 9]]
+];
+function buildPlaceNameLayers(sourceId) {
+  const sortKey = ["to-number", ["coalesce", ["get", "rank"], 9999999]];
+  const make = (idSuffix, classes, font, haloColor, letterSpacing, stops) => ({
+    id: `chrt-placename-${idSuffix}`,
+    type: "symbol",
+    source: sourceId,
+    "source-layer": PLACENAME_SOURCE_LAYER,
+    minzoom: 3,
+    filter: [
+      "all",
+      ["match", ["get", "cls"], [...classes], true, false],
+      PLACENAME_FITS,
+      PLACENAME_RETIRES
+    ],
+    layout: {
+      "text-field": ["get", "name"],
+      "text-font": font,
+      "text-size": tieredSizeCurve(PLACENAME_TIER, stops),
+      "text-letter-spacing": letterSpacing,
+      "text-max-width": 9,
+      "text-padding": 4,
+      "text-allow-overlap": false,
+      "text-ignore-placement": false,
+      "text-optional": true,
+      "text-variable-anchor": ["center", "top", "bottom", "left", "right"],
+      "text-radial-offset": 0.3,
+      "text-justify": "auto",
+      "symbol-sort-key": sortKey
+    },
+    paint: {
+      "text-color": DARK_BG,
+      "text-halo-color": haloColor,
+      "text-halo-width": ORIENTATION_HALO_WIDTH,
+      "text-opacity": PLACENAME_TEXT_OPACITY
+    },
+    metadata: {
+      "chrt:placename": true,
+      "chrt:labelPriority": ORIENTATION_LABEL_PRIORITY
+    }
+  });
+  return [
+    make("water", PLACENAME_WATER_CLASSES, ["Open Sans Italic"], COLOR.WATER_DEEP, 0.05, PLACENAME_WATER_SIZE_STOPS),
+    make("land", PLACENAME_LAND_CLASSES, ["Open Sans Regular"], COLOR.LAND_REGION, 0.02, PLACENAME_LAND_SIZE_STOPS)
+  ];
+}
 
 // src/atlas/feature-decimation.ts
 function getGridSizeForZoom(zoom) {
@@ -26850,6 +26979,13 @@ function buildSources(opts = {}) {
 }
 
 // src/atlas/layer-builder.ts
+var SCAMIN_DECLUTTER_CLASSES = /* @__PURE__ */ new Set([
+  "OFSPLF",
+  "PIPSOL",
+  "PIPARE",
+  "CBLSUB",
+  "CBLARE"
+]);
 var GEOM_FILTERS = {
   fill: ["any", ["==", ["geometry-type"], "Polygon"], ["==", ["geometry-type"], "MultiPolygon"]],
   line: ["any", ["==", ["geometry-type"], "LineString"], ["==", ["geometry-type"], "MultiLineString"]],
@@ -27008,7 +27144,7 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
   const layers = [];
   const geomTypes = getGeomTypesForClass(objectClass, entry?.style.type);
   for (const geomType of geomTypes) {
-    const resolved = resolveStyle(objectClass, geomType, ct);
+    const resolved = resolveStyle(objectClass, geomType, ct, { safetyContour: opts.safetyContour });
     const layerId = `s52-${objectClass}-${resolved.type}`;
     const layer = {
       id: layerId,
@@ -27027,6 +27163,9 @@ function buildLayersForClass(objectClass, ct, sourceId = DEFAULT_REGION, opts =
     } else if (GEOM_FILTERS[resolved.type]) {
       layer.filter = GEOM_FILTERS[resolved.type];
     }
+    if (SCAMIN_DECLUTTER_CLASSES.has(objectClass)) {
+      layer.filter = layer.filter ? ["all", layer.filter, scaminZoomGateFilter()] : ["all", scaminZoomGateFilter()];
+    }
     if (resolved.minzoom) {
       layer.minzoom = resolved.minzoom;
     }
@@ -28322,6 +28461,18 @@ function isExemptOpaqueFill(layer) {
   }
   return false;
 }
+var FILL_FLOOR_FREE_BANDS = /* @__PURE__ */ new Set([
+  "1",
+  "2",
+  "3"
+]);
+function bandVariantMinzoom(layer, B) {
+  const classMinzoom = layer.minzoom ?? 0;
+  if (isExemptOpaqueFill(layer) && FILL_FLOOR_FREE_BANDS.has(B)) {
+    return classMinzoom;
+  }
+  return Math.max(classMinzoom, BAND_PRIORITY_RANGES[B].minzoom);
+}
 var BAND_DRAW_ORDER = ["1", "2", "3", "4", "5", "6"];
 var CHART_BAND_CODES = {
   Overview: ["1"],
@@ -28440,9 +28591,7 @@ function collapsedDominanceGate(B, minzoom) {
   return ["any", ...clauses];
 }
 function makeCollapsedBandVariant(layer, B, isExempt) {
-  const range = BAND_PRIORITY_RANGES[B];
-  const classMinzoom = layer.minzoom ?? 0;
-  const minzoom = isExemptOpaqueFill(layer) ? classMinzoom : Math.max(classMinzoom, range.minzoom);
+  const minzoom = bandVariantMinzoom(layer, B);
   if (isExempt) {
     const exempt = {
       ...layer,
@@ -28581,8 +28730,7 @@ function isDominanceExempt(layer) {
 var TOP_STACK_LIGHT_CLASSES = /* @__PURE__ */ new Set(["LIGHTS"]);
 function makeBandVariants(layer, B) {
   const range = BAND_PRIORITY_RANGES[B];
-  const classMinzoom = layer.minzoom ?? 0;
-  const minzoom = isExemptOpaqueFill(layer) ? classMinzoom : Math.max(classMinzoom, range.minzoom);
+  const minzoom = bandVariantMinzoom(layer, B);
   const variants = [];
   if (isDominanceExempt(layer)) {
     const exempt = {
@@ -28812,9 +28960,12 @@ function generateStyle(palette = "DAY", opts = {}) {
     emitChartFeatureVariants(topLightBundles);
     const chartLabelBundles = byLabelPriorityBottomUp(
       bundles.filter(
-        (b) => b.label !== null
+        (b) => b.label !== null && (opts.labels !== "placename" || getLabelBehavior(b.objectClass) !== "orientation-cross-band")
       )
     );
+    if (opts.labels === "placename") {
+      labelLayers.push(...buildPlaceNameLayers(sourceId));
+    }
     for (const { label } of chartLabelBundles) {
       if (bandFan === "collapsed") {
         labelLayers.push(
@@ -28859,10 +29010,14 @@ function generateStyle(palette = "DAY", opts = {}) {
         }
       }
     }
-    for (const { objectClass, label } of bundles) {
-      if (!label) continue;
-      if (getLabelBehavior(objectClass) === "orientation-cross-band") {
-        labelLayers.push(...fanOrientationLabelByCellBand(label, bandFan));
+    if (opts.labels === "placename") {
+      labelLayers.push(...buildPlaceNameLayers(sourceId));
+    } else {
+      for (const { objectClass, label } of bundles) {
+        if (!label) continue;
+        if (getLabelBehavior(objectClass) === "orientation-cross-band") {
+          labelLayers.push(...fanOrientationLabelByCellBand(label, bandFan));
+        }
       }
     }
     const featureLabelBundles = byLabelPriorityBottomUp(
@@ -28883,6 +29038,12 @@ function generateStyle(palette = "DAY", opts = {}) {
   }
   const symbolSet = opts.symbolSet ?? "s52";
   const spriteBase = `${opts.tileBaseUrl ?? "https://tiles.chrt.co"}/v1/sprites`;
+  const isLndareFill = (l) => /^s52-LNDARE-fill-band\d+$/.test(l.id);
+  const emitted = opts.land ? (() => {
+    const fills = layers.filter(isLndareFill);
+    const rest = layers.filter((l) => !isLndareFill(l));
+    return [rest[0], ...fills, ...rest.slice(1)];
+  })() : layers;
   const style = {
     version: 8,
     name: `CHRT ${SYMBOL_SET_LABELS[symbolSet]} ${PALETTE_NAMES[palette]}${opts.chartMode ? ` \u2014 chart:${opts.chartMode.band}` : ""}`,
@@ -28891,7 +29052,7 @@ function generateStyle(palette = "DAY", opts = {}) {
       "chrt:symbol-set": symbolSet,
       "chrt:color-table": palette,
       "chrt:generated-at": (/* @__PURE__ */ new Date()).toISOString(),
-      "chrt:layer-count": layers.length,
+      "chrt:layer-count": emitted.length,
       "chrt:land": Boolean(opts.land),
       "chrt:relief": Boolean(opts.relief),
       "chrt:render-mode": opts.chartMode ? `chart:${opts.chartMode.band}` : "continuous",
@@ -28914,7 +29075,7 @@ function generateStyle(palette = "DAY", opts = {}) {
       sprite: `${spriteBase}/${symbolSet}-${palette.toLowerCase()}`
     },
     glyphs: "https://fonts.openmaptiles.org/{fontstack}/{range}.pbf",
-    layers
+    layers: emitted
   };
   if (symbolSet === "s101") return applyS101SymbolSet(style);
   if (symbolSet === "chrt") return applyChrtSymbolSet(style, palette);
@@ -29743,6 +29904,9 @@ var Chrt = class {
   NON_SOLAS_DISCLAIMER_SHORT,
   OfflineError,
   OfflineStyleError,
+  PLACENAME_LAND_CLASSES,
+  PLACENAME_SOURCE_LAYER,
+  PLACENAME_WATER_CLASSES,
   RASTER_ATON_CLASSES,
   RASTER_GLYPH_NAMES,
   RASTER_ICON_PREFIX,
@@ -29782,10 +29946,18 @@ var Chrt = class {
   applyS101SymbolSet,
   atonIconExpression,
   bandFilterExpression,
+  buildAirportTierExpression,
+  buildBuiltUpAreaTierExpression,
   buildFlashPattern,
   buildLabelLayer,
+  buildLakeTierExpression,
+  buildLandAreaTierExpression,
+  buildLandRegionTierExpression,
   buildLayersForClass,
   buildOfflineStyle,
+  buildPlaceNameLayers,
+  buildRiverTierExpression,
+  buildSeaAreaTierExpression,
   buildSectorArcGeoJSON,
   buildSectorArcsFC,
   buildSectorsFromFeatures,