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

package/README.md

@@ -3,7 +3,7 @@
 Typed Tileflow config helpers and the MapLibre style compiler.
 
 ```ts
-import {defineTileflow, labels, osm, poi} from '@tileflow/core';
+import {defineTileflow, labels, osm, poi, roads} from '@tileflow/core';
 
 export default defineTileflow({
   icons: {
@@ -53,6 +53,7 @@ export default defineTileflow({
       modules: [
         labels({roads: 'minimal'}),
         poi({categories: ['food', 'coffee', 'culture', 'transit'], icons: 'essential'}),
+        roads({detail: 'streets', hierarchy: 'clear', outline: 'subtle', weight: 'regular'}),
       ],
       layers: {
         'highway-primary': {
@@ -78,7 +79,7 @@ Tileflow keeps these levels separate:
 - `theme.colors` contains human-scale base tokens such as `water`, `park`, `road`, `roadMajor`, `roadCasing`, `text`, and `textHalo`.
 - `theme.modules.<name>` contains advanced, module-specific tokens. These are granular: setting `theme.modules.roads.rail` does not recolor primary roads.
 - `maps.<name>.icons` can point at a reusable root icon set, a hosted MapLibre sprite URL, or a local icon folder for Vite/build output.
-- `maps.<name>.modules` enables semantic behavior such as `labels()`, `poi()`, and `roads()`. Road colors remain in `theme.modules.roads`; `roads()` controls detail, hierarchy, weight, casing, and optional transport extras.
+- `maps.<name>.modules` enables semantic behavior such as `labels()`, `poi()`, and `roads()`. Road colors remain in `theme.modules.roads`; `roads()` controls detail, hierarchy, weight, outline, and optional transport extras.
 - `maps.<name>.renderer` can be `auto`, `osm-bright`, or `generated`. `auto` preserves the default template when compatible; `generated` always uses Tileflow's generated layers; `osm-bright` throws if the map config cannot be rendered with the template.
 - `layers` is the raw MapLibre escape hatch for exact layer patches.
 
@@ -86,15 +87,14 @@ Missing colors preserve the basemap default. Legacy aliases such as `accent`, `c
 
 ## Roads module
 
-Use a preset for the overall road-network intent, then override only the behavior you need:
+Control each independent road-network decision directly:
 
 ```ts
 roads({
-  preset: 'navigation',
   detail: 'streets',
   hierarchy: 'strong',
   weight: 'regular',
-  casing: 'strong',
+  outline: 'strong',
   extras: {
     paths: false,
     rail: false,
@@ -103,14 +103,15 @@ roads({
 });
 ```
 
-| Preset       | Detail    | Hierarchy | Weight    | Casing   | Extras  |
-| ------------ | --------- | --------- | --------- | -------- | ------- |
-| `minimal`    | `streets` | `subtle`  | `thin`    | `subtle` | all off |
-| `standard`   | `streets` | `clear`   | `regular` | `subtle` | all on  |
-| `navigation` | `streets` | `strong`  | `regular` | `strong` | all off |
-| `detailed`   | `all`     | `clear`   | `regular` | `strong` | all on  |
+`detail` is progressive: `none` hides roads; `highways` shows motorway and trunk roads;
+`major` adds primary, secondary, and tertiary roads; `streets` adds minor streets; and `all`
+adds service roads and tracks. `hierarchy` accepts `subtle`, `clear`, or `strong`; `weight`
+accepts `thin`, `regular`, or `bold`; and `outline` accepts `none`, `subtle`, or `strong`.
+`extras.paths`, `extras.rail`, and `extras.ferry` are independent and default to `false`.
 
-`detail` accepts `none`, `major`, `streets`, or `all`; `hierarchy` accepts `subtle`, `clear`, or `strong`; `weight` accepts `thin`, `regular`, or `bold`; and `casing` accepts `none`, `subtle`, or `strong`. Explicit options override their preset. `extras.paths`, `extras.rail`, and `extras.ferry` are independent.
+Without options, `roads()` uses `detail: 'streets'`, `hierarchy: 'clear'`,
+`weight: 'regular'`, `outline: 'subtle'`, and all extras disabled. Named visual recipes belong
+in examples rather than the runtime API, so the resolved behavior is always visible in config.
 
 Colors never belong in `roads()`. Put common colors in `theme.colors` and granular road colors in `theme.modules.roads`. Road-label density remains a `labels({roads: ...})` concern.
 

package/dist/index.d.ts

@@ -191,13 +191,10 @@ type TileflowOsmBasemapConfig = {
 };
 type TileflowBasemapConfig = TileflowOsmBasemapConfig;
 type TileflowOsmBasemapOptions = Omit<TileflowOsmBasemapConfig, 'type'>;
-type TileflowRoadsModulePreset = 'minimal' | 'standard' | 'navigation' | 'detailed'
-/** @deprecated Use "standard". */
- | 'modern';
-type TileflowRoadDetail = 'none' | 'major' | 'streets' | 'all';
+type TileflowRoadDetail = 'none' | 'highways' | 'major' | 'streets' | 'all';
 type TileflowRoadHierarchy = 'subtle' | 'clear' | 'strong';
 type TileflowRoadWeight = 'thin' | 'regular' | 'bold';
-type TileflowRoadCasing = 'none' | 'subtle' | 'strong';
+type TileflowRoadOutline = 'none' | 'subtle' | 'strong';
 type TileflowRoadExtras = {
     ferry?: boolean;
     paths?: boolean;
@@ -205,13 +202,10 @@ type TileflowRoadExtras = {
 };
 type TileflowRoadsModuleConfig = {
     type: 'roads';
-    casing?: TileflowRoadCasing;
     detail?: TileflowRoadDetail;
-    /** @deprecated Use hierarchy. */
-    density?: TileflowDensity;
     extras?: TileflowRoadExtras;
     hierarchy?: TileflowRoadHierarchy;
-    preset?: TileflowRoadsModulePreset;
+    outline?: TileflowRoadOutline;
     weight?: TileflowRoadWeight;
 };
 type TileflowRoadsModuleOptions = Omit<TileflowRoadsModuleConfig, 'type'>;
@@ -803,22 +797,13 @@ declare const tileflowMapSchema: z.ZodObject<{
         }>>;
     }, z.core.$strict>, z.ZodObject<{
         type: z.ZodLiteral<"roads">;
-        casing: z.ZodOptional<z.ZodEnum<{
-            none: "none";
-            subtle: "subtle";
-            strong: "strong";
-        }>>;
         detail: z.ZodOptional<z.ZodEnum<{
             none: "none";
             major: "major";
+            highways: "highways";
             streets: "streets";
             all: "all";
         }>>;
-        density: z.ZodOptional<z.ZodEnum<{
-            clean: "clean";
-            balanced: "balanced";
-            dense: "dense";
-        }>>;
         extras: z.ZodOptional<z.ZodObject<{
             ferry: z.ZodOptional<z.ZodBoolean>;
             paths: z.ZodOptional<z.ZodBoolean>;
@@ -826,15 +811,13 @@ declare const tileflowMapSchema: z.ZodObject<{
         }, z.core.$strict>>;
         hierarchy: z.ZodOptional<z.ZodEnum<{
             subtle: "subtle";
-            strong: "strong";
             clear: "clear";
+            strong: "strong";
         }>>;
-        preset: z.ZodOptional<z.ZodEnum<{
-            minimal: "minimal";
-            standard: "standard";
-            detailed: "detailed";
-            navigation: "navigation";
-            modern: "modern";
+        outline: z.ZodOptional<z.ZodEnum<{
+            none: "none";
+            subtle: "subtle";
+            strong: "strong";
         }>>;
         weight: z.ZodOptional<z.ZodEnum<{
             regular: "regular";
@@ -1310,22 +1293,13 @@ declare const configSchema: z.ZodObject<{
         }>>;
     }, z.core.$strict>, z.ZodObject<{
         type: z.ZodLiteral<"roads">;
-        casing: z.ZodOptional<z.ZodEnum<{
-            none: "none";
-            subtle: "subtle";
-            strong: "strong";
-        }>>;
         detail: z.ZodOptional<z.ZodEnum<{
             none: "none";
             major: "major";
+            highways: "highways";
             streets: "streets";
             all: "all";
         }>>;
-        density: z.ZodOptional<z.ZodEnum<{
-            clean: "clean";
-            balanced: "balanced";
-            dense: "dense";
-        }>>;
         extras: z.ZodOptional<z.ZodObject<{
             ferry: z.ZodOptional<z.ZodBoolean>;
             paths: z.ZodOptional<z.ZodBoolean>;
@@ -1333,15 +1307,13 @@ declare const configSchema: z.ZodObject<{
         }, z.core.$strict>>;
         hierarchy: z.ZodOptional<z.ZodEnum<{
             subtle: "subtle";
-            strong: "strong";
             clear: "clear";
+            strong: "strong";
         }>>;
-        preset: z.ZodOptional<z.ZodEnum<{
-            minimal: "minimal";
-            standard: "standard";
-            detailed: "detailed";
-            navigation: "navigation";
-            modern: "modern";
+        outline: z.ZodOptional<z.ZodEnum<{
+            none: "none";
+            subtle: "subtle";
+            strong: "strong";
         }>>;
         weight: z.ZodOptional<z.ZodEnum<{
             regular: "regular";
@@ -2027,22 +1999,13 @@ declare const tileflowProjectSchema: z.ZodObject<{
             }>>;
         }, z.core.$strict>, z.ZodObject<{
             type: z.ZodLiteral<"roads">;
-            casing: z.ZodOptional<z.ZodEnum<{
-                none: "none";
-                subtle: "subtle";
-                strong: "strong";
-            }>>;
             detail: z.ZodOptional<z.ZodEnum<{
                 none: "none";
                 major: "major";
+                highways: "highways";
                 streets: "streets";
                 all: "all";
             }>>;
-            density: z.ZodOptional<z.ZodEnum<{
-                clean: "clean";
-                balanced: "balanced";
-                dense: "dense";
-            }>>;
             extras: z.ZodOptional<z.ZodObject<{
                 ferry: z.ZodOptional<z.ZodBoolean>;
                 paths: z.ZodOptional<z.ZodBoolean>;
@@ -2050,15 +2013,13 @@ declare const tileflowProjectSchema: z.ZodObject<{
             }, z.core.$strict>>;
             hierarchy: z.ZodOptional<z.ZodEnum<{
                 subtle: "subtle";
-                strong: "strong";
                 clear: "clear";
+                strong: "strong";
             }>>;
-            preset: z.ZodOptional<z.ZodEnum<{
-                minimal: "minimal";
-                standard: "standard";
-                detailed: "detailed";
-                navigation: "navigation";
-                modern: "modern";
+            outline: z.ZodOptional<z.ZodEnum<{
+                none: "none";
+                subtle: "subtle";
+                strong: "strong";
             }>>;
             weight: z.ZodOptional<z.ZodEnum<{
                 regular: "regular";
@@ -2396,4 +2357,4 @@ declare function normalizeTileflowStaticImageSize(input: {
 };
 declare function inferTileflowAnalyticsFromStyleUrl(styleUrl: string): TileflowAnalytics | undefined;
 
-export { type MapLibreSprite, type MapLibreStyle, type TileflowAdvancedColorConfig, type TileflowAnalytics, type TileflowBaseColors, type TileflowBasemapConfig, type TileflowBoundaryColorConfig, type TileflowBuildingColorConfig, type TileflowBuildings, type TileflowColor, type TileflowColorConfig, type TileflowColors, type TileflowConfig, type TileflowDensity, type TileflowFontWeight, type TileflowFonts, type TileflowHydroColorConfig, type TileflowIconSet, type TileflowIconSetConfig, type TileflowLabelColorConfig, type TileflowLabelDensity, type TileflowLabelLanguage, type TileflowLabels, type TileflowLabelsModuleConfig, type TileflowLabelsModuleOptions, type TileflowLandcoverColorConfig, type TileflowLanduseColorConfig, type TileflowManifest, type TileflowManifestLoadOptions, type TileflowMapConfig, type TileflowMapMarker, type TileflowMapMode, type TileflowMapModeOptions, type TileflowModuleConfig, type TileflowOsmBasemapConfig, type TileflowOsmBasemapOptions, type TileflowPoi, type TileflowPoiCategory, type TileflowPoiColorConfig, type TileflowPoiIcons, type TileflowPoiLabels, type TileflowPoiModuleConfig, type TileflowPoiModuleOptions, type TileflowProjectConfig, type TileflowProjectIconSets, type TileflowProjectThemes, type TileflowRenderer, type TileflowRoadCasing, type TileflowRoadColorConfig, type TileflowRoadDetail, type TileflowRoadExtras, type TileflowRoadHierarchy, type TileflowRoadWeight, type TileflowRoads, type TileflowRoadsModuleConfig, type TileflowRoadsModuleOptions, type TileflowRoadsModulePreset, type TileflowRuntimeManifest, type TileflowRuntimeManifestMap, type TileflowRuntimeManifestMapEntry, type TileflowRuntimeStyle, type TileflowRuntimeStyleOptions, type TileflowSourceLayers, type TileflowStyleLayerOverride, type TileflowStyleOptions, type TileflowStyleOverrideModuleConfig, type TileflowStyleOverrideOptions, type TileflowTerrain, type TileflowTerrainConfig, type TileflowTerrainEncoding, type TileflowTerrainMode, type TileflowTheme, type TileflowThemeConfig, type TileflowThemeMode, type TileflowThemeModulesConfig, type TileflowThemeName, type TileflowTiles, type TileflowTilesetConfig, type TileflowTypography, type TileflowViewConfig, type ValidationMessage, type ValidationResult, configSchema, createManifest, createStyle, createStyleFromProject, createTileflowSessionId, defaultTileflowManifestUrl, defaultTileflowStyleBaseUrl, defineTileflow, getDefaultColors, getDefaultTileflowStyleBaseUrl, getTileflowAnalyticsApiUrl, inferTileflowAnalyticsFromStyleUrl, isTileflowLocalDevHost, labels, loadTileflowManifest, mergeTileflowAnalytics, normalizeTileflowStaticImageSize, normalizeTileflowUrl, osm, parseTileflowMap, parseTileflowProject, poi, resolveTileflowAnalyticsRequestUrl, resolveTileflowManifestMap, resolveTileflowMapMode, resolveTileflowRuntimeStyle, resolveTileflowStaticImageUrl, resolveTileflowStyleUrl, roads, shouldLoadTileflowManifest, startTileflowSession, styleOverride, tileflowMapSchema, tileflowProjectSchema, tileflowThemeSchema, validateConfig, validateTileflowConfig };
+export { type MapLibreSprite, type MapLibreStyle, type TileflowAdvancedColorConfig, type TileflowAnalytics, type TileflowBaseColors, type TileflowBasemapConfig, type TileflowBoundaryColorConfig, type TileflowBuildingColorConfig, type TileflowBuildings, type TileflowColor, type TileflowColorConfig, type TileflowColors, type TileflowConfig, type TileflowDensity, type TileflowFontWeight, type TileflowFonts, type TileflowHydroColorConfig, type TileflowIconSet, type TileflowIconSetConfig, type TileflowLabelColorConfig, type TileflowLabelDensity, type TileflowLabelLanguage, type TileflowLabels, type TileflowLabelsModuleConfig, type TileflowLabelsModuleOptions, type TileflowLandcoverColorConfig, type TileflowLanduseColorConfig, type TileflowManifest, type TileflowManifestLoadOptions, type TileflowMapConfig, type TileflowMapMarker, type TileflowMapMode, type TileflowMapModeOptions, type TileflowModuleConfig, type TileflowOsmBasemapConfig, type TileflowOsmBasemapOptions, type TileflowPoi, type TileflowPoiCategory, type TileflowPoiColorConfig, type TileflowPoiIcons, type TileflowPoiLabels, type TileflowPoiModuleConfig, type TileflowPoiModuleOptions, type TileflowProjectConfig, type TileflowProjectIconSets, type TileflowProjectThemes, type TileflowRenderer, type TileflowRoadColorConfig, type TileflowRoadDetail, type TileflowRoadExtras, type TileflowRoadHierarchy, type TileflowRoadOutline, type TileflowRoadWeight, type TileflowRoads, type TileflowRoadsModuleConfig, type TileflowRoadsModuleOptions, type TileflowRuntimeManifest, type TileflowRuntimeManifestMap, type TileflowRuntimeManifestMapEntry, type TileflowRuntimeStyle, type TileflowRuntimeStyleOptions, type TileflowSourceLayers, type TileflowStyleLayerOverride, type TileflowStyleOptions, type TileflowStyleOverrideModuleConfig, type TileflowStyleOverrideOptions, type TileflowTerrain, type TileflowTerrainConfig, type TileflowTerrainEncoding, type TileflowTerrainMode, type TileflowTheme, type TileflowThemeConfig, type TileflowThemeMode, type TileflowThemeModulesConfig, type TileflowThemeName, type TileflowTiles, type TileflowTilesetConfig, type TileflowTypography, type TileflowViewConfig, type ValidationMessage, type ValidationResult, configSchema, createManifest, createStyle, createStyleFromProject, createTileflowSessionId, defaultTileflowManifestUrl, defaultTileflowStyleBaseUrl, defineTileflow, getDefaultColors, getDefaultTileflowStyleBaseUrl, getTileflowAnalyticsApiUrl, inferTileflowAnalyticsFromStyleUrl, isTileflowLocalDevHost, labels, loadTileflowManifest, mergeTileflowAnalytics, normalizeTileflowStaticImageSize, normalizeTileflowUrl, osm, parseTileflowMap, parseTileflowProject, poi, resolveTileflowAnalyticsRequestUrl, resolveTileflowManifestMap, resolveTileflowMapMode, resolveTileflowRuntimeStyle, resolveTileflowStaticImageUrl, resolveTileflowStyleUrl, roads, shouldLoadTileflowManifest, startTileflowSession, styleOverride, tileflowMapSchema, tileflowProjectSchema, tileflowThemeSchema, validateConfig, validateTileflowConfig };

package/dist/index.js

@@ -752,66 +752,40 @@ var semanticToOsmBrightIconName = {
 };
 
 // src/modules/roads/index.ts
-var roadPresets = {
-  minimal: {
-    casing: "subtle",
-    detail: "streets",
-    extras: { ferry: false, paths: false, rail: false },
-    hierarchy: "subtle",
-    weight: "thin"
-  },
-  standard: {
-    casing: "subtle",
-    detail: "streets",
-    extras: { ferry: true, paths: true, rail: true },
-    hierarchy: "clear",
-    weight: "regular"
-  },
-  navigation: {
-    casing: "strong",
-    detail: "streets",
-    extras: { ferry: false, paths: false, rail: false },
-    hierarchy: "strong",
-    weight: "regular"
-  },
-  detailed: {
-    casing: "strong",
-    detail: "all",
-    extras: { ferry: true, paths: true, rail: true },
-    hierarchy: "clear",
-    weight: "regular"
-  }
+var moduleRoadDefaults = {
+  detail: "streets",
+  extras: { ferry: false, paths: false, rail: false },
+  hierarchy: "clear",
+  outline: "subtle",
+  weight: "regular"
 };
-var majorRoadClasses = ["motorway", "trunk", "primary", "secondary", "tertiary"];
-var minorRoadClasses = ["minor", "service", "track"];
+var highwayRoadClasses = ["motorway", "trunk"];
+var arterialRoadClasses = ["primary", "secondary", "tertiary"];
+var majorRoadClasses = [...highwayRoadClasses, ...arterialRoadClasses];
+var streetRoadClasses = ["minor"];
+var serviceRoadClasses = ["service", "track"];
 function roads(options = {}) {
   return {
     type: "roads",
-    preset: options.preset ?? "standard",
-    ...options.casing ? { casing: options.casing } : {},
     ...options.detail ? { detail: options.detail } : {},
-    ...options.density ? { density: options.density } : {},
     ...options.extras ? { extras: { ...options.extras } } : {},
     ...options.hierarchy ? { hierarchy: options.hierarchy } : {},
+    ...options.outline ? { outline: options.outline } : {},
     ...options.weight ? { weight: options.weight } : {}
   };
 }
 function resolveRoads(legacyRoads, moduleConfig, fallback) {
   const fallbackMode = legacyRoads ?? fallback;
-  const preset = moduleConfig ? normalizeRoadPreset(moduleConfig.preset ?? presetFromLegacyMode(fallbackMode)) : presetFromLegacyMode(fallbackMode);
-  const defaults = roadPresets[preset];
-  const hierarchy = moduleConfig?.hierarchy ?? hierarchyFromLegacyDensity(moduleConfig?.density) ?? defaults.hierarchy;
-  const detail = moduleConfig?.detail ?? (fallbackMode === "hidden" && !moduleConfig ? "none" : defaults.detail);
+  const defaults = moduleConfig ? moduleRoadDefaults : roadDefaultsFromLegacyMode(fallbackMode);
   const resolved = {
-    casing: moduleConfig?.casing ?? defaults.casing,
-    detail,
+    detail: moduleConfig?.detail ?? defaults.detail,
     extras: {
       ferry: moduleConfig?.extras?.ferry ?? defaults.extras.ferry,
       paths: moduleConfig?.extras?.paths ?? defaults.extras.paths,
       rail: moduleConfig?.extras?.rail ?? defaults.extras.rail
     },
-    hierarchy,
-    preset,
+    hierarchy: moduleConfig?.hierarchy ?? defaults.hierarchy,
+    outline: moduleConfig?.outline ?? defaults.outline,
     weight: moduleConfig?.weight ?? defaults.weight
   };
   return {
@@ -822,22 +796,22 @@ function resolveRoads(legacyRoads, moduleConfig, fallback) {
 function roadStyleMetrics(options) {
   const hierarchy = {
     subtle: {
-      majorOpacity: 0.72,
-      majorWidthScale: 0.95,
-      minorOpacity: 0.6336,
-      minorWidthScale: 0.88
+      majorOpacity: 0.92,
+      majorWidthScale: 1,
+      minorOpacity: 0.82,
+      minorWidthScale: 0.94
     },
     clear: {
-      majorOpacity: 0.84,
+      majorOpacity: 0.92,
       majorWidthScale: 1,
-      minorOpacity: 0.7392,
-      minorWidthScale: 0.9
+      minorOpacity: 0.68,
+      minorWidthScale: 0.84
     },
     strong: {
-      majorOpacity: 0.98,
-      majorWidthScale: 1.16,
-      minorOpacity: 0.56,
-      minorWidthScale: 0.72
+      majorOpacity: 0.92,
+      majorWidthScale: 1,
+      minorOpacity: 0.52,
+      minorWidthScale: 0.7
     }
   }[options.hierarchy];
   const weightScale = {
@@ -845,28 +819,30 @@ function roadStyleMetrics(options) {
     regular: 1,
     bold: 1.24
   }[options.weight];
-  const casingOpacity = {
+  const outlineOpacity = {
     none: 0,
-    subtle: 0.16,
-    strong: 0.3
-  }[options.casing];
+    subtle: 0.18,
+    strong: 0.34
+  }[options.outline];
   return {
-    casingOpacity,
     ...hierarchy,
+    outlineOpacity,
     weightScale
   };
 }
-function roadMinorMinZoom(detail) {
-  return detail === "all" ? 6 : 12;
-}
 function roadLayers(source, sourceLayer, colors, options) {
   if (options.detail === "none") {
     return [];
   }
   const metrics = roadStyleMetrics(options);
-  const showsMinorRoads = options.detail === "streets" || options.detail === "all";
-  const minorMinZoom = roadMinorMinZoom(options.detail);
-  const roadClasses = showsMinorRoads ? [...majorRoadClasses, ...minorRoadClasses] : [...majorRoadClasses];
+  const selectedMajorRoadClasses = options.detail === "highways" ? [...highwayRoadClasses] : [...majorRoadClasses];
+  const showsStreetRoads = options.detail === "streets" || options.detail === "all";
+  const showsServiceRoads = options.detail === "all";
+  const roadClasses = [
+    ...selectedMajorRoadClasses,
+    ...showsStreetRoads ? streetRoadClasses : [],
+    ...showsServiceRoads ? serviceRoadClasses : []
+  ];
   const transportClasses = [
     ...roadClasses,
     ...options.extras.paths ? ["path"] : [],
@@ -875,12 +851,13 @@ function roadLayers(source, sourceLayer, colors, options) {
   ];
   const roadClassColor = roadClassColorExpression(colors);
   const nonTunnelRoadFilter = ["!=", ["get", "brunnel"], "tunnel"];
-  const majorFilter = classFilter(majorRoadClasses);
-  const minorFilter = classFilter(minorRoadClasses);
+  const majorFilter = classFilter(selectedMajorRoadClasses);
+  const streetFilter = classFilter(streetRoadClasses);
+  const serviceFilter = classFilter(serviceRoadClasses);
   const roadFilter = classFilter(roadClasses);
   const transportFilter = classFilter(transportClasses);
   const layers = [];
-  if (options.casing !== "none") {
+  if (options.outline !== "none") {
     layers.push({
       id: "roads-tunnels-casing",
       type: "line",
@@ -891,14 +868,17 @@ function roadLayers(source, sourceLayer, colors, options) {
       paint: {
         "line-color": colors.roads.tunnel,
         "line-dasharray": [0.6, 0.8],
-        "line-opacity": metrics.casingOpacity * 0.85,
-        "line-width": zoomWidth(
+        "line-opacity": roadOpacityExpression(
+          metrics.outlineOpacity * 0.85,
+          metrics.outlineOpacity * 0.85
+        ),
+        "line-width": roadWidthExpression(
           [
-            [10, 0.5],
-            [14, 1.7],
-            [16, 3.8]
+            [10, 0.8],
+            [14, 2.2],
+            [16, 4.8]
           ],
-          metrics.weightScale
+          metrics
         )
       }
     });
@@ -913,18 +893,21 @@ function roadLayers(source, sourceLayer, colors, options) {
     paint: {
       "line-color": roadClassColor,
       "line-dasharray": [0.6, 0.8],
-      "line-opacity": metrics.majorOpacity * 0.28,
-      "line-width": zoomWidth(
+      "line-opacity": roadOpacityExpression(
+        metrics.majorOpacity * 0.28,
+        metrics.minorOpacity * 0.28
+      ),
+      "line-width": roadWidthExpression(
         [
           [10, 0.25],
           [14, 1],
           [16, 2.4]
         ],
-        metrics.weightScale
+        metrics
       )
     }
   });
-  if (options.casing !== "none") {
+  if (options.outline !== "none") {
     layers.push({
       id: "roads-casing",
       type: "line",
@@ -934,14 +917,14 @@ function roadLayers(source, sourceLayer, colors, options) {
       filter: ["all", nonTunnelRoadFilter, roadFilter],
       paint: {
         "line-color": colors.roads.casing,
-        "line-opacity": roadCasingOpacityExpression(metrics.casingOpacity, minorMinZoom),
-        "line-width": zoomWidth(
+        "line-opacity": roadOpacityExpression(metrics.outlineOpacity, metrics.outlineOpacity),
+        "line-width": roadWidthExpression(
           [
-            [6, 0.4],
-            [12, 1.2],
-            [16, 4]
+            [6, 0.7],
+            [12, 1.8],
+            [16, 5.4]
           ],
-          metrics.weightScale
+          metrics
         )
       }
     });
@@ -975,7 +958,7 @@ function roadLayers(source, sourceLayer, colors, options) {
       type: "line",
       source,
       "source-layer": sourceLayer,
-      minzoom: options.detail === "all" ? 8 : 10,
+      minzoom: 10,
       filter: ["all", nonTunnelRoadFilter, classFilter(["path"])],
       paint: {
         "line-color": colors.roads.path,
@@ -998,7 +981,7 @@ function roadLayers(source, sourceLayer, colors, options) {
       type: "line",
       source,
       "source-layer": sourceLayer,
-      minzoom: options.detail === "all" ? 6 : 7,
+      minzoom: 7,
       filter: ["all", nonTunnelRoadFilter, classFilter(["rail", "transit"])],
       paint: {
         "line-color": colors.roads.rail,
@@ -1014,20 +997,40 @@ function roadLayers(source, sourceLayer, colors, options) {
       }
     });
   }
-  if (showsMinorRoads) {
+  if (showsServiceRoads) {
+    layers.push({
+      id: "roads-service",
+      type: "line",
+      source,
+      "source-layer": sourceLayer,
+      minzoom: 14,
+      filter: ["all", nonTunnelRoadFilter, serviceFilter],
+      paint: {
+        "line-color": roadClassColor,
+        "line-opacity": metrics.minorOpacity,
+        "line-width": zoomWidth(
+          [
+            [14, 0.6],
+            [16, 2.2]
+          ],
+          metrics.weightScale * metrics.minorWidthScale
+        )
+      }
+    });
+  }
+  if (showsStreetRoads) {
     layers.push({
       id: "roads-minor",
       type: "line",
       source,
       "source-layer": sourceLayer,
-      minzoom: minorMinZoom,
-      filter: ["all", nonTunnelRoadFilter, minorFilter],
+      minzoom: 12,
+      filter: ["all", nonTunnelRoadFilter, streetFilter],
       paint: {
-        "line-color": colors.roads.minor,
+        "line-color": roadClassColor,
         "line-opacity": metrics.minorOpacity,
         "line-width": zoomWidth(
           [
-            [6, 0.2],
             [12, 0.8],
             [16, 3]
           ],
@@ -1066,33 +1069,55 @@ function roadLayers(source, sourceLayer, colors, options) {
       filter: ["all", ["==", ["get", "brunnel"], "bridge"], transportFilter],
       paint: {
         "line-color": colors.roads.bridge,
-        "line-opacity": metrics.majorOpacity,
-        "line-width": zoomWidth(
+        "line-opacity": roadOpacityExpression(metrics.majorOpacity, metrics.minorOpacity),
+        "line-width": roadWidthExpression(
           [
             [10, 0.45],
             [14, 1.6],
             [16, 4.4]
           ],
-          metrics.weightScale * metrics.majorWidthScale
+          metrics
         )
       }
     }
   );
   return layers;
 }
-function normalizeRoadPreset(preset) {
-  return !preset || preset === "modern" ? "standard" : preset;
-}
-function presetFromLegacyMode(mode) {
-  if (mode === "soft") return "minimal";
-  if (mode === "detailed") return "detailed";
-  return "standard";
-}
-function hierarchyFromLegacyDensity(density) {
-  if (density === "clean") return "subtle";
-  if (density === "dense") return "strong";
-  if (density === "balanced") return "clear";
-  return void 0;
+function roadDefaultsFromLegacyMode(mode) {
+  if (mode === "hidden") {
+    return {
+      detail: "none",
+      extras: { ferry: false, paths: false, rail: false },
+      hierarchy: "clear",
+      outline: "subtle",
+      weight: "regular"
+    };
+  }
+  if (mode === "soft") {
+    return {
+      detail: "streets",
+      extras: { ferry: false, paths: false, rail: false },
+      hierarchy: "subtle",
+      outline: "subtle",
+      weight: "thin"
+    };
+  }
+  if (mode === "detailed") {
+    return {
+      detail: "all",
+      extras: { ferry: true, paths: true, rail: true },
+      hierarchy: "clear",
+      outline: "strong",
+      weight: "regular"
+    };
+  }
+  return {
+    detail: "streets",
+    extras: { ferry: true, paths: true, rail: true },
+    hierarchy: "clear",
+    outline: "subtle",
+    weight: "regular"
+  };
 }
 function legacyModeFromResolvedRoads(options) {
   if (options.detail === "none") return "hidden";
@@ -1103,15 +1128,24 @@ function legacyModeFromResolvedRoads(options) {
 function classFilter(classes) {
   return ["match", ["get", "class"], classes, true, false];
 }
-function roadCasingOpacityExpression(opacity, minorMinZoom) {
+function roadOpacityExpression(majorOpacity, minorOpacity) {
   return [
-    "interpolate",
-    ["linear"],
-    ["zoom"],
-    minorMinZoom - 0.5,
-    ["case", classFilter(majorRoadClasses), opacity, 0],
-    minorMinZoom,
-    opacity
+    "case",
+    classFilter(majorRoadClasses),
+    majorOpacity,
+    classFilter(streetRoadClasses),
+    ["step", ["zoom"], 0, 12, minorOpacity],
+    classFilter(serviceRoadClasses),
+    ["step", ["zoom"], 0, 14, minorOpacity],
+    minorOpacity
+  ];
+}
+function roadWidthExpression(stops, metrics) {
+  return [
+    "case",
+    classFilter(majorRoadClasses),
+    zoomWidth(stops, metrics.weightScale * metrics.majorWidthScale),
+    zoomWidth(stops, metrics.weightScale * metrics.minorWidthScale)
   ];
 }
 function zoomWidth(stops, scale) {
@@ -1552,16 +1586,14 @@ var basemapSchema = z.object({
 }).strict();
 var roadsModuleSchema = z.object({
   type: z.literal("roads"),
-  casing: z.enum(["none", "subtle", "strong"]).optional(),
-  detail: z.enum(["none", "major", "streets", "all"]).optional(),
-  density: z.enum(["clean", "balanced", "dense"]).optional(),
+  detail: z.enum(["none", "highways", "major", "streets", "all"]).optional(),
   extras: z.object({
     ferry: z.boolean().optional(),
     paths: z.boolean().optional(),
     rail: z.boolean().optional()
   }).strict().optional(),
   hierarchy: z.enum(["subtle", "clear", "strong"]).optional(),
-  preset: z.enum(["minimal", "standard", "navigation", "detailed", "modern"]).optional(),
+  outline: z.enum(["none", "subtle", "strong"]).optional(),
   weight: z.enum(["thin", "regular", "bold"]).optional()
 }).strict();
 var labelDensitySchema = z.enum(["none", "minimal", "balanced", "detailed"]);
@@ -1934,14 +1966,15 @@ function applyRoadLayerControls(layer, roads2) {
   const type = stringValue(layer.type);
   const group = osmBrightRoadGroup(id);
   const isCasing = id.includes("casing");
-  if (!isRoadLayerVisible(group, roads2) || isCasing && roads2.casing === "none") {
+  const showsSharedHighwayLink = roads2.detail === "highways" && isSharedMajorLinkLayer(id);
+  if (!isRoadLayerVisible(group, roads2) && !showsSharedHighwayLink || isCasing && roads2.outline === "none") {
     return setLayerVisibility(layer, "none");
   }
   const metrics = roadStyleMetrics(roads2);
   const nextLayer = setLayerVisibility(layer, "visible");
   const paint = isRecord3(nextLayer.paint) ? { ...nextLayer.paint } : {};
-  const widthScale = metrics.weightScale * (group === "major" ? metrics.majorWidthScale : metrics.minorWidthScale);
-  const opacityScale = isCasing ? metrics.casingOpacity : group === "major" ? metrics.majorOpacity : group === "ferry" ? metrics.majorOpacity * 0.8 : group === "paths" ? metrics.minorOpacity * 0.77 : group === "rail" ? metrics.minorOpacity * 0.65 : metrics.minorOpacity;
+  const widthScale = metrics.weightScale * (group === "highways" || group === "major" ? metrics.majorWidthScale : metrics.minorWidthScale);
+  const opacityScale = isCasing ? metrics.outlineOpacity : group === "highways" || group === "major" ? metrics.majorOpacity : group === "ferry" ? metrics.majorOpacity * 0.8 : group === "paths" ? metrics.minorOpacity * 0.77 : group === "rail" ? metrics.minorOpacity * 0.65 : metrics.minorOpacity;
   if (type === "line") {
     paint["line-opacity"] = scaleStyleValue(paint["line-opacity"], opacityScale, 1);
     paint["line-width"] = scaleStyleValue(paint["line-width"], widthScale, 1);
@@ -1951,18 +1984,18 @@ function applyRoadLayerControls(layer, roads2) {
     paint["fill-opacity"] = scaleStyleValue(paint["fill-opacity"], opacityScale, 1);
     nextLayer.paint = paint;
   }
-  if (group === "minor" && roads2.detail === "streets") {
-    nextLayer.minzoom = Math.max(
-      numberValue(nextLayer.minzoom) ?? 0,
-      roadMinorMinZoom(roads2.detail)
-    );
+  if (roads2.detail === "highways" && (group === "highways" || showsSharedHighwayLink)) {
+    nextLayer.filter = combineFilters(nextLayer.filter, ["in", "class", "motorway", "trunk"]);
   }
-  if ((group === "minor" || group === "paths") && roads2.detail === "all") {
-    const currentMinZoom = numberValue(nextLayer.minzoom);
-    if (currentMinZoom !== void 0) {
-      nextLayer.minzoom = Math.max(0, currentMinZoom - 1);
+  if (group === "streets" && id.includes("minor")) {
+    nextLayer.minzoom = Math.max(numberValue(nextLayer.minzoom) ?? 0, 12);
+    if (roads2.detail === "streets") {
+      nextLayer.filter = combineFilters(nextLayer.filter, ["==", "class", "minor"]);
     }
   }
+  if (group === "service") {
+    nextLayer.minzoom = Math.max(numberValue(nextLayer.minzoom) ?? 0, 14);
+  }
   return nextLayer;
 }
 function isRoadLayerVisible(group, roads2) {
@@ -1970,17 +2003,24 @@ function isRoadLayerVisible(group, roads2) {
   if (group === "paths") return roads2.extras.paths;
   if (group === "rail") return roads2.extras.rail;
   if (group === "ferry") return roads2.extras.ferry;
-  if (group === "minor") return roads2.detail === "streets" || roads2.detail === "all";
+  if (group === "service") return roads2.detail === "all";
+  if (group === "streets") return roads2.detail === "streets" || roads2.detail === "all";
+  if (group === "major") return roads2.detail !== "highways";
   return true;
 }
 function osmBrightRoadGroup(id) {
   if (id === "ferry") return "ferry";
   if (id.includes("railway") || id.includes("cablecar")) return "rail";
   if (id.includes("path") || id.includes("steps")) return "paths";
-  if (id.includes("motorway") || id.includes("trunk") || id.includes("primary") || id.includes("secondary") || id.includes("tertiary") || id.includes("link")) {
+  if (id.includes("service") || id.includes("track")) return "service";
+  if (id.includes("motorway") || id.includes("trunk")) return "highways";
+  if (id.includes("primary") || id.includes("secondary") || id.includes("tertiary") || id.includes("link")) {
     return "major";
   }
-  return "minor";
+  return "streets";
+}
+function isSharedMajorLinkLayer(id) {
+  return id.includes("-link") && !id.includes("motorway-link");
 }
 function scaleStyleValue(value, scale, fallback) {
   if (typeof value === "number" && Number.isFinite(value)) {
@@ -5059,6 +5099,7 @@ function createStyle(input = {}, options = {}) {
     roadModule,
     theme.preset.roads ?? defaultConfig.roads
   );
+  const { mode: resolvedRoadMode, ...resolvedRoadModule } = resolvedRoads;
   const resolvedLabels = resolveLabels(
     config.labels,
     labelsModule,
@@ -5095,8 +5136,8 @@ function createStyle(input = {}, options = {}) {
     "tileflow:theme": theme.name,
     "tileflow:themeMode": theme.mode,
     "tileflow:density": density,
-    "tileflow:roads": resolvedRoads.mode,
-    "tileflow:roadsModule": roadModule ? resolvedRoads : void 0,
+    "tileflow:roads": resolvedRoadMode,
+    "tileflow:roadsModule": roadModule ? resolvedRoadModule : void 0,
     "tileflow:labels": labels2,
     "tileflow:labelsModule": labelsModule,
     "tileflow:poi": poi2,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tileflow/core",
-  "version": "0.1.0-alpha.10",
+  "version": "0.1.0-alpha.12",
   "description": "Typed Tileflow config and MapLibre style compiler.",
   "type": "module",
   "sideEffects": false,