@chrtco/sdk 0.10.10 → 0.10.12

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,
@@ -24032,6 +24043,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) {
@@ -28307,6 +28414,21 @@ var BAND_DATA_MINZOOM = {
 function dominatedVariantMaxzoom(D) {
   return Math.max(BAND_PRIORITY_RANGES[D].minzoom, BAND_DATA_MINZOOM[D]);
 }
+var DOMINANCE_EXEMPT_FILL_CLASSES = /* @__PURE__ */ new Set([
+  "LNDARE",
+  "DEPARE",
+  "UNSARE",
+  "LAKARE",
+  "DRGARE",
+  "SEAARE"
+]);
+function isExemptOpaqueFill(layer) {
+  if (layer.type !== "fill") return false;
+  for (const cls of DOMINANCE_EXEMPT_FILL_CLASSES) {
+    if (layer.id.startsWith(`s52-${cls}-`)) return true;
+  }
+  return false;
+}
 var BAND_DRAW_ORDER = ["1", "2", "3", "4", "5", "6"];
 var CHART_BAND_CODES = {
   Overview: ["1"],
@@ -28427,7 +28549,7 @@ function collapsedDominanceGate(B, minzoom) {
 function makeCollapsedBandVariant(layer, B, isExempt) {
   const range = BAND_PRIORITY_RANGES[B];
   const classMinzoom = layer.minzoom ?? 0;
-  const minzoom = Math.max(classMinzoom, range.minzoom);
+  const minzoom = isExemptOpaqueFill(layer) ? classMinzoom : Math.max(classMinzoom, range.minzoom);
   if (isExempt) {
     const exempt = {
       ...layer,
@@ -28556,30 +28678,18 @@ var DOMINANCE_EXEMPT_CLASSES = /* @__PURE__ */ new Set([
   "RTPBCN",
   "RDOSTA"
 ]);
-var DOMINANCE_EXEMPT_FILL_CLASSES = /* @__PURE__ */ new Set([
-  "LNDARE",
-  "DEPARE",
-  "UNSARE",
-  "LAKARE",
-  "DRGARE",
-  "SEAARE"
-]);
 function isDominanceExempt(layer) {
   for (const cls of DOMINANCE_EXEMPT_CLASSES) {
     if (layer.id.startsWith(`s52-${cls}-`)) return true;
   }
-  if (layer.type === "fill") {
-    for (const cls of DOMINANCE_EXEMPT_FILL_CLASSES) {
-      if (layer.id.startsWith(`s52-${cls}-`)) return true;
-    }
-  }
+  if (isExemptOpaqueFill(layer)) return true;
   return false;
 }
 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 = Math.max(classMinzoom, range.minzoom);
+  const minzoom = isExemptOpaqueFill(layer) ? classMinzoom : Math.max(classMinzoom, range.minzoom);
   const variants = [];
   if (isDominanceExempt(layer)) {
     const exempt = {
@@ -28809,9 +28919,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(
@@ -28856,10 +28969,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(
@@ -29740,6 +29857,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,
@@ -29779,10 +29899,18 @@ var Chrt = class {
   applyS101SymbolSet,
   atonIconExpression,
   bandFilterExpression,
+  buildAirportTierExpression,
+  buildBuiltUpAreaTierExpression,
   buildFlashPattern,
   buildLabelLayer,
+  buildLakeTierExpression,
+  buildLandAreaTierExpression,
+  buildLandRegionTierExpression,
   buildLayersForClass,
   buildOfflineStyle,
+  buildPlaceNameLayers,
+  buildRiverTierExpression,
+  buildSeaAreaTierExpression,
   buildSectorArcGeoJSON,
   buildSectorArcsFC,
   buildSectorsFromFeatures,