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

package/dist/index.js

@@ -512,858 +512,861 @@ function rgbToHex(r, g, b) {
   return `#${[r, g, b].map((value) => value.toString(16).padStart(2, "0")).join("")}`;
 }
 
-// src/modules/labels/index.ts
-var moduleLabelDefaults = {
-  language: "auto",
-  places: "major",
-  roads: "major",
-  water: "major"
+// src/modules/roads/index.ts
+var moduleRoadDefaults = {
+  detail: "streets",
+  extras: { ferry: false, paths: false, rail: false },
+  hierarchy: "clear",
+  outline: "subtle",
+  weight: "regular"
 };
-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 = {}) {
+var majorRoadClassSet = new Set(majorRoadClasses);
+function roadClassesForDetail(detail) {
+  if (detail === "none") return [];
+  return [
+    ...detail === "highways" ? highwayRoadClasses : majorRoadClasses,
+    ...detail === "streets" || detail === "all" ? streetRoadClasses : [],
+    ...detail === "all" ? serviceRoadClasses : []
+  ];
+}
+function isMajorRoadClass(roadClass) {
+  return majorRoadClassSet.has(roadClass);
+}
+function roads(options = {}) {
   return {
-    type: "labels",
-    ...options.language ? { language: options.language } : {},
-    ...options.places ? { places: options.places } : {},
-    ...options.roads ? { roads: options.roads } : {},
-    ...options.water ? { water: options.water } : {}
+    type: "roads",
+    ...options.detail ? { detail: options.detail } : {},
+    ...options.extras ? { extras: { ...options.extras } } : {},
+    ...options.hierarchy ? { hierarchy: options.hierarchy } : {},
+    ...options.outline ? { outline: options.outline } : {},
+    ...options.weight ? { weight: options.weight } : {}
   };
 }
-function resolveLabels(legacyLabels, moduleConfig, fallback) {
-  const fallbackMode = legacyLabels ?? fallback;
-  const defaults = moduleConfig ? moduleLabelDefaults : labelDefaultsFromLegacyMode(fallbackMode);
+function resolveRoads(legacyRoads, moduleConfig, fallback) {
+  const fallbackMode = legacyRoads ?? fallback;
+  const defaults = moduleConfig ? moduleRoadDefaults : roadDefaultsFromLegacyMode(fallbackMode);
   const resolved = {
-    language: moduleConfig?.language ?? defaults.language,
-    places: moduleConfig?.places ?? defaults.places,
-    roads: moduleConfig?.roads ?? defaults.roads,
-    water: moduleConfig?.water ?? defaults.water
+    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: moduleConfig?.hierarchy ?? defaults.hierarchy,
+    outline: moduleConfig?.outline ?? defaults.outline,
+    weight: moduleConfig?.weight ?? defaults.weight
   };
   return {
     ...resolved,
-    mode: moduleConfig ? legacyModeFromResolvedLabels(resolved) : fallbackMode
+    mode: legacyModeFromResolvedRoads(resolved)
   };
 }
-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 roadStyleMetrics(options) {
+  const hierarchy = {
+    subtle: {
+      majorOpacity: 0.92,
+      majorWidthScale: 1,
+      minorOpacity: 0.82,
+      minorWidthScale: 0.94
+    },
+    clear: {
+      majorOpacity: 0.92,
+      majorWidthScale: 1,
+      minorOpacity: 0.68,
+      minorWidthScale: 0.84
+    },
+    strong: {
+      majorOpacity: 0.92,
+      majorWidthScale: 1,
+      minorOpacity: 0.52,
+      minorWidthScale: 0.7
+    }
+  }[options.hierarchy];
+  const weightScale = {
+    thin: 0.78,
+    regular: 1,
+    bold: 1.24
+  }[options.weight];
+  const outlineOpacity = {
+    none: 0,
+    subtle: 0.18,
+    strong: 0.34
+  }[options.outline];
+  return {
+    ...hierarchy,
+    outlineOpacity,
+    weightScale
+  };
 }
-function placeLabelLayers(source, sourceLayer, colors, labelsConfig, typography) {
-  if (labelsConfig.places === "none") return [];
-  return [
-    {
-      id: "place-labels",
-      type: "symbol",
+function roadLayers(source, sourceLayer, colors, options) {
+  if (options.detail === "none") {
+    return [];
+  }
+  const metrics = roadStyleMetrics(options);
+  const roadClasses = roadClassesForDetail(options.detail);
+  const selectedMajorRoadClasses = roadClasses.filter(isMajorRoadClass);
+  const showsStreetRoads = roadClasses.includes("minor");
+  const showsServiceRoads = roadClasses.includes("service");
+  const transportClasses = [
+    ...roadClasses,
+    ...options.extras.paths ? ["path"] : [],
+    ...options.extras.rail ? ["rail", "transit"] : [],
+    ...options.extras.ferry ? ["ferry"] : []
+  ];
+  const roadClassColor = roadClassColorExpression(colors);
+  const nonTunnelRoadFilter = ["!=", ["get", "brunnel"], "tunnel"];
+  const majorFilter = classFilter(selectedMajorRoadClasses);
+  const streetFilter = classFilter(streetRoadClasses);
+  const serviceFilter = classFilter(serviceRoadClasses);
+  const roadFilter = classFilter(roadClasses);
+  const transportFilter = classFilter(transportClasses);
+  const layers = [];
+  if (options.outline !== "none") {
+    layers.push({
+      id: "roads-tunnels-casing",
+      type: "line",
       source,
       "source-layer": sourceLayer,
-      minzoom: 0,
-      filter: labelsConfig.places === "major" ? ["all", ["has", "name"], classFilter(majorPlaceClasses)] : ["has", "name"],
-      layout: {
-        "text-field": labelTextField(labelsConfig.language),
-        "text-font": textFont(typography),
-        "text-size": ["interpolate", ["linear"], ["zoom"], 3, 10, 8, 13, 14, 17],
-        "text-letter-spacing": 0,
-        "text-padding": 4
-      },
+      minzoom: 10,
+      filter: ["all", ["==", ["get", "brunnel"], "tunnel"], transportFilter],
       paint: {
-        "text-color": colors.labels.primary,
-        "text-halo-color": colors.labels.halo,
-        "text-halo-width": 1.2
+        "line-color": colors.roads.tunnel,
+        "line-dasharray": [0.6, 0.8],
+        "line-opacity": roadOpacityExpression(
+          metrics.outlineOpacity * 0.85,
+          metrics.outlineOpacity * 0.85
+        ),
+        "line-width": roadWidthExpression(
+          [
+            [10, 0.8],
+            [14, 2.2],
+            [16, 4.8]
+          ],
+          metrics
+        )
       }
+    });
+  }
+  layers.push({
+    id: "roads-tunnels",
+    type: "line",
+    source,
+    "source-layer": sourceLayer,
+    minzoom: 10,
+    filter: ["all", ["==", ["get", "brunnel"], "tunnel"], transportFilter],
+    paint: {
+      "line-color": roadClassColor,
+      "line-dasharray": [0.6, 0.8],
+      "line-opacity": roadOpacityExpression(
+        metrics.majorOpacity * 0.28,
+        metrics.minorOpacity * 0.28
+      ),
+      "line-width": roadWidthExpression(
+        [
+          [10, 0.25],
+          [14, 1],
+          [16, 2.4]
+        ],
+        metrics
+      )
     }
-  ];
-}
-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");
+  });
+  if (options.outline !== "none") {
     layers.push({
-      id: "road-shields",
-      type: "symbol",
+      id: "roads-casing",
+      type: "line",
       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
+      minzoom: 5,
+      filter: ["all", nonTunnelRoadFilter, roadFilter],
+      paint: {
+        "line-color": colors.roads.casing,
+        "line-opacity": roadOpacityExpression(metrics.outlineOpacity, metrics.outlineOpacity),
+        "line-width": roadWidthExpression(
+          [
+            [6, 0.7],
+            [12, 1.8],
+            [16, 5.4]
+          ],
+          metrics
+        )
+      }
     });
-    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) {
+  if (options.extras.ferry) {
     layers.push({
-      id: "road-labels-minor",
-      type: "symbol",
+      id: "roads-ferry",
+      type: "line",
       source,
       "source-layer": sourceLayer,
-      minzoom: 14,
-      filter: ["all", ["has", "name"], classFilter(minorClasses)],
-      layout: sharedLayout,
-      paint: sharedPaint
+      minzoom: 5,
+      filter: ["all", nonTunnelRoadFilter, classFilter(["ferry"])],
+      paint: {
+        "line-color": colors.roads.ferry,
+        "line-dasharray": [1.2, 1.1],
+        "line-opacity": metrics.majorOpacity * 0.8,
+        "line-width": zoomWidth(
+          [
+            [5, 0.25],
+            [12, 0.8],
+            [16, 2.6]
+          ],
+          metrics.weightScale
+        )
+      }
     });
   }
-  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",
+  if (options.extras.paths) {
+    layers.push({
+      id: "roads-paths",
+      type: "line",
       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
-    },
+      "source-layer": sourceLayer,
+      minzoom: 10,
+      filter: ["all", nonTunnelRoadFilter, classFilter(["path"])],
+      paint: {
+        "line-color": colors.roads.path,
+        "line-dasharray": [0.7, 0.7],
+        "line-opacity": metrics.minorOpacity * 0.77,
+        "line-width": zoomWidth(
+          [
+            [10, 0.25],
+            [14, 0.8],
+            [16, 2.2]
+          ],
+          metrics.weightScale * metrics.minorWidthScale
+        )
+      }
+    });
+  }
+  if (options.extras.rail) {
+    layers.push({
+      id: "roads-rail",
+      type: "line",
+      source,
+      "source-layer": sourceLayer,
+      minzoom: 7,
+      filter: ["all", nonTunnelRoadFilter, classFilter(["rail", "transit"])],
+      paint: {
+        "line-color": colors.roads.rail,
+        "line-opacity": metrics.minorOpacity * 0.65,
+        "line-width": zoomWidth(
+          [
+            [7, 0.35],
+            [12, 0.9],
+            [16, 2.4]
+          ],
+          metrics.weightScale * metrics.minorWidthScale
+        )
+      }
+    });
+  }
+  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: 12,
+      filter: ["all", nonTunnelRoadFilter, streetFilter],
+      paint: {
+        "line-color": roadClassColor,
+        "line-opacity": metrics.minorOpacity,
+        "line-width": zoomWidth(
+          [
+            [12, 0.8],
+            [16, 3]
+          ],
+          metrics.weightScale * metrics.minorWidthScale
+        )
+      }
+    });
+  }
+  layers.push(
     {
-      id: "water-line-labels",
-      type: "symbol",
+      id: "roads-major",
+      type: "line",
       source,
-      "source-layer": waterNameSourceLayer,
+      "source-layer": sourceLayer,
       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
+      filter: ["all", nonTunnelRoadFilter, majorFilter],
+      paint: {
+        "line-color": roadClassColor,
+        "line-opacity": metrics.majorOpacity,
+        "line-width": zoomWidth(
+          [
+            [5, 0.35],
+            [12, 1.2],
+            [16, 4]
+          ],
+          metrics.weightScale * metrics.majorWidthScale
+        )
+      }
     },
     {
-      id: "waterway-labels",
-      type: "symbol",
+      id: "roads-bridges",
+      type: "line",
       source,
-      "source-layer": waterwaySourceLayer,
+      "source-layer": sourceLayer,
       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
+      filter: ["all", ["==", ["get", "brunnel"], "bridge"], transportFilter],
+      paint: {
+        "line-color": colors.roads.bridge,
+        "line-opacity": roadOpacityExpression(metrics.majorOpacity, metrics.minorOpacity),
+        "line-width": roadWidthExpression(
+          [
+            [10, 0.45],
+            [14, 1.6],
+            [16, 4.4]
+          ],
+          metrics
+        )
+      }
     }
-  ];
-}
-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));
+  );
+  return layers;
 }
-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" };
+function roadDefaultsFromLegacyMode(mode) {
+  if (mode === "hidden") {
+    return {
+      detail: "none",
+      extras: { ferry: false, paths: false, rail: false },
+      hierarchy: "clear",
+      outline: "subtle",
+      weight: "regular"
+    };
   }
-  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 (mode === "soft") {
+    return {
+      detail: "streets",
+      extras: { ferry: false, paths: false, rail: false },
+      hierarchy: "subtle",
+      outline: "subtle",
+      weight: "thin"
+    };
   }
-  if (options.places === "major" && options.roads === "major" && options.water === "major") {
-    return "essential";
+  if (mode === "detailed") {
+    return {
+      detail: "all",
+      extras: { ferry: true, paths: true, rail: true },
+      hierarchy: "clear",
+      outline: "strong",
+      weight: "regular"
+    };
   }
-  return "balanced";
+  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";
+  if (options.hierarchy === "subtle") return "soft";
+  if (options.hierarchy === "strong" || options.detail === "all") return "detailed";
+  return "standard";
 }
 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"]];
-  }
-  if (language === "auto") {
-    return ["coalesce", ["get", "name:latin"], ["get", "name"], ["get", "name:en"]];
-  }
-  return ["coalesce", ["get", `name:${language}`], ["get", "name:latin"], ["get", "name"]];
+function roadOpacityExpression(majorOpacity, minorOpacity) {
+  return [
+    "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) {
+  return [
+    "interpolate",
+    ["linear"],
+    ["zoom"],
+    ...stops.flatMap(([zoom, width]) => [zoom, width * scale])
+  ];
+}
+function roadClassColorExpression(colors) {
+  return [
+    "match",
+    ["get", "class"],
+    "motorway",
+    colors.roads.motorway,
+    "trunk",
+    colors.roads.trunk,
+    "primary",
+    colors.roads.primary,
+    "secondary",
+    colors.roads.secondary,
+    "rail",
+    colors.roads.rail,
+    "transit",
+    colors.roads.rail,
+    "ferry",
+    colors.roads.ferry,
+    "path",
+    colors.roads.path,
+    "track",
+    colors.roads.path,
+    colors.roads.minor
+  ];
 }
 
-// src/modules/poi/index.ts
-var defaultPoiMinZoom = {
-  none: 24,
-  minimal: 15,
-  balanced: 13,
-  full: 11
+// src/modules/labels/index.ts
+var moduleLabelDefaults = {
+  language: "auto",
+  places: "major",
+  roads: "major",
+  water: "major"
 };
-function poi(options = {}) {
+var majorPlaceClasses = ["continent", "country", "state", "city", "town"];
+var majorWaterClasses = ["ocean", "sea", "lake"];
+var majorWaterwayClasses = ["river"];
+function labels(options = {}) {
   return {
-    type: "poi",
-    ...options.categories ? { categories: options.categories } : {},
-    ...options.icons !== void 0 ? { icons: options.icons } : {},
-    ...options.labels ? { labels: options.labels } : {},
-    ...options.minZoom !== void 0 ? { minZoom: options.minZoom } : {},
-    ...options.preset ? { preset: options.preset } : {}
+    type: "labels",
+    ...options.language ? { language: options.language } : {},
+    ...options.places ? { places: options.places } : {},
+    ...options.roads ? { roads: options.roads } : {},
+    ...options.water ? { water: options.water } : {}
   };
 }
-function resolvePoi(legacyPoi, moduleConfig, fallback) {
-  const mode = moduleConfig?.preset ?? legacyPoi ?? fallback;
+function resolveLabels(legacyLabels, moduleConfig, fallback) {
+  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 {
-    categories: moduleConfig?.categories,
-    icons: moduleConfig?.icons ?? (mode === "none" ? false : "essential"),
-    labels: moduleConfig?.labels ?? poiLabelsFromMode(mode),
-    minZoom: moduleConfig?.minZoom ?? defaultPoiMinZoom[mode],
-    mode
+    ...resolved,
+    mode: moduleConfig ? legacyModeFromResolvedLabels(resolved) : fallbackMode
   };
 }
-function poiLayers(source, sourceLayer, colors, poiConfig, typography, customIconSpriteId2, customIconMapping) {
-  if (poiConfig.mode === "none") {
-    return [];
-  }
-  const layout = {
-    "text-field": labelTextField("auto"),
-    "text-font": textFont(typography),
-    "text-size": ["interpolate", ["linear"], ["zoom"], poiConfig.minZoom, 10, 17, 12],
-    "text-letter-spacing": 0,
-    "text-padding": 2
-  };
-  if (poiConfig.labels === "none") {
-    delete layout["text-field"];
-  }
-  if (poiConfig.icons) {
-    layout["icon-image"] = poiIconImageExpression(customIconSpriteId2, customIconMapping);
-    layout["icon-optional"] = true;
-    layout["icon-padding"] = 2;
-    layout["icon-size"] = ["interpolate", ["linear"], ["zoom"], poiConfig.minZoom, 0.85, 17, 1];
-    layout["text-anchor"] = "top";
-    layout["text-offset"] = [0, 0.75];
-  }
+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: "poi-labels",
+      id: "place-labels",
       type: "symbol",
       source,
       "source-layer": sourceLayer,
-      minzoom: poiConfig.minZoom,
-      ...poiConfig.categories ? { filter: poiCategoryFilter(poiConfig.categories) } : {},
-      layout,
+      minzoom: 0,
+      filter: labelsConfig.places === "major" ? ["all", ["has", "name"], classFilter2(majorPlaceClasses)] : ["has", "name"],
+      layout: {
+        "text-field": labelTextField(labelsConfig.language),
+        "text-font": textFont(typography),
+        "text-size": ["interpolate", ["linear"], ["zoom"], 3, 10, 8, 13, 14, 17],
+        "text-letter-spacing": 0,
+        "text-padding": 4
+      },
       paint: {
-        "text-color": colors.poi.label,
-        "text-halo-color": colors.poi.halo ?? alpha(colors.background, 0.78),
-        "text-halo-width": 1
+        "text-color": colors.labels.primary,
+        "text-halo-color": colors.labels.halo,
+        "text-halo-width": 1.2
       }
     }
   ];
 }
-function poiLabelsFromMode(mode) {
-  if (mode === "none") return "none";
-  if (mode === "minimal") return "minimal";
-  if (mode === "full") return "full";
-  return "balanced";
-}
-function poiCategoryFilter(categories) {
-  return ["in", "class", ...categories.flatMap((category) => poiCategoryClasses(category))];
-}
-function poiIconImageExpression(customIconSpriteId2, customIconMapping = {}) {
-  const matchParts = [];
-  for (const [className, iconName] of Object.entries(poiClassIconNames)) {
-    matchParts.push(
-      className,
-      poiIconImageFallback(iconName, customIconSpriteId2, customIconMapping)
-    );
+function roadLabelLayers(source, sourceLayer, colors, labelsConfig, roadsConfig, typography) {
+  const classes = visibleRoadLabelClasses(labelsConfig.roads, roadsConfig);
+  const majorClasses = classes.filter(isMajorRoadClass);
+  const minorClasses = classes.filter((roadClass) => !isMajorRoadClass(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"], classFilter2(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"], classFilter2(namedMajorClasses)],
+        layout: sharedLayout,
+        paint: sharedPaint
+      });
+    }
   }
-  return [
-    "match",
-    ["get", "class"],
-    ...matchParts,
-    poiIconImageFallback("default", customIconSpriteId2, customIconMapping)
-  ];
-}
-function poiCategoryClasses(category) {
-  return poiCategoryClassNames[category] ?? [category];
-}
-function poiIconImageFallback(iconName, customIconSpriteId2, customIconMapping) {
-  const osmBrightIcon = `${osmBrightIconNameForSemanticIcon(iconName)}_11`;
-  const customIconName = customIconMapping[iconName] ?? iconName;
-  if (!customIconSpriteId2) {
-    return ["coalesce", ["image", customIconName], ["image", osmBrightIcon]];
+  if (minorClasses.length > 0) {
+    layers.push({
+      id: "road-labels-minor",
+      type: "symbol",
+      source,
+      "source-layer": sourceLayer,
+      minzoom: 14,
+      filter: ["all", ["has", "name"], classFilter2(minorClasses)],
+      layout: sharedLayout,
+      paint: sharedPaint
+    });
   }
-  return [
-    "coalesce",
-    ["image", `${customIconSpriteId2}:${customIconName}`],
-    ["image", osmBrightIcon]
-  ];
-}
-function osmBrightIconNameForSemanticIcon(iconName) {
-  return semanticToOsmBrightIconName[iconName] ?? "marker";
+  return layers;
 }
-var poiCategoryClassNames = {
-  coffee: ["cafe"],
-  culture: ["museum", "gallery", "theatre", "cinema", "library", "attraction"],
-  education: ["school", "college", "university"],
-  food: ["restaurant", "fast_food", "bar", "pub", "biergarten"],
-  health: ["hospital", "pharmacy", "doctors", "dentist"],
-  lodging: ["hotel", "motel", "hostel", "guest_house"],
-  services: ["bank", "post", "toilet", "police", "fire_station", "town_hall"],
-  shopping: ["shop", "mall", "supermarket", "marketplace"],
-  transit: ["railway", "station", "bus", "bus_stop", "subway", "tram"]
-};
-var poiClassIconNames = {
-  attraction: "culture",
-  bank: "services",
-  bar: "food",
-  biergarten: "food",
-  bus: "transit",
-  bus_stop: "transit",
-  cafe: "coffee",
-  cinema: "culture",
-  college: "education",
-  dentist: "health",
-  doctors: "health",
-  fast_food: "food",
-  fire_station: "services",
-  gallery: "culture",
-  guest_house: "lodging",
-  hospital: "health",
-  hostel: "lodging",
-  hotel: "lodging",
-  library: "culture",
-  mall: "shopping",
-  marketplace: "shopping",
-  motel: "lodging",
-  museum: "culture",
-  pharmacy: "health",
-  police: "services",
-  post: "services",
-  pub: "food",
-  railway: "transit",
-  restaurant: "food",
-  school: "education",
-  shop: "shopping",
-  station: "transit",
-  subway: "transit",
-  supermarket: "shopping",
-  theatre: "culture",
-  toilet: "services",
-  town_hall: "services",
-  tram: "transit",
-  university: "education"
-};
-var semanticToOsmBrightIconName = {
-  coffee: "cafe",
-  culture: "museum",
-  default: "marker",
-  education: "school",
-  food: "restaurant",
-  health: "hospital",
-  lodging: "lodging",
-  services: "marker",
-  shopping: "shop",
-  transit: "railway"
-};
-
-// src/modules/roads/index.ts
-var moduleRoadDefaults = {
-  detail: "streets",
-  extras: { ferry: false, paths: false, rail: false },
-  hierarchy: "clear",
-  outline: "subtle",
-  weight: "regular"
-};
-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",
-    ...options.detail ? { detail: options.detail } : {},
-    ...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 defaults = moduleConfig ? moduleRoadDefaults : roadDefaultsFromLegacyMode(fallbackMode);
-  const resolved = {
-    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: moduleConfig?.hierarchy ?? defaults.hierarchy,
-    outline: moduleConfig?.outline ?? defaults.outline,
-    weight: moduleConfig?.weight ?? defaults.weight
-  };
-  return {
-    ...resolved,
-    mode: legacyModeFromResolvedRoads(resolved)
+function waterLabelLayers(source, waterNameSourceLayer, waterwaySourceLayer, colors, labelsConfig, typography) {
+  if (labelsConfig.water === "none") return [];
+  const waterFilter = labelsConfig.water === "major" ? ["all", ["has", "name"], classFilter2(majorWaterClasses)] : ["has", "name"];
+  const waterwayFilter = labelsConfig.water === "major" ? ["all", ["has", "name"], classFilter2(majorWaterwayClasses)] : ["has", "name"];
+  const paint = {
+    "text-color": colors.labels.water,
+    "text-halo-color": colors.labels.halo,
+    "text-halo-width": 1
   };
-}
-function roadStyleMetrics(options) {
-  const hierarchy = {
-    subtle: {
-      majorOpacity: 0.92,
-      majorWidthScale: 1,
-      minorOpacity: 0.82,
-      minorWidthScale: 0.94
+  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
     },
-    clear: {
-      majorOpacity: 0.92,
-      majorWidthScale: 1,
-      minorOpacity: 0.68,
-      minorWidthScale: 0.84
+    {
+      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
     },
-    strong: {
-      majorOpacity: 0.92,
-      majorWidthScale: 1,
-      minorOpacity: 0.52,
-      minorWidthScale: 0.7
+    {
+      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
     }
-  }[options.hierarchy];
-  const weightScale = {
-    thin: 0.78,
-    regular: 1,
-    bold: 1.24
-  }[options.weight];
-  const outlineOpacity = {
-    none: 0,
-    subtle: 0.18,
-    strong: 0.34
-  }[options.outline];
-  return {
-    ...hierarchy,
-    outlineOpacity,
-    weightScale
-  };
-}
-function roadLayers(source, sourceLayer, colors, options) {
-  if (options.detail === "none") {
-    return [];
-  }
-  const metrics = roadStyleMetrics(options);
-  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"] : [],
-    ...options.extras.rail ? ["rail", "transit"] : [],
-    ...options.extras.ferry ? ["ferry"] : []
+}
+function visibleRoadLabelClasses(detail, roadsConfig) {
+  if (detail === "none" || roadsConfig.detail === "none") return [];
+  const visibleRoadClasses = [
+    ...roadClassesForDetail(roadsConfig.detail),
+    ...roadsConfig.extras.paths ? ["path"] : []
   ];
-  const roadClassColor = roadClassColorExpression(colors);
-  const nonTunnelRoadFilter = ["!=", ["get", "brunnel"], "tunnel"];
-  const majorFilter = classFilter2(selectedMajorRoadClasses);
-  const streetFilter = classFilter2(streetRoadClasses2);
-  const serviceFilter = classFilter2(serviceRoadClasses2);
-  const roadFilter = classFilter2(roadClasses);
-  const transportFilter = classFilter2(transportClasses);
-  const layers = [];
-  if (options.outline !== "none") {
-    layers.push({
-      id: "roads-tunnels-casing",
-      type: "line",
-      source,
-      "source-layer": sourceLayer,
-      minzoom: 10,
-      filter: ["all", ["==", ["get", "brunnel"], "tunnel"], transportFilter],
-      paint: {
-        "line-color": colors.roads.tunnel,
-        "line-dasharray": [0.6, 0.8],
-        "line-opacity": roadOpacityExpression(
-          metrics.outlineOpacity * 0.85,
-          metrics.outlineOpacity * 0.85
-        ),
-        "line-width": roadWidthExpression(
-          [
-            [10, 0.8],
-            [14, 2.2],
-            [16, 4.8]
-          ],
-          metrics
-        )
-      }
-    });
+  const requestedClasses = roadLabelClasses(detail);
+  const visible = new Set(visibleRoadClasses);
+  return requestedClasses.filter((roadClass) => visible.has(roadClass));
+}
+function roadLabelClasses(detail) {
+  return [...roadClassesForDetail(detail), ...detail === "all" ? ["path"] : []];
+}
+function labelDefaultsFromLegacyMode(mode) {
+  if (mode === "none") {
+    return { language: "auto", places: "none", roads: "none", water: "none" };
   }
-  layers.push({
-    id: "roads-tunnels",
-    type: "line",
-    source,
-    "source-layer": sourceLayer,
-    minzoom: 10,
-    filter: ["all", ["==", ["get", "brunnel"], "tunnel"], transportFilter],
-    paint: {
-      "line-color": roadClassColor,
-      "line-dasharray": [0.6, 0.8],
-      "line-opacity": roadOpacityExpression(
-        metrics.majorOpacity * 0.28,
-        metrics.minorOpacity * 0.28
-      ),
-      "line-width": roadWidthExpression(
-        [
-          [10, 0.25],
-          [14, 1],
-          [16, 2.4]
-        ],
-        metrics
-      )
-    }
-  });
-  if (options.outline !== "none") {
-    layers.push({
-      id: "roads-casing",
-      type: "line",
-      source,
-      "source-layer": sourceLayer,
-      minzoom: 5,
-      filter: ["all", nonTunnelRoadFilter, roadFilter],
-      paint: {
-        "line-color": colors.roads.casing,
-        "line-opacity": roadOpacityExpression(metrics.outlineOpacity, metrics.outlineOpacity),
-        "line-width": roadWidthExpression(
-          [
-            [6, 0.7],
-            [12, 1.8],
-            [16, 5.4]
-          ],
-          metrics
-        )
-      }
-    });
+  if (mode === "essential") {
+    return { language: "auto", places: "major", roads: "major", water: "major" };
   }
-  if (options.extras.ferry) {
-    layers.push({
-      id: "roads-ferry",
-      type: "line",
-      source,
-      "source-layer": sourceLayer,
-      minzoom: 5,
-      filter: ["all", nonTunnelRoadFilter, classFilter2(["ferry"])],
-      paint: {
-        "line-color": colors.roads.ferry,
-        "line-dasharray": [1.2, 1.1],
-        "line-opacity": metrics.majorOpacity * 0.8,
-        "line-width": zoomWidth(
-          [
-            [5, 0.25],
-            [12, 0.8],
-            [16, 2.6]
-          ],
-          metrics.weightScale
-        )
-      }
-    });
+  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.extras.paths) {
-    layers.push({
-      id: "roads-paths",
-      type: "line",
-      source,
-      "source-layer": sourceLayer,
-      minzoom: 10,
-      filter: ["all", nonTunnelRoadFilter, classFilter2(["path"])],
-      paint: {
-        "line-color": colors.roads.path,
-        "line-dasharray": [0.7, 0.7],
-        "line-opacity": metrics.minorOpacity * 0.77,
-        "line-width": zoomWidth(
-          [
-            [10, 0.25],
-            [14, 0.8],
-            [16, 2.2]
-          ],
-          metrics.weightScale * metrics.minorWidthScale
-        )
-      }
-    });
+  if (options.places === "major" && options.roads === "major" && options.water === "major") {
+    return "essential";
   }
-  if (options.extras.rail) {
-    layers.push({
-      id: "roads-rail",
-      type: "line",
-      source,
-      "source-layer": sourceLayer,
-      minzoom: 7,
-      filter: ["all", nonTunnelRoadFilter, classFilter2(["rail", "transit"])],
-      paint: {
-        "line-color": colors.roads.rail,
-        "line-opacity": metrics.minorOpacity * 0.65,
-        "line-width": zoomWidth(
-          [
-            [7, 0.35],
-            [12, 0.9],
-            [16, 2.4]
-          ],
-          metrics.weightScale * metrics.minorWidthScale
-        )
-      }
-    });
+  return "balanced";
+}
+function classFilter2(classes) {
+  return ["match", ["get", "class"], classes, true, false];
+}
+function labelTextField(language) {
+  if (language === "local") {
+    return ["coalesce", ["get", "name"], ["get", "name:latin"], ["get", "name:en"]];
   }
-  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 (language === "auto") {
+    return ["coalesce", ["get", "name:latin"], ["get", "name"], ["get", "name:en"]];
+  }
+  return ["coalesce", ["get", `name:${language}`], ["get", "name:latin"], ["get", "name"]];
+}
+
+// src/modules/poi/index.ts
+var defaultPoiMinZoom = {
+  none: 24,
+  minimal: 15,
+  balanced: 13,
+  full: 11
+};
+function poi(options = {}) {
+  return {
+    type: "poi",
+    ...options.categories ? { categories: options.categories } : {},
+    ...options.icons !== void 0 ? { icons: options.icons } : {},
+    ...options.labels ? { labels: options.labels } : {},
+    ...options.minZoom !== void 0 ? { minZoom: options.minZoom } : {},
+    ...options.preset ? { preset: options.preset } : {}
+  };
+}
+function resolvePoi(legacyPoi, moduleConfig, fallback) {
+  const mode = moduleConfig?.preset ?? legacyPoi ?? fallback;
+  return {
+    categories: moduleConfig?.categories,
+    icons: moduleConfig?.icons ?? (mode === "none" ? false : "essential"),
+    labels: moduleConfig?.labels ?? poiLabelsFromMode(mode),
+    minZoom: moduleConfig?.minZoom ?? defaultPoiMinZoom[mode],
+    mode
+  };
+}
+function poiLayers(source, sourceLayer, colors, poiConfig, typography, customIconSpriteId2, customIconMapping) {
+  if (poiConfig.mode === "none") {
+    return [];
+  }
+  const layout = {
+    "text-field": labelTextField("auto"),
+    "text-font": textFont(typography),
+    "text-size": ["interpolate", ["linear"], ["zoom"], poiConfig.minZoom, 10, 17, 12],
+    "text-letter-spacing": 0,
+    "text-padding": 2
+  };
+  if (poiConfig.labels === "none") {
+    delete layout["text-field"];
   }
-  if (showsStreetRoads) {
-    layers.push({
-      id: "roads-minor",
-      type: "line",
-      source,
-      "source-layer": sourceLayer,
-      minzoom: 12,
-      filter: ["all", nonTunnelRoadFilter, streetFilter],
-      paint: {
-        "line-color": roadClassColor,
-        "line-opacity": metrics.minorOpacity,
-        "line-width": zoomWidth(
-          [
-            [12, 0.8],
-            [16, 3]
-          ],
-          metrics.weightScale * metrics.minorWidthScale
-        )
-      }
-    });
+  if (poiConfig.icons) {
+    layout["icon-image"] = poiIconImageExpression(customIconSpriteId2, customIconMapping);
+    layout["icon-optional"] = true;
+    layout["icon-padding"] = 2;
+    layout["icon-size"] = ["interpolate", ["linear"], ["zoom"], poiConfig.minZoom, 0.85, 17, 1];
+    layout["text-anchor"] = "top";
+    layout["text-offset"] = [0, 0.75];
   }
-  layers.push(
-    {
-      id: "roads-major",
-      type: "line",
-      source,
-      "source-layer": sourceLayer,
-      minzoom: 5,
-      filter: ["all", nonTunnelRoadFilter, majorFilter],
-      paint: {
-        "line-color": roadClassColor,
-        "line-opacity": metrics.majorOpacity,
-        "line-width": zoomWidth(
-          [
-            [5, 0.35],
-            [12, 1.2],
-            [16, 4]
-          ],
-          metrics.weightScale * metrics.majorWidthScale
-        )
-      }
-    },
+  return [
     {
-      id: "roads-bridges",
-      type: "line",
+      id: "poi-labels",
+      type: "symbol",
       source,
       "source-layer": sourceLayer,
-      minzoom: 10,
-      filter: ["all", ["==", ["get", "brunnel"], "bridge"], transportFilter],
+      minzoom: poiConfig.minZoom,
+      ...poiConfig.categories ? { filter: poiCategoryFilter(poiConfig.categories) } : {},
+      layout,
       paint: {
-        "line-color": colors.roads.bridge,
-        "line-opacity": roadOpacityExpression(metrics.majorOpacity, metrics.minorOpacity),
-        "line-width": roadWidthExpression(
-          [
-            [10, 0.45],
-            [14, 1.6],
-            [16, 4.4]
-          ],
-          metrics
-        )
+        "text-color": colors.poi.label,
+        "text-halo-color": colors.poi.halo ?? alpha(colors.background, 0.78),
+        "text-halo-width": 1
       }
     }
-  );
-  return layers;
-}
-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";
-  if (options.hierarchy === "subtle") return "soft";
-  if (options.hierarchy === "strong" || options.detail === "all") return "detailed";
-  return "standard";
+function poiLabelsFromMode(mode) {
+  if (mode === "none") return "none";
+  if (mode === "minimal") return "minimal";
+  if (mode === "full") return "full";
+  return "balanced";
 }
-function classFilter2(classes) {
-  return ["match", ["get", "class"], classes, true, false];
+function poiCategoryFilter(categories) {
+  return ["in", "class", ...categories.flatMap((category) => poiCategoryClasses(category))];
 }
-function roadOpacityExpression(majorOpacity, minorOpacity) {
+function poiIconImageExpression(customIconSpriteId2, customIconMapping = {}) {
+  const matchParts = [];
+  for (const [className, iconName] of Object.entries(poiClassIconNames)) {
+    matchParts.push(
+      className,
+      poiIconImageFallback(iconName, customIconSpriteId2, customIconMapping)
+    );
+  }
   return [
-    "case",
-    classFilter2(majorRoadClasses2),
-    majorOpacity,
-    classFilter2(streetRoadClasses2),
-    ["step", ["zoom"], 0, 12, minorOpacity],
-    classFilter2(serviceRoadClasses2),
-    ["step", ["zoom"], 0, 14, minorOpacity],
-    minorOpacity
+    "match",
+    ["get", "class"],
+    ...matchParts,
+    poiIconImageFallback("default", customIconSpriteId2, customIconMapping)
   ];
 }
-function roadWidthExpression(stops, metrics) {
-  return [
-    "case",
-    classFilter2(majorRoadClasses2),
-    zoomWidth(stops, metrics.weightScale * metrics.majorWidthScale),
-    zoomWidth(stops, metrics.weightScale * metrics.minorWidthScale)
-  ];
+function poiCategoryClasses(category) {
+  return poiCategoryClassNames[category] ?? [category];
 }
-function zoomWidth(stops, scale) {
+function poiIconImageFallback(iconName, customIconSpriteId2, customIconMapping) {
+  const osmBrightIcon = `${osmBrightIconNameForSemanticIcon(iconName)}_11`;
+  const customIconName = customIconMapping[iconName] ?? iconName;
+  if (!customIconSpriteId2) {
+    return ["coalesce", ["image", customIconName], ["image", osmBrightIcon]];
+  }
   return [
-    "interpolate",
-    ["linear"],
-    ["zoom"],
-    ...stops.flatMap(([zoom, width]) => [zoom, width * scale])
+    "coalesce",
+    ["image", `${customIconSpriteId2}:${customIconName}`],
+    ["image", osmBrightIcon]
   ];
 }
-function roadClassColorExpression(colors) {
-  return [
-    "match",
-    ["get", "class"],
-    "motorway",
-    colors.roads.motorway,
-    "trunk",
-    colors.roads.trunk,
-    "primary",
-    colors.roads.primary,
-    "secondary",
-    colors.roads.secondary,
-    "rail",
-    colors.roads.rail,
-    "transit",
-    colors.roads.rail,
-    "ferry",
-    colors.roads.ferry,
-    "path",
-    colors.roads.path,
-    "track",
-    colors.roads.path,
-    colors.roads.minor
-  ];
+function osmBrightIconNameForSemanticIcon(iconName) {
+  return semanticToOsmBrightIconName[iconName] ?? "marker";
 }
+var poiCategoryClassNames = {
+  coffee: ["cafe"],
+  culture: ["museum", "gallery", "theatre", "cinema", "library", "attraction"],
+  education: ["school", "college", "university"],
+  food: ["restaurant", "fast_food", "bar", "pub", "biergarten"],
+  health: ["hospital", "pharmacy", "doctors", "dentist"],
+  lodging: ["hotel", "motel", "hostel", "guest_house"],
+  services: ["bank", "post", "toilet", "police", "fire_station", "town_hall"],
+  shopping: ["shop", "mall", "supermarket", "marketplace"],
+  transit: ["railway", "station", "bus", "bus_stop", "subway", "tram"]
+};
+var poiClassIconNames = {
+  attraction: "culture",
+  bank: "services",
+  bar: "food",
+  biergarten: "food",
+  bus: "transit",
+  bus_stop: "transit",
+  cafe: "coffee",
+  cinema: "culture",
+  college: "education",
+  dentist: "health",
+  doctors: "health",
+  fast_food: "food",
+  fire_station: "services",
+  gallery: "culture",
+  guest_house: "lodging",
+  hospital: "health",
+  hostel: "lodging",
+  hotel: "lodging",
+  library: "culture",
+  mall: "shopping",
+  marketplace: "shopping",
+  motel: "lodging",
+  museum: "culture",
+  pharmacy: "health",
+  police: "services",
+  post: "services",
+  pub: "food",
+  railway: "transit",
+  restaurant: "food",
+  school: "education",
+  shop: "shopping",
+  station: "transit",
+  subway: "transit",
+  supermarket: "shopping",
+  theatre: "culture",
+  toilet: "services",
+  town_hall: "services",
+  tram: "transit",
+  university: "education"
+};
+var semanticToOsmBrightIconName = {
+  coffee: "cafe",
+  culture: "museum",
+  default: "marker",
+  education: "school",
+  food: "restaurant",
+  health: "hospital",
+  lodging: "lodging",
+  services: "marker",
+  shopping: "shop",
+  transit: "railway"
+};
 
 // src/basemaps/osm/layers.ts
 function openMapTilesLayers(source, sourceLayers, colors, options) {
@@ -1770,9 +1773,10 @@ var basemapSchema = z.object({
   tileset: z.string().trim().min(1).optional(),
   url: z.url().optional()
 }).strict();
+var roadDetailSchema = z.enum(["none", "highways", "major", "streets", "all"]);
 var roadsModuleSchema = z.object({
   type: z.literal("roads"),
-  detail: z.enum(["none", "highways", "major", "streets", "all"]).optional(),
+  detail: roadDetailSchema.optional(),
   extras: z.object({
     ferry: z.boolean().optional(),
     paths: z.boolean().optional(),
@@ -1787,7 +1791,7 @@ var labelsModuleSchema = z.object({
   type: z.literal("labels"),
   language: z.string().trim().min(1).optional(),
   places: labelDetailSchema.optional(),
-  roads: labelDetailSchema.optional(),
+  roads: roadDetailSchema.optional(),
   water: labelDetailSchema.optional()
 }).strict();
 var poiModuleSchema = z.object({
@@ -2241,10 +2245,8 @@ function applyLabelLayerControls(layer, labels2, roads2) {
   if ("text-field" in layout && !isHighwayShieldLayer(id)) {
     layout["text-field"] = labelTextField(labels2.language);
   }
-  if (group === "roads" && roads2) {
-    const allowedClasses = visibleRoadLabelClasses(detail, roads2).filter(
-      (roadClass) => roadLabelLayerClasses(id).includes(roadClass)
-    );
+  if (group === "roads") {
+    const allowedClasses = (roads2 ? visibleRoadLabelClasses(detail, roads2) : roadLabelClasses(detail)).filter((roadClass) => roadLabelLayerClasses(id).includes(roadClass));
     if (allowedClasses.length === 0) {
       return setLayerVisibility(layer, "none");
     }