@tileflow/core 0.1.0-alpha.6 → 0.1.0-alpha.8

package/dist/index.js

@@ -1,130 +1,13 @@
 // src/basemaps/osm.ts
+var defaultOsmBrightSprite = "https://openmaptiles.github.io/osm-bright-gl-style/sprite";
 function osm(options = {}) {
   return {
     type: "osm",
+    sprite: defaultOsmBrightSprite,
     ...options
   };
 }
 
-// src/modules/roads/index.ts
-function roads(options = {}) {
-  return {
-    type: "roads",
-    preset: options.preset ?? "modern",
-    ...options.density ? { density: options.density } : {}
-  };
-}
-function resolveRoads(legacyRoads, moduleConfig, fallback) {
-  if (!moduleConfig) {
-    return legacyRoads ?? fallback;
-  }
-  if (moduleConfig.preset === "minimal" || moduleConfig.density === "clean") {
-    return "soft";
-  }
-  if (moduleConfig.density === "dense") {
-    return "detailed";
-  }
-  return "standard";
-}
-function roadLayers(source, sourceLayer, colors, roadsMode) {
-  if (roadsMode === "hidden") {
-    return [];
-  }
-  const opacity = roadsMode === "soft" ? 0.72 : roadsMode === "standard" ? 0.84 : 0.96;
-  const casingOpacity = roadsMode === "detailed" ? 0.3 : 0.16;
-  const majorRoadFilter = [
-    "match",
-    ["get", "class"],
-    ["motorway", "trunk", "primary", "secondary"],
-    true,
-    false
-  ];
-  const minorRoadFilter = ["!", majorRoadFilter];
-  const nonTunnelRoadFilter = ["!=", ["get", "brunnel"], "tunnel"];
-  return [
-    {
-      id: "roads-tunnels-casing",
-      type: "line",
-      source,
-      "source-layer": sourceLayer,
-      minzoom: 10,
-      filter: ["==", ["get", "brunnel"], "tunnel"],
-      paint: {
-        "line-color": colors.roads.tunnel,
-        "line-dasharray": [0.6, 0.8],
-        "line-opacity": 0.28,
-        "line-width": ["interpolate", ["linear"], ["zoom"], 10, 0.5, 14, 1.7, 16, 3.8]
-      }
-    },
-    {
-      id: "roads-tunnels",
-      type: "line",
-      source,
-      "source-layer": sourceLayer,
-      minzoom: 10,
-      filter: ["==", ["get", "brunnel"], "tunnel"],
-      paint: {
-        "line-color": colors.roads.minor,
-        "line-dasharray": [0.6, 0.8],
-        "line-opacity": 0.2,
-        "line-width": ["interpolate", ["linear"], ["zoom"], 10, 0.25, 14, 1, 16, 2.4]
-      }
-    },
-    {
-      id: "roads-casing",
-      type: "line",
-      source,
-      "source-layer": sourceLayer,
-      minzoom: 6,
-      filter: nonTunnelRoadFilter,
-      paint: {
-        "line-color": colors.roads.casing,
-        "line-opacity": casingOpacity,
-        "line-width": ["interpolate", ["linear"], ["zoom"], 6, 0.4, 12, 1.2, 16, 4]
-      }
-    },
-    {
-      id: "roads-minor",
-      type: "line",
-      source,
-      "source-layer": sourceLayer,
-      minzoom: 6,
-      filter: ["all", nonTunnelRoadFilter, minorRoadFilter],
-      paint: {
-        "line-color": colors.roads.minor,
-        "line-opacity": opacity * 0.88,
-        "line-width": ["interpolate", ["linear"], ["zoom"], 6, 0.2, 12, 0.8, 16, 3]
-      }
-    },
-    {
-      id: "roads-major",
-      type: "line",
-      source,
-      "source-layer": sourceLayer,
-      minzoom: 5,
-      filter: ["all", nonTunnelRoadFilter, majorRoadFilter],
-      paint: {
-        "line-color": colors.roads.primary,
-        "line-opacity": opacity,
-        "line-width": ["interpolate", ["linear"], ["zoom"], 5, 0.35, 12, 1.2, 16, 4]
-      }
-    },
-    {
-      id: "roads-bridges",
-      type: "line",
-      source,
-      "source-layer": sourceLayer,
-      minzoom: 10,
-      filter: ["==", ["get", "brunnel"], "bridge"],
-      paint: {
-        "line-color": colors.roads.bridge,
-        "line-opacity": opacity,
-        "line-width": ["interpolate", ["linear"], ["zoom"], 10, 0.45, 14, 1.6, 16, 4.4]
-      }
-    }
-  ];
-}
-
 // src/themes/index.ts
 var defaultColors = {
   background: "#F6F7F3",
@@ -266,7 +149,8 @@ function resolveColors(overrides = {}, defaults = defaultColors, moduleOverrides
   const defaultModules = mergeThemeModules(extractLegacyModuleColors(defaults), moduleDefaults);
   const overrideModules = mergeThemeModules(extractLegacyModuleColors(overrides), moduleOverrides);
   const base = resolveBaseColors(overrideInput, defaultInput);
-  const roadCasing = overrideModules.roads?.casing ?? defaultModules.roads?.casing ?? overrideInput.roadCasing ?? defaultInput.roadCasing ?? mix(base.road, base.text, 0.2);
+  const baseRoadCasing = overrideInput.roadCasing ?? defaultInput.roadCasing ?? mix(base.road, base.text, 0.2);
+  const roadCasing = overrideModules.roads?.casing ?? defaultModules.roads?.casing ?? baseRoadCasing;
   const baseResolved = {
     ...base,
     canvas: base.background,
@@ -286,18 +170,33 @@ function resolveColors(overrides = {}, defaults = defaultColors, moduleOverrides
     rail: base.textMuted,
     secondary: base.roadMajor,
     trunk: base.roadMajor,
-    tunnel: mix(roadCasing, base.background, 0.35)
+    tunnel: mix(baseRoadCasing, base.background, 0.35)
   };
   const labelDefaults = {
     country: base.text,
     halo: base.textHalo,
     muted: base.textMuted,
+    neighborhood: base.textMuted,
     poi: base.textMuted,
     primary: base.text,
     road: base.textMuted,
     settlement: base.text,
     water: mix(base.water, base.text, 0.42)
   };
+  const poiDefaults = {
+    coffee: mix(base.textMuted, base.roadMajor, 0.24),
+    culture: mix(base.textMuted, base.text, 0.18),
+    education: mix(base.textMuted, base.water, 0.18),
+    food: mix(base.textMuted, base.roadMajor, 0.34),
+    halo: labelDefaults.halo,
+    health: mix(base.textMuted, "#D45E5E", 0.22),
+    icon: labelDefaults.poi,
+    label: labelDefaults.poi,
+    lodging: mix(base.textMuted, base.water, 0.24),
+    services: labelDefaults.poi,
+    shopping: mix(base.textMuted, base.park, 0.2),
+    transit: labelDefaults.road
+  };
   const landuseDefaults = {
     cemetery: mix(base.park, base.land, 0.35),
     civic: mix(base.land, base.textMuted, 0.08),
@@ -348,6 +247,7 @@ function resolveColors(overrides = {}, defaults = defaultColors, moduleOverrides
     landuse: mapColorRecord(
       resolveGroup(landuseDefaults, defaultModules.landuse, overrideModules.landuse)
     ),
+    poi: mapColorRecord(resolveGroup(poiDefaults, defaultModules.poi, overrideModules.poi)),
     roads: mapColorRecord(resolveGroup(roadDefaults, defaultModules.roads, overrideModules.roads))
   };
 }
@@ -501,6 +401,7 @@ function stripLegacyModuleColors(colors) {
     labels: _labels,
     landcover: _landcover,
     landuse: _landuse,
+    poi: _poi,
     roads: _roads,
     ...baseColors
   } = colors;
@@ -517,6 +418,7 @@ function extractLegacyModuleColors(colors) {
     ...colors.labels ? { labels: colors.labels } : {},
     ...colors.landcover ? { landcover: colors.landcover } : {},
     ...colors.landuse ? { landuse: colors.landuse } : {},
+    ...colors.poi ? { poi: colors.poi } : {},
     ...colors.roads ? { roads: colors.roads } : {}
   };
 }
@@ -528,6 +430,7 @@ function mergeThemeModules(defaults = {}, overrides = {}) {
     ...mergeThemeModuleGroup("labels", defaults, overrides),
     ...mergeThemeModuleGroup("landcover", defaults, overrides),
     ...mergeThemeModuleGroup("landuse", defaults, overrides),
+    ...mergeThemeModuleGroup("poi", defaults, overrides),
     ...mergeThemeModuleGroup("roads", defaults, overrides)
   };
 }
@@ -611,6 +514,437 @@ 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
+function roads(options = {}) {
+  return {
+    type: "roads",
+    preset: options.preset ?? "modern",
+    ...options.density ? { density: options.density } : {}
+  };
+}
+function resolveRoads(legacyRoads, moduleConfig, fallback) {
+  if (!moduleConfig) {
+    return legacyRoads ?? fallback;
+  }
+  if (moduleConfig.preset === "minimal" || moduleConfig.density === "clean") {
+    return "soft";
+  }
+  if (moduleConfig.density === "dense") {
+    return "detailed";
+  }
+  return "standard";
+}
+function roadLayers(source, sourceLayer, colors, roadsMode) {
+  if (roadsMode === "hidden") {
+    return [];
+  }
+  const opacity = roadsMode === "soft" ? 0.72 : roadsMode === "standard" ? 0.84 : 0.96;
+  const casingOpacity = roadsMode === "detailed" ? 0.3 : 0.16;
+  const majorRoadFilter = classFilter(["motorway", "trunk", "primary", "secondary"]);
+  const ferryFilter = classFilter(["ferry"]);
+  const pathFilter = classFilter(["path", "track"]);
+  const railFilter = classFilter(["rail", "transit"]);
+  const minorRoadFilter = [
+    "all",
+    ["!", majorRoadFilter],
+    ["!", ferryFilter],
+    ["!", pathFilter],
+    ["!", railFilter]
+  ];
+  const nonTunnelRoadFilter = ["!=", ["get", "brunnel"], "tunnel"];
+  const roadClassColor = roadClassColorExpression(colors);
+  return [
+    {
+      id: "roads-tunnels-casing",
+      type: "line",
+      source,
+      "source-layer": sourceLayer,
+      minzoom: 10,
+      filter: ["==", ["get", "brunnel"], "tunnel"],
+      paint: {
+        "line-color": colors.roads.tunnel,
+        "line-dasharray": [0.6, 0.8],
+        "line-opacity": 0.28,
+        "line-width": ["interpolate", ["linear"], ["zoom"], 10, 0.5, 14, 1.7, 16, 3.8]
+      }
+    },
+    {
+      id: "roads-tunnels",
+      type: "line",
+      source,
+      "source-layer": sourceLayer,
+      minzoom: 10,
+      filter: ["==", ["get", "brunnel"], "tunnel"],
+      paint: {
+        "line-color": roadClassColor,
+        "line-dasharray": [0.6, 0.8],
+        "line-opacity": 0.2,
+        "line-width": ["interpolate", ["linear"], ["zoom"], 10, 0.25, 14, 1, 16, 2.4]
+      }
+    },
+    {
+      id: "roads-casing",
+      type: "line",
+      source,
+      "source-layer": sourceLayer,
+      minzoom: 6,
+      filter: nonTunnelRoadFilter,
+      paint: {
+        "line-color": colors.roads.casing,
+        "line-opacity": casingOpacity,
+        "line-width": ["interpolate", ["linear"], ["zoom"], 6, 0.4, 12, 1.2, 16, 4]
+      }
+    },
+    {
+      id: "roads-ferry",
+      type: "line",
+      source,
+      "source-layer": sourceLayer,
+      minzoom: 5,
+      filter: ["all", nonTunnelRoadFilter, ferryFilter],
+      paint: {
+        "line-color": colors.roads.ferry,
+        "line-dasharray": [1.2, 1.1],
+        "line-opacity": opacity * 0.8,
+        "line-width": ["interpolate", ["linear"], ["zoom"], 5, 0.25, 12, 0.8, 16, 2.6]
+      }
+    },
+    {
+      id: "roads-paths",
+      type: "line",
+      source,
+      "source-layer": sourceLayer,
+      minzoom: 10,
+      filter: ["all", nonTunnelRoadFilter, pathFilter],
+      paint: {
+        "line-color": colors.roads.path,
+        "line-dasharray": [0.7, 0.7],
+        "line-opacity": opacity * 0.68,
+        "line-width": ["interpolate", ["linear"], ["zoom"], 10, 0.25, 14, 0.8, 16, 2.2]
+      }
+    },
+    {
+      id: "roads-rail",
+      type: "line",
+      source,
+      "source-layer": sourceLayer,
+      minzoom: 7,
+      filter: ["all", nonTunnelRoadFilter, railFilter],
+      paint: {
+        "line-color": colors.roads.rail,
+        "line-opacity": opacity * 0.58,
+        "line-width": ["interpolate", ["linear"], ["zoom"], 7, 0.35, 12, 0.9, 16, 2.4]
+      }
+    },
+    {
+      id: "roads-minor",
+      type: "line",
+      source,
+      "source-layer": sourceLayer,
+      minzoom: 6,
+      filter: ["all", nonTunnelRoadFilter, minorRoadFilter],
+      paint: {
+        "line-color": colors.roads.minor,
+        "line-opacity": opacity * 0.88,
+        "line-width": ["interpolate", ["linear"], ["zoom"], 6, 0.2, 12, 0.8, 16, 3]
+      }
+    },
+    {
+      id: "roads-major",
+      type: "line",
+      source,
+      "source-layer": sourceLayer,
+      minzoom: 5,
+      filter: ["all", nonTunnelRoadFilter, majorRoadFilter],
+      paint: {
+        "line-color": roadClassColor,
+        "line-opacity": opacity,
+        "line-width": ["interpolate", ["linear"], ["zoom"], 5, 0.35, 12, 1.2, 16, 4]
+      }
+    },
+    {
+      id: "roads-bridges",
+      type: "line",
+      source,
+      "source-layer": sourceLayer,
+      minzoom: 10,
+      filter: ["==", ["get", "brunnel"], "bridge"],
+      paint: {
+        "line-color": colors.roads.bridge,
+        "line-opacity": opacity,
+        "line-width": ["interpolate", ["linear"], ["zoom"], 10, 0.45, 14, 1.6, 16, 4.4]
+      }
+    }
+  ];
+}
+function classFilter(classes) {
+  return ["match", ["get", "class"], classes, true, false];
+}
+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/basemaps/osm/layers.ts
 function openMapTilesLayers(source, sourceLayers, colors, options) {
   return [
@@ -622,13 +956,27 @@ function openMapTilesLayers(source, sourceLayers, colors, options) {
       }
     },
     fillLayer("landuse", source, sourceLayers.landuse, colors.landuse.residential, 0.42),
-    fillLayer("parks", source, sourceLayers.park, colors.landcover.park, parkOpacity(options.density)),
+    fillLayer(
+      "parks",
+      source,
+      sourceLayers.park,
+      colors.landcover.park,
+      parkOpacity(options.density)
+    ),
     fillLayer("water", source, sourceLayers.water, colors.hydro.water, 1),
     ...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),
-    ...poiLayers(source, sourceLayers.poi, colors, options.poi, options.typography)
+    ...poiLayers(
+      source,
+      sourceLayers.poi,
+      colors,
+      options.poi,
+      options.typography,
+      options.customIconSpriteId,
+      options.customIconMapping
+    )
   ];
 }
 function fillLayer(id, source, sourceLayer, color, opacity) {
@@ -719,82 +1067,27 @@ function buildingLayers(source, sourceLayer, colors, density, buildings) {
       type: "line",
       source,
       "source-layer": sourceLayer,
-      minzoom: 15,
-      paint: {
-        "line-color": colors.buildings.outline,
-        "line-opacity": 0.24,
-        "line-width": 0.6
-      }
-    }
-  ];
-}
-function boundaryLayers(source, sourceLayer, colors) {
-  return [
-    {
-      id: "boundaries",
-      type: "line",
-      source,
-      "source-layer": sourceLayer,
-      minzoom: 2,
-      paint: {
-        "line-color": colors.boundaries.admin,
-        "line-opacity": 0.35,
-        "line-width": ["interpolate", ["linear"], ["zoom"], 2, 0.35, 8, 0.8]
-      }
-    }
-  ];
-}
-function labelLayers(source, sourceLayer, colors, labels, typography) {
-  if (labels === "none") {
-    return [];
-  }
-  const maxRank = labels === "essential" ? 3 : labels === "balanced" ? 7 : 12;
-  return [
-    {
-      id: "place-labels",
-      type: "symbol",
-      source,
-      "source-layer": sourceLayer,
-      minzoom: 3,
-      filter: ["<=", ["coalesce", ["get", "rank"], 10], maxRank],
-      layout: {
-        "text-field": ["coalesce", ["get", "name:en"], ["get", "name"]],
-        "text-font": textFont(typography),
-        "text-size": ["interpolate", ["linear"], ["zoom"], 3, 10, 8, 13, 14, 17],
-        "text-letter-spacing": 0,
-        "text-padding": 4
-      },
+      minzoom: 15,
       paint: {
-        "text-color": colors.labels.primary,
-        "text-halo-color": colors.labels.halo,
-        "text-halo-width": 1.2
+        "line-color": colors.buildings.outline,
+        "line-opacity": 0.24,
+        "line-width": 0.6
       }
     }
   ];
 }
-function poiLayers(source, sourceLayer, colors, poi, typography) {
-  if (poi === "none") {
-    return [];
-  }
-  const minzoom = poi === "minimal" ? 15 : poi === "balanced" ? 13 : 11;
+function boundaryLayers(source, sourceLayer, colors) {
   return [
     {
-      id: "poi-labels",
-      type: "symbol",
+      id: "boundaries",
+      type: "line",
       source,
       "source-layer": sourceLayer,
-      minzoom,
-      layout: {
-        "text-field": ["coalesce", ["get", "name:en"], ["get", "name"]],
-        "text-font": textFont(typography),
-        "text-size": ["interpolate", ["linear"], ["zoom"], minzoom, 10, 17, 12],
-        "text-letter-spacing": 0,
-        "text-padding": 2
-      },
+      minzoom: 2,
       paint: {
-        "text-color": colors.labels.poi,
-        "text-halo-color": alpha(colors.background, 0.78),
-        "text-halo-width": 1
+        "line-color": colors.boundaries.admin,
+        "line-opacity": 0.35,
+        "line-width": ["interpolate", ["linear"], ["zoom"], 2, 0.35, 8, 0.8]
       }
     }
   ];
@@ -880,7 +1173,10 @@ var hexColorSchema = z.string().regex(/^#(?:[0-9a-fA-F]{3}|[0-9a-fA-F]{4}|[0-9a-
   message: "Expected a hex color like #F6F7F3 or #F6F7F3FF"
 });
 function colorGroupSchema(keys) {
-  return z.object(Object.fromEntries(keys.map((key) => [key, hexColorSchema.optional()]))).strict();
+  const shape = Object.fromEntries(
+    keys.map((key) => [key, hexColorSchema.optional()])
+  );
+  return z.object(shape).strict();
 }
 var colorConfigSchema = z.object({
   accent: hexColorSchema.optional(),
@@ -906,6 +1202,7 @@ var colorConfigSchema = z.object({
     "country",
     "halo",
     "muted",
+    "neighborhood",
     "poi",
     "primary",
     "road",
@@ -920,6 +1217,20 @@ var colorConfigSchema = z.object({
     "industrial",
     "residential"
   ]).optional(),
+  poi: colorGroupSchema([
+    "coffee",
+    "culture",
+    "education",
+    "food",
+    "halo",
+    "health",
+    "icon",
+    "label",
+    "lodging",
+    "services",
+    "shopping",
+    "transit"
+  ]).optional(),
   roads: colorGroupSchema([
     "bridge",
     "casing",
@@ -942,6 +1253,7 @@ var themeModulesSchema = z.object({
     "country",
     "halo",
     "muted",
+    "neighborhood",
     "poi",
     "primary",
     "road",
@@ -956,6 +1268,20 @@ var themeModulesSchema = z.object({
     "industrial",
     "residential"
   ]).optional(),
+  poi: colorGroupSchema([
+    "coffee",
+    "culture",
+    "education",
+    "food",
+    "halo",
+    "health",
+    "icon",
+    "label",
+    "lodging",
+    "services",
+    "shopping",
+    "transit"
+  ]).optional(),
   roads: colorGroupSchema([
     "bridge",
     "casing",
@@ -1026,12 +1352,43 @@ var roadsModuleSchema = z.object({
   density: z.enum(["clean", "balanced", "dense"]).optional(),
   preset: z.enum(["modern", "minimal"]).optional()
 }).strict();
+var labelDensitySchema = z.enum(["none", "minimal", "balanced", "detailed"]);
+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()
+}).strict();
+var poiModuleSchema = z.object({
+  type: z.literal("poi"),
+  categories: z.array(identifierSchema).optional(),
+  icons: z.union([z.boolean(), z.enum(["essential", "full"])]).optional(),
+  labels: z.enum(["none", "minimal", "balanced", "full"]).optional(),
+  minZoom: z.number().finite().min(0).max(24).optional(),
+  preset: z.enum(["none", "minimal", "balanced", "full"]).optional()
+}).strict();
 var styleOverrideModuleSchema = z.object({
   type: z.literal("styleOverride"),
   layers: z.record(z.string(), styleLayerOverrideSchema).optional(),
   removeLayers: z.array(z.string().min(1)).optional()
 }).strict();
-var moduleSchema = z.discriminatedUnion("type", [roadsModuleSchema, styleOverrideModuleSchema]);
+var moduleSchema = z.discriminatedUnion("type", [
+  labelsModuleSchema,
+  poiModuleSchema,
+  roadsModuleSchema,
+  styleOverrideModuleSchema
+]);
+var iconSetSchema = z.union([
+  z.string().trim().min(1),
+  z.object({
+    extends: z.string().trim().min(1).optional(),
+    mapping: z.record(identifierSchema, z.string().trim().min(1)).optional(),
+    source: z.string().trim().min(1).optional(),
+    sprite: z.string().trim().min(1).optional()
+  }).strict()
+]);
 var viewSchema = z.object({
   bearing: z.number().finite().min(-180).max(180).optional(),
   center: z.tuple([z.number().finite(), z.number().finite()]).refine(([lng, lat]) => lng >= -180 && lng <= 180 && lat >= -90 && lat <= 90, {
@@ -1071,6 +1428,7 @@ var tileflowMapSchema = z.object({
   buildings: z.enum(["hidden", "flat", "3d"]).optional(),
   terrain: z.union([z.enum(["none", "hillshade", "3d"]), terrainConfigSchema]).optional(),
   glyphs: z.string().min(1).optional(),
+  icons: iconSetSchema.optional(),
   sprite: z.string().min(1).optional(),
   tiles: tilesSchema.optional(),
   view: viewSchema.optional(),
@@ -1084,6 +1442,7 @@ var tilesetConfigSchema = z.object({
   sourceLayers: sourceLayersSchema.optional()
 }).strict();
 var tileflowProjectSchema = z.object({
+  icons: z.record(identifierSchema, iconSetSchema).optional(),
   themes: z.record(identifierSchema, themeConfigSchema).optional(),
   tilesets: z.record(identifierSchema, tilesetConfigSchema).optional(),
   maps: z.record(identifierSchema, configSchema).refine((maps) => {
@@ -1152,10 +1511,11 @@ function isProjectConfigLike(input) {
 function validateProjectThemeReferences(project) {
   const themeNames = new Set(Object.keys(project.themes ?? {}));
   const themeMessages = validateThemeExtends(project.themes, themeNames);
+  const iconMessages = validateProjectIconReferences(project);
   const mapMessages = Object.entries(project.maps).flatMap(
     ([mapName, mapConfig]) => validateMapThemeReference(mapConfig, themeNames, `maps.${mapName}.theme`)
   );
-  return [...themeMessages, ...mapMessages];
+  return [...themeMessages, ...iconMessages, ...mapMessages];
 }
 function validateMapThemeReference(config, themeNames, path) {
   if (!config.theme) {
@@ -1220,6 +1580,242 @@ function findThemeCycle(themeName, themes, path) {
   }
   return findThemeCycle(nextThemeName, themes, [...path, themeName]);
 }
+function validateProjectIconReferences(project) {
+  const messages = [];
+  const iconSets = project.icons ?? {};
+  for (const [iconSetName, iconSet] of Object.entries(iconSets)) {
+    const extendedName = iconSetReference(iconSet);
+    if (extendedName && !iconSets[extendedName]) {
+      messages.push({
+        level: "error",
+        path: iconSetExtendsPath(`icons.${iconSetName}`, iconSet),
+        message: `Unknown Tileflow icon set "${extendedName}"`
+      });
+    }
+  }
+  for (const iconSetName of Object.keys(iconSets)) {
+    const cycle = findIconSetCycle(iconSetName, iconSets, []);
+    if (cycle) {
+      messages.push({
+        level: "error",
+        path: iconSetExtendsPath(`icons.${iconSetName}`, iconSets[iconSetName]),
+        message: `Circular Tileflow icon set extends: ${cycle.join(" -> ")}`
+      });
+    }
+  }
+  for (const [mapName, mapConfig] of Object.entries(project.maps)) {
+    if (!isIconSetObject(mapConfig.icons) || !mapConfig.icons.extends) {
+      continue;
+    }
+    if (!iconSets[mapConfig.icons.extends]) {
+      messages.push({
+        level: "error",
+        path: `maps.${mapName}.icons.extends`,
+        message: `Unknown Tileflow icon set "${mapConfig.icons.extends}"`
+      });
+    }
+  }
+  return messages;
+}
+function findIconSetCycle(iconSetName, iconSets, path) {
+  if (path.includes(iconSetName)) {
+    return [...path, iconSetName];
+  }
+  const nextIconSetName = iconSetReference(iconSets?.[iconSetName]);
+  if (!nextIconSetName || !iconSets?.[nextIconSetName]) {
+    return void 0;
+  }
+  return findIconSetCycle(nextIconSetName, iconSets, [...path, iconSetName]);
+}
+function iconSetReference(iconSet) {
+  if (typeof iconSet === "string") {
+    return iconSet;
+  }
+  return isIconSetObject(iconSet) ? iconSet.extends : void 0;
+}
+function iconSetExtendsPath(basePath, iconSet) {
+  return isIconSetObject(iconSet) ? `${basePath}.extends` : basePath;
+}
+function isIconSetObject(value) {
+  return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}
+
+// src/terrain/index.ts
+function resolveTerrain(terrain, tileBaseUrl) {
+  if (!terrain || terrain === "none") {
+    return void 0;
+  }
+  const terrainConfig = typeof terrain === "string" ? { mode: terrain } : terrain;
+  const mode = terrainConfig.mode ?? "hillshade";
+  if (mode === "none") {
+    return void 0;
+  }
+  const sourceId = terrainConfig.sourceId ?? "tileflow-terrain";
+  const tileset = terrainConfig.tileset ?? "terrain";
+  const url = terrainConfig.url ?? `${tileBaseUrl}/tiles/${tileset}/tiles.json`;
+  const encoding = terrainConfig.encoding ?? "terrarium";
+  return {
+    exaggeration: terrainConfig.exaggeration ?? 1.2,
+    mode,
+    sourceId,
+    source: {
+      ...terrainConfig.attribution ? { attribution: terrainConfig.attribution } : {},
+      encoding,
+      type: "raster-dem",
+      url
+    }
+  };
+}
+function withTerrainLayers(layers, terrain) {
+  const hillshadeLayer = {
+    id: "terrain-hillshade",
+    type: "hillshade",
+    source: terrain.sourceId,
+    maxzoom: 15,
+    paint: {
+      "hillshade-accent-color": "rgba(255, 255, 255, 0.18)",
+      "hillshade-exaggeration": terrain.mode === "3d" ? 0.24 : 0.42,
+      "hillshade-highlight-color": "rgba(255, 255, 255, 0.28)",
+      "hillshade-shadow-color": "rgba(38, 44, 50, 0.34)"
+    }
+  };
+  const insertionIndex = layers.findIndex((layer) => layer.id === "water");
+  if (insertionIndex === -1) {
+    return [hillshadeLayer, ...layers];
+  }
+  return [
+    ...layers.slice(0, insertionIndex + 1),
+    hillshadeLayer,
+    ...layers.slice(insertionIndex + 1)
+  ];
+}
+
+// src/templates/osm-bright/controls.ts
+function applyOsmBrightControls(layers, options) {
+  return layers.map((layer) => {
+    const id = stringValue(layer.id);
+    const sourceLayer = stringValue(layer["source-layer"]);
+    const type = stringValue(layer.type);
+    if (type !== "symbol") {
+      return layer;
+    }
+    if (isPoiLayer(id, sourceLayer)) {
+      return applyPoiLayerControls(
+        layer,
+        options.poi,
+        options.customIconSpriteId,
+        options.customIconMapping
+      );
+    }
+    if (isLabelLayer(id, sourceLayer)) {
+      return applyLabelLayerControls(layer, options.labels);
+    }
+    return layer;
+  });
+}
+function applyLabelLayerControls(layer, labels2) {
+  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") {
+    return setLayerVisibility(layer, "none");
+  }
+  const nextLayer = setLayerVisibility(layer, "visible");
+  const layout = isRecord3(nextLayer.layout) ? { ...nextLayer.layout } : {};
+  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 (density === "detailed") {
+    const currentMinZoom = numberValue(nextLayer.minzoom);
+    if (currentMinZoom !== void 0) {
+      nextLayer.minzoom = Math.max(0, currentMinZoom - 1);
+    }
+  }
+  nextLayer.layout = layout;
+  return nextLayer;
+}
+function applyPoiLayerControls(layer, poi2, customIconSpriteId2, customIconMapping) {
+  if (poi2.mode === "none") {
+    return setLayerVisibility(layer, "none");
+  }
+  const nextLayer = setLayerVisibility(layer, "visible");
+  const layout = isRecord3(nextLayer.layout) ? { ...nextLayer.layout } : {};
+  nextLayer.minzoom = Math.max(numberValue(nextLayer.minzoom) ?? 0, poi2.minZoom);
+  if (poi2.categories && sourceLayerValue(nextLayer) === "poi") {
+    nextLayer.filter = combineFilters(nextLayer.filter, poiCategoryFilter(poi2.categories));
+  }
+  if (poi2.labels === "none") {
+    delete layout["text-field"];
+  } else if ("text-field" in layout) {
+    layout["text-field"] = labelTextField("auto");
+  }
+  if (poi2.icons === false) {
+    delete layout["icon-image"];
+  } else if ("icon-image" in layout || customIconSpriteId2) {
+    layout["icon-image"] = poiIconImageExpression(customIconSpriteId2, customIconMapping);
+    layout["icon-optional"] = true;
+  }
+  nextLayer.layout = layout;
+  return nextLayer;
+}
+function labelGroupDensity(labels2, group) {
+  if (group === "roads") return labels2.roads;
+  if (group === "water") return labels2.water;
+  return labels2.places;
+}
+function labelGroup(id, sourceLayer) {
+  if (sourceLayer === "transportation_name" || id.includes("highway-name") || id.includes("highway-shield")) {
+    return "roads";
+  }
+  if (sourceLayer === "water_name" || sourceLayer === "waterway" || id.includes("water-name")) {
+    return "water";
+  }
+  return "places";
+}
+function minimalMinZoom(group) {
+  if (group === "roads") return 13;
+  if (group === "water") return 5;
+  return 4;
+}
+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");
+}
+function isPoiLayer(id, sourceLayer) {
+  return sourceLayer === "poi" || id.startsWith("poi-");
+}
+function isHighwayShieldLayer(id) {
+  return id.includes("highway-shield");
+}
+function setLayerVisibility(layer, visibility) {
+  const layout = isRecord3(layer.layout) ? { ...layer.layout } : {};
+  layout.visibility = visibility;
+  return {
+    ...layer,
+    layout
+  };
+}
+function combineFilters(first, second) {
+  if (!first) {
+    return second;
+  }
+  return ["all", first, second];
+}
+function sourceLayerValue(layer) {
+  return stringValue(layer["source-layer"]);
+}
+function stringValue(value) {
+  return typeof value === "string" ? value : "";
+}
+function numberValue(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function isRecord3(value) {
+  return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}
 
 // src/templates/osm-bright/style.json
 var style_default = {
@@ -3783,68 +4379,18 @@ var style_default = {
   id: "bright"
 };
 
-// src/terrain/index.ts
-function resolveTerrain(terrain, tileBaseUrl) {
-  if (!terrain || terrain === "none") {
-    return void 0;
-  }
-  const terrainConfig = typeof terrain === "string" ? { mode: terrain } : terrain;
-  const mode = terrainConfig.mode ?? "hillshade";
-  if (mode === "none") {
-    return void 0;
-  }
-  const sourceId = terrainConfig.sourceId ?? "tileflow-terrain";
-  const tileset = terrainConfig.tileset ?? "terrain";
-  const url = terrainConfig.url ?? `${tileBaseUrl}/tiles/${tileset}/tiles.json`;
-  const encoding = terrainConfig.encoding ?? "terrarium";
-  return {
-    exaggeration: terrainConfig.exaggeration ?? 1.2,
-    mode,
-    sourceId,
-    source: {
-      ...terrainConfig.attribution ? { attribution: terrainConfig.attribution } : {},
-      encoding,
-      type: "raster-dem",
-      url
-    }
-  };
-}
-function withTerrainLayers(layers, terrain) {
-  const hillshadeLayer = {
-    id: "terrain-hillshade",
-    type: "hillshade",
-    source: terrain.sourceId,
-    maxzoom: 15,
-    paint: {
-      "hillshade-accent-color": "rgba(255, 255, 255, 0.18)",
-      "hillshade-exaggeration": terrain.mode === "3d" ? 0.24 : 0.42,
-      "hillshade-highlight-color": "rgba(255, 255, 255, 0.28)",
-      "hillshade-shadow-color": "rgba(38, 44, 50, 0.34)"
-    }
-  };
-  const insertionIndex = layers.findIndex((layer) => layer.id === "water");
-  if (insertionIndex === -1) {
-    return [hillshadeLayer, ...layers];
-  }
-  return [
-    ...layers.slice(0, insertionIndex + 1),
-    hillshadeLayer,
-    ...layers.slice(insertionIndex + 1)
-  ];
-}
-
 // src/templates/osm-bright/theme.ts
 function applyOsmBrightTheme(layers, colors, theme, typography) {
   if (!theme.custom && theme.name === "light") {
     return layers;
   }
   return layers.map((layer) => {
-    const type = stringValue(layer.type);
-    const sourceLayer = stringValue(layer["source-layer"]);
-    const id = stringValue(layer.id);
+    const type = stringValue2(layer.type);
+    const sourceLayer = stringValue2(layer["source-layer"]);
+    const id = stringValue2(layer.id);
     const nextLayer = { ...layer };
-    const paint = isRecord3(layer.paint) ? { ...layer.paint } : {};
-    const layout = isRecord3(layer.layout) ? { ...layer.layout } : {};
+    const paint = isRecord4(layer.paint) ? { ...layer.paint } : {};
+    const layout = isRecord4(layer.layout) ? { ...layer.layout } : {};
     let paintChanged = false;
     let layoutChanged = false;
     if (type === "background" && hasBaseColor(theme, ["background", "canvas"])) {
@@ -3891,43 +4437,40 @@ function applyOsmBrightTheme(layers, colors, theme, typography) {
 }
 function osmBrightFillColor(id, sourceLayer, colors, theme) {
   if (sourceLayer === "water" || id.includes("water")) {
-    return shouldThemeHydro(theme) ? colors.hydro.water : void 0;
+    return hasBaseColor(theme, ["water"]) || hasNestedModuleColor(theme, "hydro", "water") ? colors.hydro.water : void 0;
   }
   if (sourceLayer === "building") {
-    return shouldThemeBuildings(theme) ? colors.buildings.fill : void 0;
+    return hasBaseColor(theme, ["building"]) || hasNestedModuleColor(theme, "buildings", "fill") ? colors.buildings.fill : void 0;
   }
   if (sourceLayer === "landcover" || id.includes("park") || id.includes("wood")) {
-    if (!shouldThemeLandcover(theme)) {
-      return void 0;
-    }
     if (id.includes("wood") || id.includes("forest")) {
-      return colors.landcover.wood;
+      return shouldThemeLandcoverColor(theme, "wood") ? colors.landcover.wood : void 0;
     }
     if (id.includes("grass")) {
-      return colors.landcover.grass;
+      return shouldThemeLandcoverColor(theme, "grass") ? colors.landcover.grass : void 0;
     }
     if (id.includes("sand") || id.includes("beach")) {
-      return colors.landcover.sand;
+      return shouldThemeLandcoverColor(theme, "sand") ? colors.landcover.sand : void 0;
     }
     if (id.includes("ice") || id.includes("glacier")) {
-      return colors.landcover.ice;
+      return shouldThemeLandcoverColor(theme, "ice") ? colors.landcover.ice : void 0;
     }
-    return colors.landcover.park;
+    return shouldThemeLandcoverColor(theme, "park") ? colors.landcover.park : void 0;
   }
   if (sourceLayer === "landuse" || id.includes("landuse")) {
-    if (!shouldThemeLanduse(theme)) {
-      return void 0;
-    }
     if (id.includes("commercial") || id.includes("retail")) {
-      return colors.landuse.commercial;
+      return shouldThemeLanduseColor(theme, "commercial") ? colors.landuse.commercial : void 0;
     }
     if (id.includes("industrial")) {
-      return colors.landuse.industrial;
+      return shouldThemeLanduseColor(theme, "industrial") ? colors.landuse.industrial : void 0;
     }
     if (id.includes("cemetery")) {
-      return colors.landuse.cemetery;
+      return shouldThemeLanduseColor(theme, "cemetery") ? colors.landuse.cemetery : void 0;
     }
-    return colors.landuse.residential;
+    if (id.includes("hospital") || id.includes("school") || id.includes("civic")) {
+      return shouldThemeLanduseColor(theme, "civic") ? colors.landuse.civic : void 0;
+    }
+    return shouldThemeLanduseColor(theme, "residential") ? colors.landuse.residential : void 0;
   }
   return void 0;
 }
@@ -3936,43 +4479,45 @@ function osmBrightLineColor(id, sourceLayer, colors, theme) {
     return osmBrightRoadLineColor(id, colors, theme);
   }
   if (sourceLayer === "waterway") {
-    return shouldThemeHydro(theme) ? colors.hydro.waterway : void 0;
+    return hasBaseColor(theme, ["water"]) || hasNestedModuleColor(theme, "hydro", "waterway") ? colors.hydro.waterway : void 0;
   }
   if (sourceLayer === "boundary") {
-    if (!shouldThemeBoundaries(theme)) {
-      return void 0;
-    }
-    return id.includes("country") || id.includes("admin") ? colors.boundaries.major : colors.boundaries.admin;
+    const boundaryKey = boundaryColorKey(id);
+    return hasBaseColor(theme, ["boundary"]) || hasNestedModuleColor(theme, "boundaries", boundaryKey) ? colors.boundaries[boundaryKey] : void 0;
   }
   return void 0;
 }
 function osmBrightTextColor(id, sourceLayer, colors, theme) {
   if (sourceLayer === "water_name" || id.includes("water")) {
-    return shouldThemeWaterLabels(theme) ? colors.labels.water : void 0;
+    if (hasNestedModuleColor(theme, "labels", "water")) {
+      return colors.labels.water;
+    }
+    if (hasNestedModuleColor(theme, "hydro", "label")) {
+      return colors.hydro.label;
+    }
+    return hasBaseColor(theme, ["water"]) || shouldThemeLabels(theme) ? colors.labels.water : void 0;
   }
   if (sourceLayer === "transportation_name") {
-    return shouldThemeRoadLabels(theme) ? colors.labels.road : void 0;
+    return shouldThemeLabelColor(theme, "road") ? colors.labels.road : void 0;
   }
   if (sourceLayer === "poi" || id.includes("poi")) {
-    return shouldThemePoiLabels(theme) ? colors.labels.poi : void 0;
+    if (hasNestedModuleColor(theme, "poi", "label")) {
+      return colors.poi.label;
+    }
+    return shouldThemeLabelColor(theme, "poi") ? colors.labels.poi : void 0;
   }
   if (id.includes("country")) {
-    return shouldThemeLabels(theme) ? colors.labels.country : void 0;
+    return shouldThemeLabelColor(theme, "country") ? colors.labels.country : void 0;
   }
   if (sourceLayer === "place" || id.includes("place")) {
-    return shouldThemeLabels(theme) ? colors.labels.settlement : void 0;
+    return shouldThemeLabelColor(theme, "settlement") ? colors.labels.settlement : void 0;
   }
-  return shouldThemeLabels(theme) ? colors.labels.primary : void 0;
-}
-function shouldThemeHydro(theme) {
-  return hasBaseColor(theme, ["water"]) || hasModuleColorGroup(theme, "hydro");
-}
-function shouldThemeWaterLabels(theme) {
-  return shouldThemeHydro(theme) || shouldThemeLabels(theme) || hasNestedModuleColor(theme, "labels", "water");
+  return shouldThemeLabelColor(theme, "primary") ? colors.labels.primary : void 0;
 }
 function osmBrightRoadLineColor(id, colors, theme) {
-  if (hasModuleColorGroup(theme, "roads")) {
-    return osmBrightModuleRoadLineColor(id, colors, theme);
+  const moduleColor = osmBrightModuleRoadLineColor(id, colors, theme);
+  if (moduleColor) {
+    return moduleColor;
   }
   if (isNonRoadThemeTarget(id)) {
     return void 0;
@@ -3991,16 +4536,25 @@ function osmBrightRoadLineColor(id, colors, theme) {
 function osmBrightModuleRoadLineColor(id, colors, theme) {
   const roadColor = (key) => hasNestedModuleColor(theme, "roads", key) ? colors.roads[key] : void 0;
   if (isRoadCasing(id)) {
-    return roadColor("casing");
+    const casing = roadColor("casing");
+    if (casing) {
+      return casing;
+    }
   }
   if (id.includes("ferry")) {
     return roadColor("ferry");
   }
   if (id.includes("rail")) {
-    return roadColor("rail");
+    const rail = roadColor("rail");
+    if (rail) {
+      return rail;
+    }
   }
   if (id.includes("path") || id.includes("track") || id.includes("steps")) {
-    return roadColor("path");
+    const path = roadColor("path");
+    if (path) {
+      return path;
+    }
   }
   if (id.includes("bridge")) {
     const bridge = roadColor("bridge");
@@ -4017,9 +4571,12 @@ function osmBrightModuleRoadLineColor(id, colors, theme) {
   if (id.includes("motorway")) {
     return roadColor("motorway");
   }
-  if (id.includes("trunk")) {
+  if (id.includes("trunk-primary")) {
     return roadColor("trunk") ?? roadColor("primary");
   }
+  if (id.includes("trunk")) {
+    return roadColor("trunk");
+  }
   if (id.includes("primary")) {
     return roadColor("primary");
   }
@@ -4034,6 +4591,15 @@ function osmBrightModuleRoadLineColor(id, colors, theme) {
   }
   return void 0;
 }
+function boundaryColorKey(id) {
+  if (id.includes("water") || id.includes("maritime")) {
+    return "maritime";
+  }
+  if (id.includes("disputed")) {
+    return "disputed";
+  }
+  return id.includes("country") || id.includes("admin") || id.includes("level-2") ? "major" : "admin";
+}
 function isRoadCasing(id) {
   return id.includes("case") || id.includes("casing");
 }
@@ -4046,41 +4612,26 @@ function isMinorRoad(id) {
 function isNonRoadThemeTarget(id) {
   return id.includes("rail") || id.includes("ferry") || id.includes("cablecar") || id.includes("path") || id.includes("steps") || id.includes("pier") || id.includes("area");
 }
-function shouldThemeLandcover(theme) {
-  return hasBaseColor(theme, ["park", "greenspace", "nature"]) || hasModuleColorGroup(theme, "landcover");
+function shouldThemeLandcoverColor(theme, key) {
+  return hasBaseColor(theme, ["park", "greenspace", "nature"]) || hasNestedModuleColor(theme, "landcover", key);
 }
-function shouldThemeLanduse(theme) {
-  return hasBaseColor(theme, ["land"]) || hasModuleColorGroup(theme, "landuse");
-}
-function shouldThemeBuildings(theme) {
-  return hasBaseColor(theme, ["building"]) || hasModuleColorGroup(theme, "buildings");
-}
-function shouldThemeBoundaries(theme) {
-  return hasBaseColor(theme, ["boundary"]) || hasModuleColorGroup(theme, "boundaries");
+function shouldThemeLanduseColor(theme, key) {
+  return hasBaseColor(theme, ["land"]) || hasNestedModuleColor(theme, "landuse", key);
 }
 function shouldThemeLabels(theme) {
-  return hasBaseColor(theme, ["text", "textMuted"]) || hasModuleColorGroup(theme, "labels");
+  return hasBaseColor(theme, ["text", "textMuted"]);
 }
 function shouldThemeLabelHalo(theme) {
   return hasBaseColor(theme, ["background", "canvas", "textHalo"]) || hasNestedModuleColor(theme, "labels", "halo");
 }
-function shouldThemeRoadLabels(theme) {
-  return shouldThemeLabels(theme) || hasNestedModuleColor(theme, "labels", "road");
-}
-function shouldThemePoiLabels(theme) {
-  return shouldThemeLabels(theme) || hasNestedModuleColor(theme, "labels", "poi");
+function shouldThemeLabelColor(theme, key) {
+  return shouldThemeLabels(theme) || hasNestedModuleColor(theme, "labels", key);
 }
 function hasBaseColor(theme, keys) {
   return keys.some(
     (key) => typeof theme.colorOverrides[key] === "string"
   );
 }
-function hasModuleColorGroup(theme, group) {
-  const value = theme.moduleOverrides[group];
-  return Boolean(
-    value && typeof value === "object" && !Array.isArray(value) && Object.keys(value).length > 0
-  );
-}
 function hasNestedModuleColor(theme, group, key) {
   const value = theme.moduleOverrides[group];
   if (!value || typeof value !== "object" || Array.isArray(value)) {
@@ -4088,10 +4639,10 @@ function hasNestedModuleColor(theme, group, key) {
   }
   return typeof value[key] === "string";
 }
-function isRecord3(value) {
+function isRecord4(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
-function stringValue(value) {
+function stringValue2(value) {
   return typeof value === "string" ? value : "";
 }
 
@@ -4105,7 +4656,13 @@ function createOsmBrightStyle(options) {
     options.theme,
     options.typography
   );
-  const resolvedLayers = options.terrain ? withTerrainLayers(themedLayers, options.terrain) : themedLayers;
+  const controlledLayers = applyOsmBrightControls(themedLayers, {
+    customIconMapping: options.customIconMapping,
+    customIconSpriteId: options.customIconSpriteId,
+    labels: options.labelsModule,
+    poi: options.poiModule
+  });
+  const resolvedLayers = options.terrain ? withTerrainLayers(controlledLayers, options.terrain) : controlledLayers;
   return {
     ...template,
     name: options.name,
@@ -4167,6 +4724,7 @@ var defaultConfig = {
 };
 var defaultTileBaseUrl = "https://api.tileflow.dev";
 var defaultTileset = "world";
+var customIconSpriteId = "tileflow";
 function createStyle(input = {}, options = {}) {
   const parsed = configSchema.safeParse(input);
   if (!parsed.success) {
@@ -4199,9 +4757,21 @@ function createStyle(input = {}, options = {}) {
   const roadModule = config.modules?.find(
     (moduleConfig) => moduleConfig.type === "roads"
   );
+  const labelsModule = config.modules?.find(
+    (moduleConfig) => moduleConfig.type === "labels"
+  );
+  const poiModule = config.modules?.find(
+    (moduleConfig) => moduleConfig.type === "poi"
+  );
   const roads2 = resolveRoads(config.roads, roadModule, theme.preset.roads ?? defaultConfig.roads);
-  const labels = config.labels ?? theme.preset.labels ?? defaultConfig.labels;
-  const poi = config.poi ?? theme.preset.poi ?? defaultConfig.poi;
+  const resolvedLabels = resolveLabels(
+    config.labels,
+    labelsModule,
+    theme.preset.labels ?? defaultConfig.labels
+  );
+  const resolvedPoi = resolvePoi(config.poi, poiModule, theme.preset.poi ?? defaultConfig.poi);
+  const labels2 = resolvedLabels.mode;
+  const poi2 = resolvedPoi.mode;
   const buildings = config.buildings ?? "flat";
   const colors = resolveColors(config.colors, theme.colors, {}, theme.modules);
   const sourceId = config.tiles?.sourceId ?? basemap.sourceId ?? "tileflow";
@@ -4211,7 +4781,10 @@ function createStyle(input = {}, options = {}) {
   const typography = resolveTypography(config.typography, theme.typography);
   const terrain = resolveTerrain(config.terrain, tileBaseUrl);
   const glyphs = config.glyphs ?? basemap.glyphs ?? `${tileBaseUrl}/fonts/{fontstack}/{range}.pbf`;
-  const sprite = config.sprite ?? basemap.sprite;
+  const iconSet = resolveIconSet(config.icons, options.iconSets);
+  const iconSprite = iconSet?.sprite;
+  const sprite = config.sprite ?? resolveSprite(basemap.sprite, iconSprite);
+  const customIconSpriteName = Array.isArray(sprite) && iconSprite ? customIconSpriteId : void 0;
   const attribution = config.tiles?.attribution ?? basemap.attribution ?? "\xA9 OpenMapTiles \xA9 OpenStreetMap contributors";
   const metadata = {
     "tileflow:basemap": basemap.type,
@@ -4219,8 +4792,15 @@ function createStyle(input = {}, options = {}) {
     "tileflow:themeMode": theme.mode,
     "tileflow:density": density,
     "tileflow:roads": roads2,
-    "tileflow:labels": labels,
-    "tileflow:poi": poi,
+    "tileflow:labels": labels2,
+    "tileflow:labelsModule": labelsModule,
+    "tileflow:poi": poi2,
+    "tileflow:poiModule": poiModule,
+    "tileflow:icons": iconSet ? {
+      customSpriteId: customIconSpriteName,
+      mapping: iconSet.mapping,
+      sprite: iconSprite
+    } : void 0,
     "tileflow:buildings": buildings,
     "tileflow:modules": config.modules?.map((moduleConfig) => moduleConfig.type) ?? [],
     "tileflow:themeModules": Object.keys(theme.moduleOverrides),
@@ -4248,7 +4828,13 @@ function createStyle(input = {}, options = {}) {
       terrain,
       theme,
       tilesUrl,
-      typography
+      typography,
+      labels: labels2,
+      labelsModule: resolvedLabels,
+      poi: poi2,
+      poiModule: resolvedPoi,
+      customIconMapping: iconSet?.mapping,
+      customIconSpriteId: customIconSpriteName
     });
     return {
       ...style2,
@@ -4266,10 +4852,12 @@ function createStyle(input = {}, options = {}) {
   const layers = openMapTilesLayers(sourceId, sourceLayers, colors, {
     buildings,
     density,
-    labels,
-    poi,
+    labels: resolvedLabels,
+    poi: resolvedPoi,
     roads: roads2,
-    typography
+    typography,
+    customIconMapping: iconSet?.mapping,
+    customIconSpriteId: customIconSpriteName
   });
   const terrainLayers = terrain ? withTerrainLayers(layers, terrain) : layers;
   const resolvedLayers = applyStyleOverrides(terrainLayers, styleOverrideModules);
@@ -4329,6 +4917,7 @@ function createStyleFromProject(projectConfig, mapName, options = {}) {
     },
     {
       ...options,
+      iconSets: projectConfig.icons,
       themes: projectConfig.themes,
       tileset: resolvedTileset
     }
@@ -4361,7 +4950,9 @@ function resolveSourceLayers(mapLayers, tilesetLayers) {
 }
 function shouldUseOsmBrightTemplate(config, basemap, theme) {
   const templateTheme = theme.custom || theme.name === "light" || theme.name === "dark";
-  return basemap.type === "osm" && templateTheme && !hasEffectiveColorOverrides(config.colors) && !config.typography && !config.density && !config.roads && !config.labels && !config.poi && !config.buildings && !config.modules?.some((moduleConfig) => moduleConfig.type !== "styleOverride") && !basemap.sourceLayers && !config.tiles?.sourceLayers;
+  return basemap.type === "osm" && templateTheme && !hasEffectiveColorOverrides(config.colors) && !config.typography && !config.density && !config.roads && !config.buildings && !config.modules?.some(
+    (moduleConfig) => moduleConfig.type !== "styleOverride" && moduleConfig.type !== "labels" && moduleConfig.type !== "poi"
+  ) && !basemap.sourceLayers && !config.tiles?.sourceLayers;
 }
 function hasEffectiveColorOverrides(colors) {
   if (!colors) {
@@ -4371,13 +4962,13 @@ function hasEffectiveColorOverrides(colors) {
     if (key === "accent" || value === void 0) {
       return false;
     }
-    if (isRecord4(value)) {
+    if (isRecord5(value)) {
       return Object.values(value).some((nestedValue) => typeof nestedValue === "string");
     }
     return typeof value === "string";
   });
 }
-function isRecord4(value) {
+function isRecord5(value) {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 function normalizeBaseUrl(value) {
@@ -4389,6 +4980,48 @@ function normalizeStyleBaseUrl(value) {
 function normalizeUrl(value) {
   return value.replace(/\/+$/, "");
 }
+function resolveIconSet(icons, iconSets, path = []) {
+  if (!icons) {
+    return void 0;
+  }
+  if (typeof icons === "string") {
+    const referenced = iconSets?.[icons];
+    if (referenced) {
+      if (path.includes(icons)) {
+        throw new Error(`Circular Tileflow icon set extends: ${[...path, icons].join(" -> ")}`);
+      }
+      return resolveIconSet(referenced, iconSets, [...path, icons]);
+    }
+    if (isSpriteReference(icons)) {
+      return { sprite: icons };
+    }
+    return { source: icons };
+  }
+  const extended = icons.extends ? resolveIconSet(icons.extends, iconSets, path) : void 0;
+  return {
+    ...extended,
+    ...icons,
+    mapping: {
+      ...extended?.mapping,
+      ...icons.mapping
+    }
+  };
+}
+function resolveSprite(basemapSprite, iconSprite) {
+  if (!basemapSprite) {
+    return iconSprite;
+  }
+  if (!iconSprite || iconSprite === basemapSprite) {
+    return basemapSprite;
+  }
+  return [
+    { id: "default", url: basemapSprite },
+    { id: customIconSpriteId, url: iconSprite }
+  ];
+}
+function isSpriteReference(value) {
+  return value.startsWith("http://") || value.startsWith("https://") || value.startsWith("/") || value.startsWith("data:");
+}
 
 // src/config.ts
 function defineTileflow(config) {
@@ -4401,9 +5034,11 @@ export {
   createStyleFromProject,
   defineTileflow,
   getDefaultColors2 as getDefaultColors,
+  labels,
   osm,
   parseTileflowMap,
   parseTileflowProject,
+  poi,
   roads,
   styleOverride,
   tileflowMapSchema,