@tileflow/maps 0.1.0-alpha.10 → 0.1.0-alpha.12

package/README.md

@@ -157,15 +157,13 @@ own colors.
 southeast at dawn, southwest at dusk and western moonlight at night. Monochrome has distinct
 directions and strengths. Tileflow holds zoom 14+ values; Standard varies intensity below z14.
 Shading differs; `controller.setSun({date, location})` uses the real sun instead of presets.
+Landmark material profiles and subtle dusk/night illumination are covered in
+[3D buildings](https://github.com/tileflow/tileflow-sdk/blob/main/packages/core/docs/buildings-3d.md).
 The buildings' `threeDimensional.lighting` and `shadows` options control the effect, and each
 theme's `lighting.sun.shadowIntensity` and `lighting.ambient` control its strength.
 Street lights are opt-in: set `roads.streetLights.enabled: true`.
-Core's 3D renderer
-adds a soft ten-percent shade at the foot of the facades, fading within the lowest three metres
-(less on low buildings). Exterior corners have a 0.8 m radius and the roof/wall junction has a narrow
-lighting transition; roofs keep their authored colour. Streets enables soft three-metre contact
-shadows without dark overlaps; `buildings.threeDimensional.occlusion: false` disables them.
-Core replaces the extrusion fallback's blurred bands, styled by `buildings.contactShadow`.
+Core adds contact shade and rounded exterior corners. `buildings.threeDimensional.occlusion: false`
+disables contact shade and model ambient occlusion; `buildings.contactShadow` styles the flat fallback.
 Streets selects Core's `labels.roadPlacement: 'ground'`: street names follow the road plane below
 buildings; POIs, transit names and shields remain above. Disabling roads omits their names.
 Road rings, ramp and surface ordering use [Core's replaceable defaults](../core/docs/cartographic-defaults.md).
@@ -256,9 +254,9 @@ The GitHub-distributed `@tileflow/community-maps` package exports `cyberpunk`, `
 `superTileWorld`, plus each map's font and icon descriptors. Install an exact Git commit using
 the instructions and compatible Core version in that repository.
 
-Soundings is not a navigation product. Its depth-band edges are approximate reference geometry,
-not surveyed isolines or vessel-specific safety contours. Experimental nautical aids and hazards
-are not enabled by that official map.
+Soundings is not a navigation product; its depth-band edges are approximate. It draws Nautical
+marks with its chart symbols and a "Not for navigation" notice; other maps opt in with
+`marine: 'nautical'` (see Core's Nautical marks guide).
 
 ## Themes and assets
 

package/THIRD_PARTY_NOTICES.md

@@ -105,16 +105,17 @@ attribution.
 
 ## Nautical-chart references
 
-The `soundings` map and its ten SVG symbols and patterns are original Tileflow code and artwork.
+The `soundings` map and its eleven SVG symbols and patterns are original Tileflow code and artwork.
 Its visual grammar was informed by NOAA's
 [Historical Map & Chart Collection](https://historicalcharts.noaa.gov/) and the IHO
 [S-4 and INT 1 standards index](https://iho.int/standards-and-specifications) as cartographic
 references. This package does not include or redistribute NOAA chart images, IHO publication
 artwork, official symbol sheets, fonts, hydrographic surveys, or navigation data.
 
-The map can visualize broad GEBCO-derived bathymetric bands exposed by the selected Tileflow data
-source. Those bands are not packaged here and are not navigation-grade soundings. Soundings is a
-general-purpose visual map, not a nautical chart for navigation.
+The map can visualize broad GEBCO-derived bathymetric bands and `nautical-v1` navigation marks
+exposed by the selected data sources. Neither is packaged here; the bands are not navigation-grade
+soundings, and the marks keep the attribution of their own source. Soundings is a general-purpose
+visual map, not a nautical chart for navigation.
 
 ## Siegfried Map reference and terrain data
 

package/assets/README.md

@@ -66,15 +66,18 @@ wetland. The 18 runtime IDs use `siegfried-<motif>` for the historical light tre
 packaged Cormorant Garamond faces selected by both themes. See `siegfried/README.md` and the
 package-level `THIRD_PARTY_NOTICES.md` for provenance and licensing.
 
-The Soundings directory contains ten original nautical symbols and intrinsic-size patterns:
+The Soundings directory contains eleven original nautical symbols and intrinsic-size patterns:
 `soundings-harbor`, `soundings-lighthouse`, `soundings-light-flare`, `soundings-buoy-port`,
-`soundings-buoy-starboard`, `soundings-buoy-cardinal`, `soundings-wreck`,
-`soundings-rock-awash`, `soundings-paper-grain`, and `soundings-water-dots`. They express familiar
-paper-chart concepts without bundling a historical chart, specification artwork, or navigation
-data. Official Soundings references only `soundings-paper-grain` and `soundings-water-dots`;
-the eight point symbols remain available to the separate experimental Nautical canary. A generic
-World POI is deliberately not relabelled as a harbour. Soundings uses GEBCO-derived depth bands only
-as broad cartographic context and is not a navigation product.
+`soundings-buoy-starboard`, `soundings-buoy-cardinal`, `soundings-buoy-pillar`,
+`soundings-wreck`, `soundings-rock-awash`, `soundings-paper-grain`, and `soundings-water-dots`.
+They express familiar paper-chart concepts without bundling a historical chart, specification
+artwork, or navigation data. Official Soundings draws its paper and water patterns and, through
+theme `nautical.*` image tokens, the buoy, light, lighthouse, wreck, and harbor symbols for its
+Nautical marks. `tileflow.icons.json` declares those eight point symbols as SDF icons, drawn in the
+central 12 of 24 pixels, so each mark takes its own colour; `soundings-rock-awash` remains
+fixed-colour artwork and is unused because rocks are drawn as chart crosses. A generic World POI is
+deliberately not relabelled as a harbour. Soundings uses GEBCO-derived depth bands only as broad
+cartographic context, and neither it nor its Nautical marks is a navigation product.
 
 The Blueprint directory contains four original intrinsic-size patterns and one original
 technical symbol: `blueprint-grid`, `blueprint-building-hatch`,

package/assets/soundings/icons/soundings-buoy-cardinal.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="-16 -16 64 64">
   <title>Cardinal buoy</title>
   <desc>Original Tileflow double-cone cardinal buoy pictogram.</desc>
   <g fill="#000000">

package/assets/soundings/icons/soundings-buoy-pillar.svg

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="-16 -16 64 64">
+  <title>Pillar buoy</title>
+  <desc>Original Tileflow pillar buoy pictogram for buoys without a lateral or cardinal shape.</desc>
+  <g fill="#000000">
+    <circle cx="16" cy="4.4" r="2.6"/>
+    <rect x="14.7" y="5.6" width="2.6" height="8"/>
+    <path d="M11.4 12.4h9.2l2.7 14.3H8.7l2.7-14.3Z"/>
+    <path d="M5.5 28.1h21a1.3 1.3 0 0 1 0 2.6h-21a1.3 1.3 0 0 1 0-2.6Z"/>
+  </g>
+</svg>

package/assets/soundings/icons/soundings-buoy-port.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="-16 -16 64 64">
   <title>Port-hand buoy</title>
   <desc>Original Tileflow can-shaped lateral buoy pictogram.</desc>
   <g fill="#000000">

package/assets/soundings/icons/soundings-buoy-starboard.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="-16 -16 64 64">
   <title>Starboard-hand buoy</title>
   <desc>Original Tileflow conical lateral buoy pictogram.</desc>
   <g fill="#000000">

package/assets/soundings/icons/soundings-harbor.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="-16 -16 64 64">
   <title>Harbor</title>
   <desc>Original Tileflow anchor pictogram.</desc>
   <g fill="none" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.4">

package/assets/soundings/icons/soundings-light-flare.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="-16 -16 64 64">
   <title>Navigational light flare</title>
   <desc>Original Tileflow radial light pictogram.</desc>
   <g fill="none" stroke="#000000" stroke-linecap="round" stroke-width="2.2">

package/assets/soundings/icons/soundings-lighthouse.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="-16 -16 64 64">
   <title>Lighthouse</title>
   <desc>Original Tileflow lighthouse silhouette.</desc>
   <g fill="#000000">

package/assets/soundings/icons/soundings-wreck.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="-16 -16 64 64">
   <title>Wreck</title>
   <desc>Original Tileflow broken-hull wreck pictogram.</desc>
   <path d="M6.2 18.2h7.3l2.5 3.2 2.5-3.2h7.3l-3.4 8.3H9.6l-3.4-8.3Z" fill="#000000"/>

package/assets/soundings/icons/tileflow.icons.json

@@ -0,0 +1,37 @@
+{
+  "schemaVersion": 1,
+  "icons": {
+    "soundings-buoy-cardinal": {
+      "representation": "sdf",
+      "defaults": {"color": "#263D3F", "haloColor": "#F7FBF8", "haloWidth": 1, "haloBlur": 0}
+    },
+    "soundings-buoy-pillar": {
+      "representation": "sdf",
+      "defaults": {"color": "#263D3F", "haloColor": "#F7FBF8", "haloWidth": 1, "haloBlur": 0}
+    },
+    "soundings-buoy-port": {
+      "representation": "sdf",
+      "defaults": {"color": "#263D3F", "haloColor": "#F7FBF8", "haloWidth": 1, "haloBlur": 0}
+    },
+    "soundings-buoy-starboard": {
+      "representation": "sdf",
+      "defaults": {"color": "#263D3F", "haloColor": "#F7FBF8", "haloWidth": 1, "haloBlur": 0}
+    },
+    "soundings-harbor": {
+      "representation": "sdf",
+      "defaults": {"color": "#263D3F", "haloColor": "#F7FBF8", "haloWidth": 1, "haloBlur": 0}
+    },
+    "soundings-light-flare": {
+      "representation": "sdf",
+      "defaults": {"color": "#B12A73", "haloColor": "#F7FBF8", "haloWidth": 0.5, "haloBlur": 0}
+    },
+    "soundings-lighthouse": {
+      "representation": "sdf",
+      "defaults": {"color": "#263D3F", "haloColor": "#F7FBF8", "haloWidth": 1, "haloBlur": 0}
+    },
+    "soundings-wreck": {
+      "representation": "sdf",
+      "defaults": {"color": "#263D3F", "haloColor": "#F7FBF8", "haloWidth": 1, "haloBlur": 0}
+    }
+  }
+}

package/dist/index.d.ts

@@ -769,7 +769,7 @@ declare const soundings: {
     readonly projection: "mercator";
     readonly marine: {
         readonly bathymetry: _tileflow_core.TileflowBathymetryConfig;
-        readonly nautical: false;
+        readonly nautical: {};
     };
     readonly terrain: "none";
     readonly modules: {
@@ -786,6 +786,7 @@ declare const soundings: {
         readonly labels: _tileflow_core.TileflowLabelsModuleConfig;
         readonly land: _tileflow_core.TileflowLandModuleConfig;
         readonly landforms: _tileflow_core.TileflowLandformsModuleConfig;
+        readonly nautical: _tileflow_core.TileflowNauticalModuleConfig;
         readonly poi: Readonly<{
             readonly op: "disable";
         }>;

package/dist/index.js

@@ -103,6 +103,7 @@ var ownerTokenGroups = {
   labels: ["labels", "poi", "transit"],
   land: ["land", "landcover", "landuse", "surface"],
   landforms: ["landforms", "labels", "surface"],
+  nautical: ["hydro", "labels", "poi", "surface"],
   poi: ["poi", "labels", "transit"],
   roads: ["roads"],
   terrain: ["terrain", "landcover", "surface", "labels"],
@@ -230,6 +231,10 @@ function bindOfficialMapTheme(map) {
   }
   const bind = (value, path, owner, semanticPath, insideExpression = false, property) => {
     if (property !== void 0 && classifyTileflowVisualProperty(property, value) === "number") {
+      if (Array.isArray(value) && path.includes(".modelLighting.") && ["emissiveHeight", "hue", "saturation", "lightness"].includes(property))
+        return value.map(
+          (entry, index) => bindNumericOutput(entry, `${path}[${index}]`, `${semanticPath}.${index}`)
+        );
       return bindNumericOutput(value, path, semanticPath);
     }
     if (typeof value === "string") {
@@ -7405,6 +7410,7 @@ import {
   labels as labels6,
   land as land6,
   landforms as landforms6,
+  nautical,
   renderPass as renderPass7,
   transit as transit6,
   water as water6,
@@ -7515,6 +7521,19 @@ var soundingsTheme = defineOfficialTheme({
       rail: soundingsPalette.inkMuted
     }
   },
+  // Nautical marks use the chart symbols of this directory. They are single-colour silhouettes:
+  // buoys and light flares take each mark's own colour from the data, the others print in ink.
+  images: {
+    "nautical.buoy": "soundings-buoy-pillar",
+    "nautical.buoy.cardinal": "soundings-buoy-cardinal",
+    "nautical.buoy.port": "soundings-buoy-port",
+    "nautical.buoy.starboard": "soundings-buoy-starboard",
+    "nautical.harbour": "soundings-harbor",
+    "nautical.light": "soundings-light-flare",
+    "nautical.lighthouse": "soundings-lighthouse",
+    "nautical.port": "soundings-harbor",
+    "nautical.wreck": "soundings-wreck"
+  },
   typography: {
     font: "Noto Sans Regular",
     letterSpacing: 0.025,
@@ -7530,6 +7549,7 @@ var soundingsTheme = defineOfficialTheme({
     position: [1.15, 210, 28]
   }
 });
+var chartInk = { color: soundingsPalette.ink, haloColor: soundingsPalette.water };
 var soundings = bindOfficialMapTheme(
   defineMap6({
     id: "soundings",
@@ -7562,7 +7582,7 @@ var soundings = bindOfficialMapTheme(
           })
         }
       }),
-      nautical: false
+      nautical: {}
     },
     terrain: "none",
     modules: {
@@ -7834,9 +7854,21 @@ var soundings = bindOfficialMapTheme(
           }
         }
       }),
+      // Marks keep the module's data-driven colours and placement; Soundings only sets its
+      // printed ink. Technical magenta stays on operational areas, traffic separation and cables.
+      nautical: nautical({
+        beacons: { marker: { strokeColor: soundingsPalette.ink } },
+        buoys: { icon: { haloColor: soundingsPalette.ink }, text: chartInk },
+        harbours: { icon: chartInk, text: { ...chartInk, color: soundingsPalette.inkMuted } },
+        hazards: { marker: { strokeColor: soundingsPalette.ink }, text: chartInk },
+        lighthouses: { icon: chartInk, text: chartInk },
+        lights: { text: { ...chartInk, color: soundingsPalette.inkMuted } },
+        ports: { icon: chartInk, text: chartInk },
+        wrecks: { icon: chartInk, text: chartInk }
+      }),
       // A broad transport category also contains airports, bus terminals and rail stations.
-      // Painting all of them with a harbor glyph would be semantically false; Soundings waits
-      // for its dedicated nautical harbor layer instead of reinterpreting the World POI contract.
+      // Painting all of them with a harbor glyph would be semantically false; harbours and ports
+      // come from the dedicated Nautical layer instead of reinterpreting the World POI contract.
       poi: disable4(),
       roads: disable4(),
       transit: withRenderStack7(
@@ -8165,6 +8197,7 @@ import {
   refineRenderTarget as refineRenderTarget5,
   renderPass as renderPass10,
   roads as roads6,
+  token as token9,
   transit as transit7,
   water as water7,
   withRenderStack as withRenderStack10,
@@ -9969,6 +10002,46 @@ var streetsLighting = {
   monochrome: monochromeLighting
 };
 
+// src/official/streets-model-lighting.ts
+function streetsModelLighting(preset, family) {
+  const mono = family === "monochrome";
+  const dark = preset === "dusk" || preset === "night";
+  const brightness = mono ? { day: 0.5027777777777778, dawn: 0.41869713699376476, dusk: 0.01331186036230345, night: 0 }[preset] : {
+    day: 0.4777777777777778,
+    dawn: 0.3964860412365071,
+    dusk: 0.026970197755280183,
+    night: 0.013517295842482737
+  }[preset];
+  const share = (low, high) => Math.min(1, Math.max(0, (brightness - low) / (high - low)));
+  const day = share(0.2, 0.4), window = share(0, 0.15), neutral = share(0.16, 0.4);
+  const wall = !dark ? "#FFFFFF" : mono ? preset === "dusk" ? "#F1F1F1" : "#F0F0F0" : family === "faded" ? preset === "dusk" ? "#FDF0DD" : "#FDEFD9" : preset === "dusk" ? "#FDE6CD" : "#FDE4C8";
+  return {
+    colors: {
+      "buildings.modelEmission": wall,
+      "buildings.modelRoof": mono ? "#F3F3F3" : family === "faded" ? "#FDF5EF" : "#FDF1E9"
+    },
+    numbers: {
+      "buildings.modelEmission.strength": (0.1 + 0.7 * share(0.45, 0.5)) * (mono && dark ? 0.5 : 1),
+      "buildings.modelEmission.start": 0.5 * (1 - day),
+      "buildings.modelEmission.end": day,
+      "buildings.modelEmission.curve": 0.8 - 0.2 * day,
+      "buildings.modelDoor.strength": (mono ? 0.2 : 1.5) * (1 - day) + 2.5 * day,
+      "buildings.modelLogo.mix": 0.3 * day,
+      "buildings.modelWindow.strength": (mono ? 0.1 : 0.5) * (1 - day) + 0.4 * day,
+      "buildings.modelWindow.variation": 0.3 * (1 - day),
+      "buildings.modelWindow.hueLow": 200 * window,
+      "buildings.modelWindow.hueHigh": 90 + 125 * window,
+      "buildings.modelWindow.saturationLow": mono ? 0 : 20 + 80 * window,
+      "buildings.modelWindow.saturationHigh": mono ? 0 : 100,
+      "buildings.modelWindow.lightnessLow": 87 - 17 * window,
+      "buildings.modelWindow.lightnessHigh": 87 - 7 * window,
+      "buildings.modelOther.saturation": mono ? 0 : 55 * (1 - neutral),
+      "buildings.modelOther.lightnessLow": 80 + 20 * neutral,
+      "buildings.modelOther.lightnessHigh": 90 + 10 * neutral
+    }
+  };
+}
+
 // src/official/streets-road-colors.ts
 var standardRoadCasingProfiles = {
   "default-dawn": {
@@ -10657,7 +10730,19 @@ function calibratedStreetsColors(preset, theme) {
 function streetsPaletteColors(preset, colorTheme) {
   return {
     ...calibratedStreetsColors(preset, colorTheme),
-    ...streetsCartographyColors(colorTheme, preset)
+    ...streetsCartographyColors(colorTheme, preset),
+    "buildings.floodLight": !isDarkStreetsPreset(preset) ? "#FFFFFF" : colorTheme === "monochrome" ? "#E5E5E5" : colorTheme === "faded" ? "#F8E4C4" : "#F5CFA8",
+    ...streetsModelLighting(preset, colorTheme).colors
+  };
+}
+function streetsLightingNumbers(preset, colorTheme) {
+  const dark = isDarkStreetsPreset(preset);
+  return {
+    "buildings.floodLight.intensity": dark && colorTheme !== "monochrome" ? 0.3 : 0,
+    // Light colours already include the Faded lookup table; lamp activation uses the
+    // corresponding untransformed brightness, independently of that appearance change.
+    "buildings.floodLight.brightnessScale": colorTheme === "faded" ? { day: 1, dawn: 0.9203658119566795, dusk: 0.47333738050439994, night: 0.42688225390661877 }[preset] : 1,
+    ...streetsModelLighting(preset, colorTheme).numbers
   };
 }
 var streetsFonts = {
@@ -10692,7 +10777,7 @@ var streetsLightTheme = defineTheme3({
   colorScheme: "light",
   tokens: {
     color: streetsPaletteColors("day", "default"),
-    number: {},
+    number: streetsLightingNumbers("day", "default"),
     font: streetsFonts,
     image: { ...streetsImages, ...streetsPoiImageTokens("light") }
   },
@@ -10718,7 +10803,7 @@ var streetsDarkTheme = defineTheme3({
   colorScheme: "dark",
   tokens: {
     color: streetsPaletteColors("night", "default"),
-    number: {},
+    number: streetsLightingNumbers("night", "default"),
     font: streetsFonts,
     image: {
       ...streetsImages,
@@ -10756,6 +10841,7 @@ function defineStreetsPaletteTheme(name, preset, colorTheme) {
     lighting: streetsLighting[colorTheme][preset],
     tokens: {
       color: streetsPaletteColors(preset, colorTheme),
+      number: streetsLightingNumbers(preset, colorTheme),
       ...imageVariant ? { image: streetsPoiImageTokens(imageVariant) } : {}
     }
   });
@@ -13202,8 +13288,78 @@ var streets = bindOfficialMapTheme(
       }),
       buildings: withRenderStack10(
         buildings6({
+          // Footprints; the render stack's extrusion pass raises them from z15, and its shadows
+          // stand beside the flat fill, so they require this mode.
           mode: "flat",
-          // 'flat' | '3d'.
+          threeDimensional: {
+            floodLight: {
+              intensity: token9.number("buildings.floodLight.intensity"),
+              brightnessScale: token9.number("buildings.floodLight.brightnessScale"),
+              color: token9.color("buildings.floodLight")
+            },
+            modelLighting: {
+              wall: {
+                emissiveStrength: token9.number("buildings.modelEmission.strength"),
+                emissiveColor: token9.color("buildings.modelEmission"),
+                emissiveHeight: [
+                  token9.number("buildings.modelEmission.start"),
+                  token9.number("buildings.modelEmission.end"),
+                  0,
+                  1,
+                  token9.number("buildings.modelEmission.curve")
+                ],
+                color: token9.color("buildings.modelEmission"),
+                roughness: 1,
+                metallic: 0
+              },
+              roof: { color: token9.color("buildings.modelRoof"), roughness: 1, metallic: 0 },
+              window: {
+                roughness: 0,
+                metallic: 1,
+                emissiveStrength: token9.number("buildings.modelWindow.strength"),
+                emissiveVariation: token9.number("buildings.modelWindow.variation"),
+                emissiveHeight: [0, 0.9, 0, 1, 0.5],
+                colorVariation: {
+                  hue: [
+                    token9.number("buildings.modelWindow.hueLow"),
+                    token9.number("buildings.modelWindow.hueHigh")
+                  ],
+                  saturation: [
+                    token9.number("buildings.modelWindow.saturationLow"),
+                    token9.number("buildings.modelWindow.saturationHigh")
+                  ],
+                  lightness: [
+                    token9.number("buildings.modelWindow.lightnessLow"),
+                    token9.number("buildings.modelWindow.lightnessHigh")
+                  ],
+                  space: "linear"
+                }
+              },
+              ...Object.fromEntries(
+                ["unclassified", "door", "lamp", "logo"].map((role) => [
+                  role,
+                  {
+                    roughness: 1,
+                    metallic: 0,
+                    emissiveStrength: role === "door" ? token9.number("buildings.modelDoor.strength") : role === "logo" ? 0.6 : 0,
+                    colorMix: role === "logo" ? token9.number("buildings.modelLogo.mix") : 1,
+                    colorVariation: {
+                      hue: [10, 70],
+                      saturation: [
+                        token9.number("buildings.modelOther.saturation"),
+                        token9.number("buildings.modelOther.saturation")
+                      ],
+                      lightness: [
+                        token9.number("buildings.modelOther.lightnessLow"),
+                        token9.number("buildings.modelOther.lightnessHigh")
+                      ],
+                      space: "linear"
+                    }
+                  }
+                ])
+              )
+            }
+          },
           businessCorridor: {
             // This compatibility layer contains selected building footprints,
             // not ground. Streets renders the derived business_area class through

package/docs/design-and-assets.md

@@ -99,18 +99,23 @@ depth-graded water, labelled band edges, continuous colour relief, multidirectio
 port context, named ferry routes, and restrained technical magenta. Its initial camera faces the
 Strait of Gibraltar, allowing an Iberian GEBCO pilot to exercise both Atlantic and Mediterranean
 relief. It selects the public semantic compiler contract without importing or extending `streets`
-and explicitly composes World with `bathymetry({display: 'hybrid'})` while setting Nautical to
-`false`.
+and explicitly composes World with `bathymetry({display: 'hybrid'})` and the `nautical-v1`
+navigation marks.
 
 Vector bands come from `tileflow-bathymetry`; continuous colour relief and hillshade come from
-`tileflow-bathymetry-dem`. The stronger DEM treatment is balanced against the vector wash and depth
-labels rather than against experimental navigation symbols. Dashed outlines remain an honest
+`tileflow-bathymetry-dem`. The DEM treatment is balanced against the vector wash, depth labels, and
+the navigation marks. Dashed outlines remain an honest
 fallback traced from broad GEBCO band polygons until native contour geometry is released. Labels
 show the absolute `min_depth` value, not an inferred range or vessel-specific safety contour.
-Harbours and ferries are ordinary World context. Experimental `nautical-v1` tiles, aids, lights,
-soundings, hazards, reefs, and wrecks are deliberately absent from the official map and remain
-available only to explicitly configured laboratory maps. Soundings is reference cartography and is
-not a navigation product.
+Ferries are ordinary World context. Navigation marks come from `tileflow-nautical`: the theme's
+`nautical.*` image tokens select the Soundings chart symbols for buoys (port can, starboard cone,
+cardinal double cone, and a pillar for other buoys), lights, lighthouses, wrecks, harbours, and
+ports. Buoys and light flares take each mark's own colour from the data; beacons stay small coloured
+dots, rocks are chart crosses and stars, and lighthouse, wreck, harbour, and port symbols are
+printed in the chart ink. Technical magenta remains reserved for operational overlays: restricted,
+military, anchorage, and traffic-separation areas, traffic-separation lines, and cables. Coverage is
+a faint tint before marks appear. The map shows a "Not for navigation" notice wherever it is
+displayed. Soundings is reference cartography and is not a navigation product.
 
 ## siegfried
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tileflow/maps",
-  "version": "0.1.0-alpha.10",
+  "version": "0.1.0-alpha.12",
   "license": "Apache-2.0",
   "description": "Official themed Streets, Baedeker, Cívica, 1777, Siegfried, Soundings, and Blueprint maps for Tileflow.",
   "type": "module",
@@ -52,12 +52,12 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@tileflow/core": ">=0.1.0-alpha.36 <0.1.0-beta.0"
+    "@tileflow/core": ">=0.1.0-alpha.38 <0.1.0-beta.0"
   },
   "devDependencies": {
     "@maplibre/maplibre-gl-style-spec": "24.8.5",
     "@maplibre/maplibre-gl-style-spec-v6": "npm:@maplibre/maplibre-gl-style-spec@26.4.4",
-    "@tileflow/core": "0.1.0-alpha.36"
+    "@tileflow/core": "0.1.0-alpha.38"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm --dts --clean --no-splitting",