@tileflow/core 0.1.0-alpha.11 → 0.1.0-alpha.13

package/dist/index.js

@@ -513,40 +513,75 @@ function rgbToHex(r, g, b) {
 }
 
 // src/modules/labels/index.ts
+var moduleLabelDefaults = {
+  language: "auto",
+  places: "major",
+  roads: "major",
+  water: "major"
+};
+var majorPlaceClasses = ["continent", "country", "state", "city", "town"];
+var highwayRoadClasses = ["motorway", "trunk"];
+var arterialRoadClasses = ["primary", "secondary", "tertiary"];
+var majorRoadClasses = [...highwayRoadClasses, ...arterialRoadClasses];
+var majorRoadClassSet = new Set(majorRoadClasses);
+var streetRoadClasses = ["minor"];
+var serviceRoadClasses = ["service", "track"];
+var majorWaterClasses = ["ocean", "sea", "lake"];
+var majorWaterwayClasses = ["river"];
 function labels(options = {}) {
   return {
     type: "labels",
     ...options.language ? { language: options.language } : {},
     ...options.places ? { places: options.places } : {},
-    ...options.preset ? { preset: options.preset } : {},
     ...options.roads ? { roads: options.roads } : {},
     ...options.water ? { water: options.water } : {}
   };
 }
 function resolveLabels(legacyLabels, moduleConfig, fallback) {
-  const mode = moduleConfig?.preset ?? legacyLabels ?? fallback;
-  const density = labelDensityFromMode(mode);
+  const fallbackMode = legacyLabels ?? fallback;
+  const defaults = moduleConfig ? moduleLabelDefaults : labelDefaultsFromLegacyMode(fallbackMode);
+  const resolved = {
+    language: moduleConfig?.language ?? defaults.language,
+    places: moduleConfig?.places ?? defaults.places,
+    roads: moduleConfig?.roads ?? defaults.roads,
+    water: moduleConfig?.water ?? defaults.water
+  };
   return {
-    language: moduleConfig?.language ?? "auto",
-    mode,
-    places: moduleConfig?.places ?? density,
-    roads: moduleConfig?.roads ?? density,
-    water: moduleConfig?.water ?? density
+    ...resolved,
+    mode: moduleConfig ? legacyModeFromResolvedLabels(resolved) : fallbackMode
   };
 }
-function labelLayers(source, sourceLayer, colors, labelsConfig, typography) {
-  if (labelsConfig.mode === "none" || labelsConfig.places === "none") {
-    return [];
-  }
-  const maxRank = labelsConfig.places === "minimal" ? 3 : labelsConfig.places === "balanced" ? 7 : 12;
+function labelLayers(source, sourceLayers, colors, labelsConfig, roadsConfig, typography) {
+  return [
+    ...placeLabelLayers(source, sourceLayers.place, colors, labelsConfig, typography),
+    ...roadLabelLayers(
+      source,
+      sourceLayers.roadName,
+      colors,
+      labelsConfig,
+      roadsConfig,
+      typography
+    ),
+    ...waterLabelLayers(
+      source,
+      sourceLayers.waterName,
+      sourceLayers.waterway,
+      colors,
+      labelsConfig,
+      typography
+    )
+  ];
+}
+function placeLabelLayers(source, sourceLayer, colors, labelsConfig, typography) {
+  if (labelsConfig.places === "none") return [];
   return [
     {
       id: "place-labels",
       type: "symbol",
       source,
       "source-layer": sourceLayer,
-      minzoom: 3,
-      filter: ["<=", ["coalesce", ["get", "rank"], 10], maxRank],
+      minzoom: 0,
+      filter: labelsConfig.places === "major" ? ["all", ["has", "name"], classFilter(majorPlaceClasses)] : ["has", "name"],
       layout: {
         "text-field": labelTextField(labelsConfig.language),
         "text-font": textFont(typography),
@@ -562,12 +597,160 @@ function labelLayers(source, sourceLayer, colors, labelsConfig, typography) {
     }
   ];
 }
-function labelDensityFromMode(mode) {
-  if (mode === "none") return "none";
-  if (mode === "essential") return "minimal";
-  if (mode === "full") return "detailed";
+function roadLabelLayers(source, sourceLayer, colors, labelsConfig, roadsConfig, typography) {
+  const classes = visibleRoadLabelClasses(labelsConfig.roads, roadsConfig);
+  const majorClasses = classes.filter((roadClass) => majorRoadClassSet.has(roadClass));
+  const minorClasses = classes.filter((roadClass) => !majorRoadClassSet.has(roadClass));
+  if (classes.length === 0) return [];
+  const layers = [];
+  const sharedLayout = {
+    "symbol-placement": "line",
+    "text-field": labelTextField(labelsConfig.language),
+    "text-font": textFont(typography),
+    "text-rotation-alignment": "map",
+    "text-size": ["interpolate", ["linear"], ["zoom"], 11, 11, 14, 13, 17, 15]
+  };
+  const sharedPaint = {
+    "text-color": colors.labels.road,
+    "text-halo-color": colors.labels.halo,
+    "text-halo-width": 1
+  };
+  if (majorClasses.length > 0) {
+    const namedMajorClasses = majorClasses.filter((roadClass) => roadClass !== "motorway");
+    layers.push({
+      id: "road-shields",
+      type: "symbol",
+      source,
+      "source-layer": sourceLayer,
+      minzoom: 8,
+      filter: ["all", ["has", "ref"], classFilter(majorClasses)],
+      layout: {
+        "symbol-placement": "line",
+        "symbol-spacing": 240,
+        "text-field": ["get", "ref"],
+        "text-font": textFont(typography),
+        "text-rotation-alignment": "viewport",
+        "text-size": 10
+      },
+      paint: sharedPaint
+    });
+    if (namedMajorClasses.length > 0) {
+      layers.unshift({
+        id: "road-labels-major",
+        type: "symbol",
+        source,
+        "source-layer": sourceLayer,
+        minzoom: 10,
+        filter: ["all", ["has", "name"], classFilter(namedMajorClasses)],
+        layout: sharedLayout,
+        paint: sharedPaint
+      });
+    }
+  }
+  if (minorClasses.length > 0) {
+    layers.push({
+      id: "road-labels-minor",
+      type: "symbol",
+      source,
+      "source-layer": sourceLayer,
+      minzoom: 14,
+      filter: ["all", ["has", "name"], classFilter(minorClasses)],
+      layout: sharedLayout,
+      paint: sharedPaint
+    });
+  }
+  return layers;
+}
+function waterLabelLayers(source, waterNameSourceLayer, waterwaySourceLayer, colors, labelsConfig, typography) {
+  if (labelsConfig.water === "none") return [];
+  const waterFilter = labelsConfig.water === "major" ? ["all", ["has", "name"], classFilter(majorWaterClasses)] : ["has", "name"];
+  const waterwayFilter = labelsConfig.water === "major" ? ["all", ["has", "name"], classFilter(majorWaterwayClasses)] : ["has", "name"];
+  const paint = {
+    "text-color": colors.labels.water,
+    "text-halo-color": colors.labels.halo,
+    "text-halo-width": 1
+  };
+  return [
+    {
+      id: "water-labels",
+      type: "symbol",
+      source,
+      "source-layer": waterNameSourceLayer,
+      minzoom: 3,
+      filter: ["all", ["==", ["geometry-type"], "Point"], waterFilter],
+      layout: {
+        "text-field": labelTextField(labelsConfig.language),
+        "text-font": textFont(typography),
+        "text-size": ["interpolate", ["linear"], ["zoom"], 3, 11, 8, 14]
+      },
+      paint
+    },
+    {
+      id: "water-line-labels",
+      type: "symbol",
+      source,
+      "source-layer": waterNameSourceLayer,
+      minzoom: 5,
+      filter: ["all", ["==", ["geometry-type"], "LineString"], waterFilter],
+      layout: {
+        "symbol-placement": "line",
+        "text-field": labelTextField(labelsConfig.language),
+        "text-font": textFont(typography),
+        "text-size": 13
+      },
+      paint
+    },
+    {
+      id: "waterway-labels",
+      type: "symbol",
+      source,
+      "source-layer": waterwaySourceLayer,
+      minzoom: 10,
+      filter: ["all", ["==", ["geometry-type"], "LineString"], waterwayFilter],
+      layout: {
+        "symbol-placement": "line",
+        "symbol-spacing": 320,
+        "text-field": labelTextField(labelsConfig.language),
+        "text-font": textFont(typography),
+        "text-size": 12
+      },
+      paint
+    }
+  ];
+}
+function visibleRoadLabelClasses(detail, roadsConfig) {
+  if (detail === "none" || roadsConfig.detail === "none") return [];
+  const visibleRoadClasses = roadsConfig.detail === "highways" ? [...highwayRoadClasses] : [
+    ...majorRoadClasses,
+    ...roadsConfig.detail === "streets" || roadsConfig.detail === "all" ? streetRoadClasses : [],
+    ...roadsConfig.detail === "all" ? serviceRoadClasses : [],
+    ...roadsConfig.extras.paths ? ["path"] : []
+  ];
+  const requestedClasses = detail === "major" ? [...majorRoadClasses] : [...majorRoadClasses, ...streetRoadClasses, ...serviceRoadClasses, "path"];
+  const visible = new Set(visibleRoadClasses);
+  return requestedClasses.filter((roadClass) => visible.has(roadClass));
+}
+function labelDefaultsFromLegacyMode(mode) {
+  if (mode === "none") {
+    return { language: "auto", places: "none", roads: "none", water: "none" };
+  }
+  if (mode === "essential") {
+    return { language: "auto", places: "major", roads: "major", water: "major" };
+  }
+  return { language: "auto", places: "all", roads: "all", water: "all" };
+}
+function legacyModeFromResolvedLabels(options) {
+  if (options.places === "none" && options.roads === "none" && options.water === "none") {
+    return "none";
+  }
+  if (options.places === "major" && options.roads === "major" && options.water === "major") {
+    return "essential";
+  }
   return "balanced";
 }
+function classFilter(classes) {
+  return ["match", ["get", "class"], classes, true, false];
+}
 function labelTextField(language) {
   if (language === "local") {
     return ["coalesce", ["get", "name"], ["get", "name:latin"], ["get", "name:en"]];
@@ -752,66 +935,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 highwayRoadClasses2 = ["motorway", "trunk"];
+var arterialRoadClasses2 = ["primary", "secondary", "tertiary"];
+var majorRoadClasses2 = [...highwayRoadClasses2, ...arterialRoadClasses2];
+var streetRoadClasses2 = ["minor"];
+var serviceRoadClasses2 = ["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 +979,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 +1002,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" ? [...highwayRoadClasses2] : [...majorRoadClasses2];
+  const showsStreetRoads = options.detail === "streets" || options.detail === "all";
+  const showsServiceRoads = options.detail === "all";
+  const roadClasses = [
+    ...selectedMajorRoadClasses,
+    ...showsStreetRoads ? streetRoadClasses2 : [],
+    ...showsServiceRoads ? serviceRoadClasses2 : []
+  ];
   const transportClasses = [
     ...roadClasses,
     ...options.extras.paths ? ["path"] : [],
@@ -875,12 +1034,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 roadFilter = classFilter(roadClasses);
-  const transportFilter = classFilter(transportClasses);
+  const majorFilter = classFilter2(selectedMajorRoadClasses);
+  const streetFilter = classFilter2(streetRoadClasses2);
+  const serviceFilter = classFilter2(serviceRoadClasses2);
+  const roadFilter = classFilter2(roadClasses);
+  const transportFilter = classFilter2(transportClasses);
   const layers = [];
-  if (options.casing !== "none") {
+  if (options.outline !== "none") {
     layers.push({
       id: "roads-tunnels-casing",
       type: "line",
@@ -891,14 +1051,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 +1076,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 +1100,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
         )
       }
     });
@@ -953,7 +1119,7 @@ function roadLayers(source, sourceLayer, colors, options) {
       source,
       "source-layer": sourceLayer,
       minzoom: 5,
-      filter: ["all", nonTunnelRoadFilter, classFilter(["ferry"])],
+      filter: ["all", nonTunnelRoadFilter, classFilter2(["ferry"])],
       paint: {
         "line-color": colors.roads.ferry,
         "line-dasharray": [1.2, 1.1],
@@ -975,8 +1141,8 @@ function roadLayers(source, sourceLayer, colors, options) {
       type: "line",
       source,
       "source-layer": sourceLayer,
-      minzoom: options.detail === "all" ? 8 : 10,
-      filter: ["all", nonTunnelRoadFilter, classFilter(["path"])],
+      minzoom: 10,
+      filter: ["all", nonTunnelRoadFilter, classFilter2(["path"])],
       paint: {
         "line-color": colors.roads.path,
         "line-dasharray": [0.7, 0.7],
@@ -998,8 +1164,8 @@ function roadLayers(source, sourceLayer, colors, options) {
       type: "line",
       source,
       "source-layer": sourceLayer,
-      minzoom: options.detail === "all" ? 6 : 7,
-      filter: ["all", nonTunnelRoadFilter, classFilter(["rail", "transit"])],
+      minzoom: 7,
+      filter: ["all", nonTunnelRoadFilter, classFilter2(["rail", "transit"])],
       paint: {
         "line-color": colors.roads.rail,
         "line-opacity": metrics.minorOpacity * 0.65,
@@ -1014,20 +1180,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 +1252,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";
@@ -1100,18 +1308,27 @@ function legacyModeFromResolvedRoads(options) {
   if (options.hierarchy === "strong" || options.detail === "all") return "detailed";
   return "standard";
 }
-function classFilter(classes) {
+function classFilter2(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",
+    classFilter2(majorRoadClasses2),
+    majorOpacity,
+    classFilter2(streetRoadClasses2),
+    ["step", ["zoom"], 0, 12, minorOpacity],
+    classFilter2(serviceRoadClasses2),
+    ["step", ["zoom"], 0, 14, minorOpacity],
+    minorOpacity
+  ];
+}
+function roadWidthExpression(stops, metrics) {
+  return [
+    "case",
+    classFilter2(majorRoadClasses2),
+    zoomWidth(stops, metrics.weightScale * metrics.majorWidthScale),
+    zoomWidth(stops, metrics.weightScale * metrics.minorWidthScale)
   ];
 }
 function zoomWidth(stops, scale) {
@@ -1170,7 +1387,7 @@ function openMapTilesLayers(source, sourceLayers, colors, options) {
     ...buildingLayers(source, sourceLayers.building, colors, options.density, options.buildings),
     ...roadLayers(source, sourceLayers.road, colors, options.roads),
     ...boundaryLayers(source, sourceLayers.boundary, colors),
-    ...labelLayers(source, sourceLayers.place, colors, options.labels, options.typography),
+    ...labelLayers(source, sourceLayers, colors, options.labels, options.roads, options.typography),
     ...poiLayers(
       source,
       sourceLayers.poi,
@@ -1534,7 +1751,10 @@ var sourceLayersSchema = z.object({
   landuse: z.string().optional(),
   park: z.string().optional(),
   water: z.string().optional(),
+  waterName: z.string().optional(),
+  waterway: z.string().optional(),
   road: z.string().optional(),
+  roadName: z.string().optional(),
   building: z.string().optional(),
   boundary: z.string().optional(),
   place: z.string().optional(),
@@ -1552,26 +1772,23 @@ 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"]);
+var labelDetailSchema = z.enum(["none", "major", "all"]);
 var labelsModuleSchema = z.object({
   type: z.literal("labels"),
   language: z.string().trim().min(1).optional(),
-  places: labelDensitySchema.optional(),
-  preset: z.enum(["none", "essential", "balanced", "full"]).optional(),
-  roads: labelDensitySchema.optional(),
-  water: labelDensitySchema.optional()
+  places: labelDetailSchema.optional(),
+  roads: labelDetailSchema.optional(),
+  water: labelDetailSchema.optional()
 }).strict();
 var poiModuleSchema = z.object({
   type: z.literal("poi"),
@@ -1924,7 +2141,7 @@ function applyOsmBrightControls(layers, options) {
       );
     }
     if (isLabelLayer(id, sourceLayer)) {
-      return applyLabelLayerControls(layer, options.labels);
+      return applyLabelLayerControls(layer, options.labels, options.roads);
     }
     return layer;
   });
@@ -1934,14 +2151,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 +2169,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 +2188,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)) {
@@ -2003,12 +2228,12 @@ function scaleStyleValue(value, scale, fallback) {
   }
   return fallback * scale;
 }
-function applyLabelLayerControls(layer, labels2) {
+function applyLabelLayerControls(layer, labels2, roads2) {
   const id = stringValue(layer.id);
   const sourceLayer = stringValue(layer["source-layer"]);
   const group = labelGroup(id, sourceLayer);
-  const density = labelGroupDensity(labels2, group);
-  if (labels2.mode === "none" || density === "none") {
+  const detail = labelGroupDetail(labels2, group);
+  if (detail === "none" || detail === "major" && isMinorLabelLayer(id, group)) {
     return setLayerVisibility(layer, "none");
   }
   const nextLayer = setLayerVisibility(layer, "visible");
@@ -2016,13 +2241,20 @@ function applyLabelLayerControls(layer, labels2) {
   if ("text-field" in layout && !isHighwayShieldLayer(id)) {
     layout["text-field"] = labelTextField(labels2.language);
   }
-  if (density === "minimal") {
-    nextLayer.minzoom = Math.max(numberValue(nextLayer.minzoom) ?? 0, minimalMinZoom(group));
+  if (group === "roads" && roads2) {
+    const allowedClasses = visibleRoadLabelClasses(detail, roads2).filter(
+      (roadClass) => roadLabelLayerClasses(id).includes(roadClass)
+    );
+    if (allowedClasses.length === 0) {
+      return setLayerVisibility(layer, "none");
+    }
+    nextLayer.filter = combineFilters(nextLayer.filter, ["in", "class", ...allowedClasses]);
   }
-  if (density === "detailed") {
-    const currentMinZoom = numberValue(nextLayer.minzoom);
-    if (currentMinZoom !== void 0) {
-      nextLayer.minzoom = Math.max(0, currentMinZoom - 1);
+  if (group === "water" && detail === "major") {
+    if (sourceLayer === "waterway") {
+      nextLayer.filter = combineFilters(nextLayer.filter, ["==", "class", "river"]);
+    } else if (id === "water-name-other") {
+      nextLayer.filter = combineFilters(nextLayer.filter, ["in", "class", "sea", "lake"]);
     }
   }
   nextLayer.layout = layout;
@@ -2052,7 +2284,7 @@ function applyPoiLayerControls(layer, poi2, customIconSpriteId2, customIconMappi
   nextLayer.layout = layout;
   return nextLayer;
 }
-function labelGroupDensity(labels2, group) {
+function labelGroupDetail(labels2, group) {
   if (group === "roads") return labels2.roads;
   if (group === "water") return labels2.water;
   return labels2.places;
@@ -2066,10 +2298,15 @@ function labelGroup(id, sourceLayer) {
   }
   return "places";
 }
-function minimalMinZoom(group) {
-  if (group === "roads") return 13;
-  if (group === "water") return 5;
-  return 4;
+function isMinorLabelLayer(id, group) {
+  if (group === "places") return id === "place-other" || id === "place-village";
+  if (group === "roads") return id.includes("path") || id.includes("minor");
+  return false;
+}
+function roadLabelLayerClasses(id) {
+  if (id.includes("path")) return ["path"];
+  if (id.includes("minor")) return ["minor", "service", "track"];
+  return ["motorway", "trunk", "primary", "secondary", "tertiary"];
 }
 function isLabelLayer(id, sourceLayer) {
   return sourceLayer === "place" || sourceLayer === "transportation_name" || sourceLayer === "water_name" || sourceLayer === "waterway" || id.includes("highway-name") || id.includes("highway-shield") || id.includes("water-name");
@@ -5001,7 +5238,10 @@ var defaultSourceLayers = {
   landuse: "landuse",
   park: "park",
   water: "water",
+  waterName: "water_name",
+  waterway: "waterway",
   road: "transportation",
+  roadName: "transportation_name",
   building: "building",
   boundary: "boundary",
   place: "place",
@@ -5059,13 +5299,15 @@ function createStyle(input = {}, options = {}) {
     roadModule,
     theme.preset.roads ?? defaultConfig.roads
   );
+  const { mode: resolvedRoadMode, ...resolvedRoadModule } = resolvedRoads;
   const resolvedLabels = resolveLabels(
     config.labels,
     labelsModule,
     theme.preset.labels ?? defaultConfig.labels
   );
+  const { mode: resolvedLabelsMode, ...resolvedLabelsModule } = resolvedLabels;
   const resolvedPoi = resolvePoi(config.poi, poiModule, theme.preset.poi ?? defaultConfig.poi);
-  const labels2 = resolvedLabels.mode;
+  const labels2 = resolvedLabelsMode;
   const poi2 = resolvedPoi.mode;
   const buildings = config.buildings ?? "flat";
   const colors = resolveColors(config.colors, theme.colors, {}, theme.modules);
@@ -5095,10 +5337,10 @@ 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:labelsModule": labelsModule ? resolvedLabelsModule : void 0,
     "tileflow:poi": poi2,
     "tileflow:poiModule": poiModule,
     "tileflow:icons": iconSet ? {
@@ -5136,7 +5378,6 @@ function createStyle(input = {}, options = {}) {
       theme,
       tilesUrl,
       typography,
-      labels: labels2,
       labelsModule: resolvedLabels,
       poi: poi2,
       poiModule: resolvedPoi,