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

package/README.md

@@ -51,7 +51,7 @@ export default defineTileflow({
       icons: 'brand',
       theme: 'light',
       modules: [
-        labels({roads: 'minimal'}),
+        labels({roads: 'major'}),
         poi({categories: ['food', 'coffee', 'culture', 'transit'], icons: 'essential'}),
         roads({detail: 'streets', hierarchy: 'clear', outline: 'subtle', weight: 'regular'}),
       ],
@@ -113,7 +113,35 @@ 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.
+Colors never belong in `roads()`. Put common colors in `theme.colors` and granular road colors in `theme.modules.roads`. Road-label detail remains a `labels({roads: ...})` concern.
+
+## Labels module
+
+Control label families independently without a preset:
+
+```ts
+labels({
+  language: 'auto',
+  places: 'major',
+  roads: 'major',
+  water: 'major',
+});
+```
+
+`places` and `water` accept `none`, `major`, or `all`. Road labels follow the road hierarchy and
+accept `none`, `highways`, `major`, `streets`, or `all`: `highways` includes motorway and trunk
+labels, `major` adds primary through tertiary, `streets` adds minor streets, and `all` adds service
+roads and tracks. Path labels are eligible at `all` only when path geometry is visible; when
+`roads()` is present, enable it with `roads({extras: {paths: true}})`.
+
+Detail values select which feature classes may be labeled; they do not force every name onto the
+map. Labels keep the template's natural zoom ranges and MapLibre collision handling. Road labels
+are also clamped to the classes currently visible through `roads({detail})`, so the effective result
+is the intersection of both modules. `language` accepts `auto`, `local`, or a language code such as
+`en` or `es`.
+
+Without options, `labels()` uses `language: 'auto'` and `major` for all three label families.
+Label colors remain in `theme.modules.labels`; font family and weight remain in `typography`.
 
 ## Public API
 

package/dist/index.d.ts

@@ -4,7 +4,8 @@ type TileflowDensity = 'clean' | 'balanced' | 'dense';
 type TileflowRoads = 'hidden' | 'soft' | 'standard' | 'detailed';
 type TileflowLabels = 'none' | 'essential' | 'balanced' | 'full';
 type TileflowPoi = 'none' | 'minimal' | 'balanced' | 'full';
-type TileflowLabelDensity = 'none' | 'minimal' | 'balanced' | 'detailed';
+type TileflowLabelDetail = 'none' | 'major' | 'all';
+type TileflowRoadLabelDetail = TileflowRoadDetail;
 type TileflowLabelLanguage = 'auto' | 'local' | 'en' | (string & {});
 type TileflowPoiCategory = 'food' | 'coffee' | 'culture' | 'transit' | 'shopping' | 'lodging' | 'health' | 'education' | 'services' | (string & {});
 type TileflowPoiIcons = boolean | 'essential' | 'full';
@@ -151,7 +152,10 @@ type TileflowSourceLayers = {
     landuse?: string;
     park?: string;
     water?: string;
+    waterName?: string;
+    waterway?: string;
     road?: string;
+    roadName?: string;
     building?: string;
     boundary?: string;
     place?: string;
@@ -212,10 +216,9 @@ type TileflowRoadsModuleOptions = Omit<TileflowRoadsModuleConfig, 'type'>;
 type TileflowLabelsModuleConfig = {
     type: 'labels';
     language?: TileflowLabelLanguage;
-    places?: TileflowLabelDensity;
-    preset?: TileflowLabels;
-    roads?: TileflowLabelDensity;
-    water?: TileflowLabelDensity;
+    places?: TileflowLabelDetail;
+    roads?: TileflowRoadLabelDetail;
+    water?: TileflowLabelDetail;
 };
 type TileflowLabelsModuleOptions = Omit<TileflowLabelsModuleConfig, 'type'>;
 type TileflowPoiModuleConfig = {
@@ -543,7 +546,10 @@ declare const tileflowMapSchema: z.ZodObject<{
             landuse: z.ZodOptional<z.ZodString>;
             park: z.ZodOptional<z.ZodString>;
             water: z.ZodOptional<z.ZodString>;
+            waterName: z.ZodOptional<z.ZodString>;
+            waterway: z.ZodOptional<z.ZodString>;
             road: z.ZodOptional<z.ZodString>;
+            roadName: z.ZodOptional<z.ZodString>;
             building: z.ZodOptional<z.ZodString>;
             boundary: z.ZodOptional<z.ZodString>;
             place: z.ZodOptional<z.ZodString>;
@@ -752,28 +758,21 @@ declare const tileflowMapSchema: z.ZodObject<{
         type: z.ZodLiteral<"labels">;
         language: z.ZodOptional<z.ZodString>;
         places: z.ZodOptional<z.ZodEnum<{
-            balanced: "balanced";
-            none: "none";
-            minimal: "minimal";
-            detailed: "detailed";
-        }>>;
-        preset: z.ZodOptional<z.ZodEnum<{
-            balanced: "balanced";
             none: "none";
-            essential: "essential";
-            full: "full";
+            major: "major";
+            all: "all";
         }>>;
         roads: z.ZodOptional<z.ZodEnum<{
-            balanced: "balanced";
             none: "none";
-            minimal: "minimal";
-            detailed: "detailed";
+            major: "major";
+            highways: "highways";
+            streets: "streets";
+            all: "all";
         }>>;
         water: z.ZodOptional<z.ZodEnum<{
-            balanced: "balanced";
             none: "none";
-            minimal: "minimal";
-            detailed: "detailed";
+            major: "major";
+            all: "all";
         }>>;
     }, z.core.$strict>, z.ZodObject<{
         type: z.ZodLiteral<"poi">;
@@ -1015,7 +1014,10 @@ declare const tileflowMapSchema: z.ZodObject<{
             landuse: z.ZodOptional<z.ZodString>;
             park: z.ZodOptional<z.ZodString>;
             water: z.ZodOptional<z.ZodString>;
+            waterName: z.ZodOptional<z.ZodString>;
+            waterway: z.ZodOptional<z.ZodString>;
             road: z.ZodOptional<z.ZodString>;
+            roadName: z.ZodOptional<z.ZodString>;
             building: z.ZodOptional<z.ZodString>;
             boundary: z.ZodOptional<z.ZodString>;
             place: z.ZodOptional<z.ZodString>;
@@ -1039,7 +1041,10 @@ declare const configSchema: z.ZodObject<{
             landuse: z.ZodOptional<z.ZodString>;
             park: z.ZodOptional<z.ZodString>;
             water: z.ZodOptional<z.ZodString>;
+            waterName: z.ZodOptional<z.ZodString>;
+            waterway: z.ZodOptional<z.ZodString>;
             road: z.ZodOptional<z.ZodString>;
+            roadName: z.ZodOptional<z.ZodString>;
             building: z.ZodOptional<z.ZodString>;
             boundary: z.ZodOptional<z.ZodString>;
             place: z.ZodOptional<z.ZodString>;
@@ -1248,28 +1253,21 @@ declare const configSchema: z.ZodObject<{
         type: z.ZodLiteral<"labels">;
         language: z.ZodOptional<z.ZodString>;
         places: z.ZodOptional<z.ZodEnum<{
-            balanced: "balanced";
             none: "none";
-            minimal: "minimal";
-            detailed: "detailed";
-        }>>;
-        preset: z.ZodOptional<z.ZodEnum<{
-            balanced: "balanced";
-            none: "none";
-            essential: "essential";
-            full: "full";
+            major: "major";
+            all: "all";
         }>>;
         roads: z.ZodOptional<z.ZodEnum<{
-            balanced: "balanced";
             none: "none";
-            minimal: "minimal";
-            detailed: "detailed";
+            major: "major";
+            highways: "highways";
+            streets: "streets";
+            all: "all";
         }>>;
         water: z.ZodOptional<z.ZodEnum<{
-            balanced: "balanced";
             none: "none";
-            minimal: "minimal";
-            detailed: "detailed";
+            major: "major";
+            all: "all";
         }>>;
     }, z.core.$strict>, z.ZodObject<{
         type: z.ZodLiteral<"poi">;
@@ -1511,7 +1509,10 @@ declare const configSchema: z.ZodObject<{
             landuse: z.ZodOptional<z.ZodString>;
             park: z.ZodOptional<z.ZodString>;
             water: z.ZodOptional<z.ZodString>;
+            waterName: z.ZodOptional<z.ZodString>;
+            waterway: z.ZodOptional<z.ZodString>;
             road: z.ZodOptional<z.ZodString>;
+            roadName: z.ZodOptional<z.ZodString>;
             building: z.ZodOptional<z.ZodString>;
             boundary: z.ZodOptional<z.ZodString>;
             place: z.ZodOptional<z.ZodString>;
@@ -1728,7 +1729,10 @@ declare const tileflowProjectSchema: z.ZodObject<{
             landuse: z.ZodOptional<z.ZodString>;
             park: z.ZodOptional<z.ZodString>;
             water: z.ZodOptional<z.ZodString>;
+            waterName: z.ZodOptional<z.ZodString>;
+            waterway: z.ZodOptional<z.ZodString>;
             road: z.ZodOptional<z.ZodString>;
+            roadName: z.ZodOptional<z.ZodString>;
             building: z.ZodOptional<z.ZodString>;
             boundary: z.ZodOptional<z.ZodString>;
             place: z.ZodOptional<z.ZodString>;
@@ -1745,7 +1749,10 @@ declare const tileflowProjectSchema: z.ZodObject<{
                 landuse: z.ZodOptional<z.ZodString>;
                 park: z.ZodOptional<z.ZodString>;
                 water: z.ZodOptional<z.ZodString>;
+                waterName: z.ZodOptional<z.ZodString>;
+                waterway: z.ZodOptional<z.ZodString>;
                 road: z.ZodOptional<z.ZodString>;
+                roadName: z.ZodOptional<z.ZodString>;
                 building: z.ZodOptional<z.ZodString>;
                 boundary: z.ZodOptional<z.ZodString>;
                 place: z.ZodOptional<z.ZodString>;
@@ -1954,28 +1961,21 @@ declare const tileflowProjectSchema: z.ZodObject<{
             type: z.ZodLiteral<"labels">;
             language: z.ZodOptional<z.ZodString>;
             places: z.ZodOptional<z.ZodEnum<{
-                balanced: "balanced";
-                none: "none";
-                minimal: "minimal";
-                detailed: "detailed";
-            }>>;
-            preset: z.ZodOptional<z.ZodEnum<{
-                balanced: "balanced";
                 none: "none";
-                essential: "essential";
-                full: "full";
+                major: "major";
+                all: "all";
             }>>;
             roads: z.ZodOptional<z.ZodEnum<{
-                balanced: "balanced";
                 none: "none";
-                minimal: "minimal";
-                detailed: "detailed";
+                major: "major";
+                highways: "highways";
+                streets: "streets";
+                all: "all";
             }>>;
             water: z.ZodOptional<z.ZodEnum<{
-                balanced: "balanced";
                 none: "none";
-                minimal: "minimal";
-                detailed: "detailed";
+                major: "major";
+                all: "all";
             }>>;
         }, z.core.$strict>, z.ZodObject<{
             type: z.ZodLiteral<"poi">;
@@ -2217,7 +2217,10 @@ declare const tileflowProjectSchema: z.ZodObject<{
                 landuse: z.ZodOptional<z.ZodString>;
                 park: z.ZodOptional<z.ZodString>;
                 water: z.ZodOptional<z.ZodString>;
+                waterName: z.ZodOptional<z.ZodString>;
+                waterway: z.ZodOptional<z.ZodString>;
                 road: z.ZodOptional<z.ZodString>;
+                roadName: z.ZodOptional<z.ZodString>;
                 building: z.ZodOptional<z.ZodString>;
                 boundary: z.ZodOptional<z.ZodString>;
                 place: z.ZodOptional<z.ZodString>;
@@ -2241,12 +2244,12 @@ declare function defineTileflow<const TConfig extends TileflowProjectConfig>(con
 
 declare function osm(options?: TileflowOsmBasemapOptions): TileflowOsmBasemapConfig;
 
+declare function roads(options?: TileflowRoadsModuleOptions): TileflowRoadsModuleConfig;
+
 declare function labels(options?: TileflowLabelsModuleOptions): TileflowLabelsModuleConfig;
 
 declare function poi(options?: TileflowPoiModuleOptions): TileflowPoiModuleConfig;
 
-declare function roads(options?: TileflowRoadsModuleOptions): TileflowRoadsModuleConfig;
-
 declare function styleOverride(options?: TileflowStyleOverrideOptions): TileflowStyleOverrideModuleConfig;
 
 declare const defaultTileflowManifestUrl = "/tileflow/manifest.json";
@@ -2357,4 +2360,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 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 };
+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 TileflowLabelDetail, 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 TileflowRoadLabelDetail, 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

@@ -512,245 +512,6 @@ function rgbToHex(r, g, b) {
   return `#${[r, g, b].map((value) => value.toString(16).padStart(2, "0")).join("")}`;
 }
 
-// src/modules/labels/index.ts
-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);
-  return {
-    language: moduleConfig?.language ?? "auto",
-    mode,
-    places: moduleConfig?.places ?? density,
-    roads: moduleConfig?.roads ?? density,
-    water: moduleConfig?.water ?? density
-  };
-}
-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;
-  return [
-    {
-      id: "place-labels",
-      type: "symbol",
-      source,
-      "source-layer": sourceLayer,
-      minzoom: 3,
-      filter: ["<=", ["coalesce", ["get", "rank"], 10], maxRank],
-      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.labels.primary,
-        "text-halo-color": colors.labels.halo,
-        "text-halo-width": 1.2
-      }
-    }
-  ];
-}
-function labelDensityFromMode(mode) {
-  if (mode === "none") return "none";
-  if (mode === "essential") return "minimal";
-  if (mode === "full") return "detailed";
-  return "balanced";
-}
-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"]];
-}
-
-// 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 (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];
-  }
-  return [
-    {
-      id: "poi-labels",
-      type: "symbol",
-      source,
-      "source-layer": sourceLayer,
-      minzoom: poiConfig.minZoom,
-      ...poiConfig.categories ? { filter: poiCategoryFilter(poiConfig.categories) } : {},
-      layout,
-      paint: {
-        "text-color": colors.poi.label,
-        "text-halo-color": colors.poi.halo ?? alpha(colors.background, 0.78),
-        "text-halo-width": 1
-      }
-    }
-  ];
-}
-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)
-    );
-  }
-  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]];
-  }
-  return [
-    "coalesce",
-    ["image", `${customIconSpriteId2}:${customIconName}`],
-    ["image", osmBrightIcon]
-  ];
-}
-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/modules/roads/index.ts
 var moduleRoadDefaults = {
   detail: "streets",
@@ -764,6 +525,18 @@ var arterialRoadClasses = ["primary", "secondary", "tertiary"];
 var majorRoadClasses = [...highwayRoadClasses, ...arterialRoadClasses];
 var streetRoadClasses = ["minor"];
 var serviceRoadClasses = ["service", "track"];
+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: "roads",
@@ -835,14 +608,10 @@ function roadLayers(source, sourceLayer, colors, options) {
     return [];
   }
   const metrics = roadStyleMetrics(options);
-  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 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"] : [],
@@ -1083,104 +852,521 @@ function roadLayers(source, sourceLayer, colors, options) {
   );
   return layers;
 }
-function roadDefaultsFromLegacyMode(mode) {
-  if (mode === "hidden") {
-    return {
-      detail: "none",
-      extras: { ferry: false, paths: false, rail: false },
-      hierarchy: "clear",
-      outline: "subtle",
-      weight: "regular"
-    };
+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 classFilter(classes) {
+  return ["match", ["get", "class"], classes, true, false];
+}
+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/labels/index.ts
+var moduleLabelDefaults = {
+  language: "auto",
+  places: "major",
+  roads: "major",
+  water: "major"
+};
+var majorPlaceClasses = ["continent", "country", "state", "city", "town"];
+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.roads ? { roads: options.roads } : {},
+    ...options.water ? { water: options.water } : {}
+  };
+}
+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 {
+    ...resolved,
+    mode: moduleConfig ? legacyModeFromResolvedLabels(resolved) : fallbackMode
+  };
+}
+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: 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.labels.primary,
+        "text-halo-color": colors.labels.halo,
+        "text-halo-width": 1.2
+      }
+    }
+  ];
+}
+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
+      });
+    }
+  }
+  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 layers;
+}
+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
+  };
+  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 = [
+    ...roadClassesForDetail(roadsConfig.detail),
+    ...roadsConfig.extras.paths ? ["path"] : []
+  ];
+  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" };
+  }
+  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 (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";
+}
+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 (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 {
-    detail: "streets",
-    extras: { ferry: true, paths: true, rail: true },
-    hierarchy: "clear",
-    outline: "subtle",
-    weight: "regular"
+    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 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 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 roadOpacityExpression(majorOpacity, minorOpacity) {
+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];
+  }
   return [
-    "case",
-    classFilter(majorRoadClasses),
-    majorOpacity,
-    classFilter(streetRoadClasses),
-    ["step", ["zoom"], 0, 12, minorOpacity],
-    classFilter(serviceRoadClasses),
-    ["step", ["zoom"], 0, 14, minorOpacity],
-    minorOpacity
+    {
+      id: "poi-labels",
+      type: "symbol",
+      source,
+      "source-layer": sourceLayer,
+      minzoom: poiConfig.minZoom,
+      ...poiConfig.categories ? { filter: poiCategoryFilter(poiConfig.categories) } : {},
+      layout,
+      paint: {
+        "text-color": colors.poi.label,
+        "text-halo-color": colors.poi.halo ?? alpha(colors.background, 0.78),
+        "text-halo-width": 1
+      }
+    }
   ];
 }
-function roadWidthExpression(stops, metrics) {
-  return [
-    "case",
-    classFilter(majorRoadClasses),
-    zoomWidth(stops, metrics.weightScale * metrics.majorWidthScale),
-    zoomWidth(stops, metrics.weightScale * metrics.minorWidthScale)
-  ];
+function poiLabelsFromMode(mode) {
+  if (mode === "none") return "none";
+  if (mode === "minimal") return "minimal";
+  if (mode === "full") return "full";
+  return "balanced";
 }
-function zoomWidth(stops, scale) {
-  return [
-    "interpolate",
-    ["linear"],
-    ["zoom"],
-    ...stops.flatMap(([zoom, width]) => [zoom, width * scale])
-  ];
+function poiCategoryFilter(categories) {
+  return ["in", "class", ...categories.flatMap((category) => poiCategoryClasses(category))];
 }
-function roadClassColorExpression(colors) {
+function poiIconImageExpression(customIconSpriteId2, customIconMapping = {}) {
+  const matchParts = [];
+  for (const [className, iconName] of Object.entries(poiClassIconNames)) {
+    matchParts.push(
+      className,
+      poiIconImageFallback(iconName, customIconSpriteId2, customIconMapping)
+    );
+  }
   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
+    ...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]];
+  }
+  return [
+    "coalesce",
+    ["image", `${customIconSpriteId2}:${customIconName}`],
+    ["image", osmBrightIcon]
   ];
 }
+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) {
@@ -1204,7 +1390,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,
@@ -1568,7 +1754,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(),
@@ -1584,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(),
@@ -1596,14 +1786,13 @@ var roadsModuleSchema = z.object({
   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: roadDetailSchema.optional(),
+  water: labelDetailSchema.optional()
 }).strict();
 var poiModuleSchema = z.object({
   type: z.literal("poi"),
@@ -1956,7 +2145,7 @@ function applyOsmBrightControls(layers, options) {
       );
     }
     if (isLabelLayer(id, sourceLayer)) {
-      return applyLabelLayerControls(layer, options.labels);
+      return applyLabelLayerControls(layer, options.labels, options.roads);
     }
     return layer;
   });
@@ -2043,12 +2232,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");
@@ -2056,13 +2245,18 @@ 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") {
+    const allowedClasses = (roads2 ? visibleRoadLabelClasses(detail, roads2) : roadLabelClasses(detail)).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;
@@ -2092,7 +2286,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;
@@ -2106,10 +2300,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");
@@ -5041,7 +5240,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",
@@ -5105,8 +5307,9 @@ function createStyle(input = {}, options = {}) {
     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);
@@ -5139,7 +5342,7 @@ function createStyle(input = {}, options = {}) {
     "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 ? {
@@ -5177,7 +5380,6 @@ function createStyle(input = {}, options = {}) {
       theme,
       tilesUrl,
       typography,
-      labels: labels2,
       labelsModule: resolvedLabels,
       poi: poi2,
       poiModule: resolvedPoi,

package/package.json

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