@tileflow/maps 0.1.0-alpha.7 → 0.1.0-alpha.9

package/dist/index.js

@@ -25,6 +25,7 @@ function packageDirectory(path) {
   return Object.freeze({ kind: "package-directory", package: "@tileflow/maps", path });
 }
 var streetsIcons = packageDirectory("assets/streets/icons");
+var streetsModels = packageDirectory("assets/streets/models");
 var ferrarisIcons = packageDirectory("assets/ferraris/icons");
 var baedekerIcons = packageDirectory("assets/baedeker/icons");
 var civicaIcons = packageDirectory("assets/civica/icons");
@@ -1242,7 +1243,9 @@ var baedeker = bindOfficialMapTheme(
         icons: false,
         labels: true,
         minZoom: 13,
-        placement: { coupleIconAndLabel: false, textPadding: 1 },
+        // Stations and landmarks use the semibold face, and a layer has one font, so each
+        // category keeps its own layer; the categories listed first are placed first.
+        placement: { coupleIconAndLabel: false, order: "categories", textPadding: 1 },
         styles: {
           transport: {
             text: {
@@ -1500,7 +1503,6 @@ var baedeker = bindOfficialMapTheme(
           strokeOpacity: 0.78,
           strokeWidth: 0.8
         },
-        minZoom: 15,
         mode: "flat"
       }),
       water: withRenderStack(
@@ -2787,13 +2789,14 @@ var blueprint = bindOfficialMapTheme(
       }),
       poi: withRenderStack2(
         poi2({
+          // Placed in this order: the primary callouts first.
           categories: [
+            "transport",
+            "medical",
             "arts-entertainment",
             "education",
-            "medical",
             "park-nature",
             "public-services",
-            "transport",
             "visitor-amenity"
           ],
           color: "category",
@@ -2804,6 +2807,9 @@ var blueprint = bindOfficialMapTheme(
           placement: {
             coupleIconAndLabel: false,
             iconPadding: 3,
+            // Medical and transport callouts start earlier than the others, so each category
+            // keeps its own layer; the categories listed first are placed first.
+            order: "categories",
             textPadding: 7
           },
           styles: {
@@ -2818,7 +2824,8 @@ var blueprint = bindOfficialMapTheme(
         }),
         {
           architecturalCallouts: renderPass2({
-            placement: { above: "poi.visitor-amenity.label" },
+            // Above every POI label: the first category listed is the top POI layer.
+            placement: { above: "poi.transport.label" },
             feature: "poi",
             renderer: "symbol",
             selector: {
@@ -3226,7 +3233,6 @@ var blueprint = bindOfficialMapTheme(
           strokeOpacity: 0.58,
           strokeWidth: 0.55
         },
-        minZoom: 16,
         mode: "flat"
       }),
       water: withRenderStack2(
@@ -3434,7 +3440,7 @@ function footpath(minZoom) {
 function wash(color, minZoom, opacity = 1) {
   return { fill: { color, minZoom, opacity }, outline: { visible: false } };
 }
-function place(minZoom, maxZoom, size, options = {}) {
+function place(minZoom, maxZoom, size2, options = {}) {
   return {
     minZoom,
     maxZoom,
@@ -3449,8 +3455,8 @@ function place(minZoom, maxZoom, size, options = {}) {
       maxWidth: 10,
       padding: 5,
       size: zoom3.linear([
-        [minZoom, size],
-        [Math.min(maxZoom, minZoom + 6), size + 5]
+        [minZoom, size2],
+        [Math.min(maxZoom, minZoom + 6), size2 + 5]
       ]),
       transform: "uppercase"
     }
@@ -3479,15 +3485,14 @@ function streetName(minZoom, major = false) {
     }
   };
 }
-function destination(image, minZoom, color, featured = false, role = "caption") {
+function destination(image2, minZoom, color, featured = false, role = "caption") {
   const park = role === "park";
   const station = role === "station";
   const principalPark = expr3.lte(expr3.toNumber(expr3.get(field3("poiSizeRank")), 16), 4);
   return {
     minZoom,
-    density: featured ? 3 : 2,
     icon: {
-      image,
+      image: image2,
       allowOverlap: false,
       ignorePlacement: false,
       optional: false,
@@ -4233,7 +4238,15 @@ var civica = bindOfficialMapTheme(
           minZoom: 12,
           icons: true,
           labels: true,
-          placement: { coupleIconAndLabel: true, iconPadding: 3, textPadding: 4 },
+          placement: {
+            coupleIconAndLabel: true,
+            iconPadding: 3,
+            // Cívica's destination schedule gives each category its own zoom range and
+            // collision padding, so each keeps its own layer; destinations listed first are
+            // placed first.
+            order: "categories",
+            textPadding: 4
+          },
           styles: {
             landmark: destination("civica-poi-monument", 13, ink.type, true),
             "arts-entertainment": destination("civica-poi-museum", 13.5, ink.type, true),
@@ -4357,9 +4370,9 @@ var civica = bindOfficialMapTheme(
       ),
       vegetation: vegetation3({
         mode: "flat",
-        minZoom: 19,
         flat: {
           color: ink.greenInk,
+          minZoom: 19,
           opacity: 0.5,
           radius: zoom3.linear([
             [19, 1.2],
@@ -5344,7 +5357,6 @@ var ferraris = bindOfficialMapTheme(
           strokeOpacity: 0.62,
           strokeWidth: 0.7
         },
-        minZoom: 15,
         mode: "flat"
       }),
       water: withRenderStack4(
@@ -6369,7 +6381,6 @@ var harad = bindOfficialMapTheme(
           strokeOpacity: 0.5,
           strokeWidth: 0.55
         },
-        minZoom: 15,
         mode: "flat"
       }),
       water: withRenderStack5(
@@ -8431,24 +8442,23 @@ var soundings = bindOfficialMapTheme(
 
 // src/official/streets.ts
 import {
+  addresses as addresses4,
   boundaries as boundaries8,
   buildings as buildings7,
   defineMap as defineMap8,
-  disable as disable6,
-  expr as expr9,
-  field as field8,
+  expr as expr11,
+  field as field10,
   fixed as fixed3,
   labels as labels8,
   land as land8,
   poi as poi4,
   refineRenderTarget as refineRenderTarget3,
-  renderPass as renderPass8,
+  renderPass as renderPass9,
   roads as roads7,
   transit as transit8,
-  vegetation as vegetation6,
   water as water8,
-  withRenderStack as withRenderStack8,
-  zoom as zoom9
+  withRenderStack as withRenderStack9,
+  zoom as zoom10
 } from "@tileflow/core";
 
 // src/official/mapbox-rail.ts
@@ -8512,28 +8522,328 @@ function mapboxRailTransitStyle(color) {
   };
 }
 
+// src/official/streets-poi.ts
+import {
+  expr as expr9,
+  field as field8,
+  token as token4
+} from "@tileflow/core";
+var streetsPoiDiscColors = Object.freeze({
+  light: {
+    "arts-entertainment": "#F37CCC",
+    education: "#BF803F",
+    "food-drink": "#FF9933",
+    landmark: "#F37CCC",
+    lodging: "#8D73E6",
+    medical: "#F46A75",
+    "park-nature": "#36AD1F",
+    parking: "#5474D5",
+    "public-services": "#7D8F9F",
+    religion: "#7D8F9F",
+    retail: "#5FA0E5",
+    "sport-leisure": "#4BB5C3",
+    transport: "#465DCD",
+    "visitor-amenity": "#7D8F9F"
+  },
+  dark: {
+    "arts-entertainment": "#C786BC",
+    education: "#B6A783",
+    "food-drink": "#D8BD65",
+    landmark: "#C786BC",
+    lodging: "#AA94DA",
+    medical: "#DC7C89",
+    "park-nature": "#89B871",
+    parking: "#94BCE3",
+    "public-services": "#9DAAB0",
+    religion: "#9DAAB0",
+    retail: "#94BCE3",
+    "sport-leisure": "#89B871",
+    transport: "#8296E6",
+    "visitor-amenity": "#9DAAB0"
+  }
+});
+var streetsPoiPictograms = Object.freeze({
+  "major-transit": { category: "transport", maki: "rail-metro", title: "Metro" },
+  rail: { category: "transport", maki: "rail", title: "Railway station" },
+  "rail-light": { category: "transport", maki: "rail-light", title: "Tram or light rail" },
+  bus: { category: "transport", maki: "bus", title: "Bus" },
+  ferry: { category: "transport", maki: "ferry", title: "Ferry" },
+  aerialway: { category: "transport", maki: "aerialway", title: "Aerial cableway" },
+  airport: { category: "transport", maki: "airport", title: "Airport" },
+  food: { category: "food-drink", maki: "restaurant", title: "Restaurant" },
+  coffee: { category: "food-drink", maki: "cafe", title: "Cafe" },
+  bar: { category: "food-drink", maki: "bar", title: "Bar" },
+  "fast-food": { category: "food-drink", maki: "fast-food", title: "Fast food" },
+  entertainment: { category: "arts-entertainment", maki: "star", title: "Entertainment venue" },
+  culture: { category: "arts-entertainment", maki: "museum", title: "Museum" },
+  "art-gallery": { category: "arts-entertainment", maki: "art-gallery", title: "Art gallery" },
+  theatre: { category: "arts-entertainment", maki: "theatre", title: "Theatre" },
+  cinema: { category: "arts-entertainment", maki: "cinema", title: "Cinema" },
+  music: { category: "arts-entertainment", maki: "music", title: "Music venue" },
+  nightclub: { category: "arts-entertainment", maki: "nightclub", title: "Nightclub" },
+  zoo: { category: "arts-entertainment", maki: "zoo", title: "Zoo" },
+  aquarium: { category: "arts-entertainment", maki: "aquarium", title: "Aquarium" },
+  "amusement-park": {
+    category: "arts-entertainment",
+    maki: "amusement-park",
+    title: "Amusement park"
+  },
+  casino: { category: "arts-entertainment", maki: "casino", title: "Casino" },
+  landmark: { category: "landmark", maki: "landmark", title: "Landmark" },
+  monument: { category: "landmark", maki: "monument", title: "Monument" },
+  castle: { category: "landmark", maki: "castle", title: "Castle" },
+  historic: { category: "landmark", maki: "historic", title: "Historic site" },
+  viewpoint: { category: "landmark", maki: "viewpoint", title: "Viewpoint" },
+  cemetery: { category: "landmark", maki: "cemetery", title: "Cemetery" },
+  "street-art": { category: "landmark", maki: "paint", title: "Street art" },
+  lodging: { category: "lodging", maki: "lodging", title: "Lodging" },
+  campsite: { category: "lodging", maki: "campsite", title: "Campsite" },
+  health: { category: "medical", maki: "hospital", title: "Hospital" },
+  doctor: { category: "medical", maki: "doctor", title: "Clinic" },
+  dentist: { category: "medical", maki: "dentist", title: "Dentist" },
+  pharmacy: { category: "medical", maki: "pharmacy", title: "Pharmacy" },
+  nature: { category: "park-nature", maki: "park", title: "Park" },
+  garden: { category: "park-nature", maki: "garden", title: "Garden" },
+  playground: { category: "park-nature", maki: "playground", title: "Playground" },
+  "dog-park": { category: "park-nature", maki: "dog-park", title: "Dog park" },
+  beach: { category: "park-nature", maki: "beach", title: "Beach" },
+  mountain: { category: "park-nature", maki: "mountain", title: "Mountain" },
+  waterfall: { category: "park-nature", maki: "waterfall", title: "Waterfall" },
+  natural: { category: "park-nature", maki: "natural", title: "Natural feature" },
+  "town-hall": { category: "public-services", maki: "town-hall", title: "Government" },
+  police: { category: "public-services", maki: "police", title: "Police" },
+  "fire-station": { category: "public-services", maki: "fire-station", title: "Fire station" },
+  post: { category: "public-services", maki: "post", title: "Post office" },
+  embassy: { category: "public-services", maki: "embassy", title: "Embassy" },
+  prison: { category: "public-services", maki: "prison", title: "Prison" },
+  community: { category: "public-services", maki: "building", title: "Community center" },
+  plaza: { category: "public-services", maki: "landmark", title: "Public square" },
+  worship: { category: "religion", maki: "place-of-worship", title: "Place of worship" },
+  christian: { category: "religion", maki: "religious-christian", title: "Church" },
+  muslim: { category: "religion", maki: "religious-muslim", title: "Mosque" },
+  jewish: { category: "religion", maki: "religious-jewish", title: "Synagogue" },
+  buddhist: { category: "religion", maki: "religious-buddhist", title: "Buddhist temple" },
+  shopping: { category: "retail", maki: "shop", title: "Shop" },
+  clothing: { category: "retail", maki: "clothing-store", title: "Clothing store" },
+  grocery: { category: "retail", maki: "grocery", title: "Grocery" },
+  convenience: { category: "retail", maki: "convenience", title: "Convenience store" },
+  car: { category: "retail", maki: "car", title: "Car dealer" },
+  "car-repair": { category: "retail", maki: "car-repair", title: "Car parts" },
+  bookstore: { category: "retail", maki: "library", title: "Bookstore" },
+  florist: { category: "retail", maki: "florist", title: "Florist" },
+  hardware: { category: "retail", maki: "hardware", title: "Hardware store" },
+  electronics: { category: "retail", maki: "mobile-phone", title: "Electronics store" },
+  beauty: { category: "retail", maki: "hairdresser", title: "Beauty" },
+  sport: { category: "sport-leisure", maki: "soccer", title: "Sport" },
+  stadium: { category: "sport-leisure", maki: "stadium", title: "Stadium" },
+  golf: { category: "sport-leisure", maki: "golf", title: "Golf course" },
+  swimming: { category: "sport-leisure", maki: "swimming", title: "Swimming pool" },
+  fitness: { category: "sport-leisure", maki: "fitness-centre", title: "Fitness" },
+  services: { category: "visitor-amenity", maki: "information", title: "Information" },
+  parking: { category: "visitor-amenity", disc: "parking", maki: "parking", title: "Parking" },
+  "parking-garage": {
+    category: "visitor-amenity",
+    disc: "parking",
+    maki: "parking-garage",
+    title: "Parking garage"
+  },
+  toilet: { category: "visitor-amenity", maki: "toilet", title: "Toilets" },
+  bank: { category: "visitor-amenity", maki: "bank", title: "Bank or cash machine" },
+  fuel: { category: "visitor-amenity", maki: "fuel", title: "Fuel" },
+  "charging-station": {
+    category: "visitor-amenity",
+    maki: "charging-station",
+    title: "Charging station"
+  },
+  "drinking-water": { category: "visitor-amenity", maki: "drinking-water", title: "Drinking water" },
+  harbor: { category: "visitor-amenity", maki: "harbor", title: "Marina" },
+  laundry: { category: "visitor-amenity", maki: "laundry", title: "Laundry" },
+  education: { category: "education", maki: "college", title: "Education" },
+  college: { category: "education", maki: "college", title: "College or university" },
+  library: { category: "education", maki: "library", title: "Library" }
+});
+var pictogramsByMode = {
+  "major-transit": ["subway"],
+  rail: ["train", "funicular"],
+  "rail-light": ["light_rail", "tram", "monorail"],
+  bus: ["bus"],
+  ferry: ["ferry"],
+  aerialway: ["aerialway"]
+};
+var pictogramsByType = {
+  airport: ["airport"],
+  bus: ["bus_station", "bus_stop"],
+  ferry: ["ferry_terminal"],
+  rail: ["train_station"],
+  "rail-light": ["tram_stop"],
+  bar: ["alcoholic_beverage_venue", "bar", "brewery", "distillery", "lounge", "winery"],
+  coffee: ["cafe", "coffee_shop", "non_alcoholic_beverage_venue", "smoothie_juice_bar"],
+  "fast-food": ["fast_food_restaurant", "food_court", "food_truck_stand"],
+  culture: ["museum", "planetarium", "science_attraction"],
+  "art-gallery": ["art_gallery", "arts_and_crafts_space"],
+  theatre: ["comedy_club", "performing_arts_venue", "theatre_venue"],
+  cinema: ["movie_theater"],
+  music: ["music_venue"],
+  nightclub: ["dance_club"],
+  zoo: ["animal_attraction", "zoo"],
+  aquarium: ["aquarium"],
+  "amusement-park": ["amusement_attraction", "amusement_park", "fairgrounds"],
+  casino: ["casino"],
+  monument: ["monument", "sculpture_statue"],
+  castle: ["castle"],
+  historic: ["historic_site"],
+  viewpoint: ["scenic_viewpoint"],
+  cemetery: ["cemetery"],
+  "street-art": ["street_art"],
+  campsite: ["campground", "rv_park"],
+  health: [
+    "emergency_department",
+    "emergency_or_urgent_care_facility",
+    "hospital",
+    "specialty_hospital"
+  ],
+  dentist: ["dental_clinic"],
+  pharmacy: ["pharmacy"],
+  garden: ["garden"],
+  playground: ["playground"],
+  "dog-park": ["dog_park"],
+  beach: ["beach"],
+  mountain: ["mountain"],
+  waterfall: ["waterfall"],
+  natural: ["canyon", "hot_springs", "island", "valley"],
+  police: ["police_station", "public_safety_service"],
+  "fire-station": ["fire_station"],
+  post: ["post_office"],
+  embassy: ["embassy"],
+  prison: ["jail_or_prison"],
+  community: ["community_center", "food_bank", "social_or_community_service"],
+  plaza: ["public_plaza"],
+  christian: ["christian_place_of_worship"],
+  muslim: ["muslim_place_of_worship"],
+  jewish: ["jewish_place_of_worship"],
+  buddhist: ["buddhist_place_of_worship"],
+  clothing: ["fashion_and_apparel_store"],
+  grocery: [
+    "farmers_market",
+    "food_and_beverage_store",
+    "market",
+    "superstore",
+    "warehouse_club_store"
+  ],
+  convenience: ["convenience_store", "kiosk"],
+  car: ["auto_dealer", "vehicle_dealer"],
+  "car-repair": ["vehicle_parts_store"],
+  bookstore: ["books_music_and_video_store"],
+  florist: ["flowers_and_gifts_store"],
+  hardware: ["hardware_home_and_garden_store"],
+  electronics: ["electronics_store"],
+  beauty: ["personal_care_and_beauty_store"],
+  stadium: ["stadium_arena"],
+  golf: ["golf_course"],
+  swimming: ["swimming_pool"],
+  fitness: ["fitness_studio", "gym"],
+  parking: ["parking", "parking_lot"],
+  "parking-garage": ["parking_garage"],
+  toilet: ["public_restroom"],
+  bank: ["atm", "bank"],
+  fuel: ["fueling_station", "gas_station"],
+  "charging-station": ["ev_charging_station"],
+  "drinking-water": ["drinking_water", "public_fountain"],
+  harbor: ["marina"],
+  laundry: ["laundry"],
+  college: ["college_university", "research_institute"],
+  library: ["library"]
+};
+var streetsPoiCategoryPictograms = Object.freeze({
+  "arts-entertainment": "entertainment",
+  education: "education",
+  "food-drink": "food",
+  landmark: "landmark",
+  lodging: "lodging",
+  medical: "doctor",
+  "park-nature": "nature",
+  "public-services": "town-hall",
+  religion: "worship",
+  retail: "shopping",
+  "sport-leisure": "sport",
+  transport: "major-transit",
+  "visitor-amenity": "services"
+});
+function streetsPoiPictogramToken(id) {
+  return token4.image(`poi.pictogram.${id}`);
+}
+function streetsPoiImageTokens(variant) {
+  const suffix = {
+    light: "",
+    dark: "-dark",
+    monochrome: "-monochrome",
+    "monochrome-dark": "-monochrome-dark"
+  }[variant];
+  const image2 = (id) => `${id}${suffix}`;
+  return Object.fromEntries([
+    ...Object.entries(streetsPoiCategoryPictograms).map(([category, id]) => [
+      `poi.${category}`,
+      image2(id)
+    ]),
+    ...Object.keys(streetsPoiPictograms).map((id) => [`poi.pictogram.${id}`, image2(id)])
+  ]);
+}
+function streetsPoiImage() {
+  const categoryBranches = Object.keys(streetsPoiCategoryPictograms).map((category) => {
+    const types = Object.entries(pictogramsByType).filter(([id]) => streetsPoiPictograms[id].category === category).map(([id, labels9]) => ({
+      labels: [...labels9],
+      value: streetsPoiPictogramToken(id)
+    }));
+    const [first, ...rest] = types;
+    const categoryRole = token4.image(`poi.${category}`);
+    return {
+      labels: category,
+      value: first ? expr9.match(
+        expr9.get(field8("poiType")),
+        [first, ...rest],
+        categoryRole
+      ) : categoryRole
+    };
+  });
+  const [firstCategory, ...otherCategories] = categoryBranches;
+  const [firstMode, ...otherModes] = Object.entries(pictogramsByMode).map(([id, labels9]) => ({
+    labels: [...labels9],
+    value: streetsPoiPictogramToken(id)
+  }));
+  return expr9.match(
+    expr9.get(field8("mode")),
+    [firstMode, ...otherModes],
+    expr9.match(
+      expr9.get(field8("poiCategory")),
+      [firstCategory, ...otherCategories],
+      token4.image("poi.landmark")
+    )
+  );
+}
+
 // src/official/streets-themes.ts
-import { defineTheme as defineTheme2, token as token4 } from "@tileflow/core";
+import { defineTheme as defineTheme2, token as token5 } from "@tileflow/core";
 var streetsLightColors = {
   "boundaries.admin": "#CE9298",
   "boundaries.default": "#CE9298",
   "boundaries.disputed": "#CE9298",
-  "boundaries.halo": "#F4F0EF",
+  "boundaries.halo": "#F5F1F0",
   "boundaries.major": "#CE9298",
   "boundaries.maritime": "#648AA4",
   "boundaries.regional": "#CE9698",
-  "buildings.active": "#F3E9DF",
+  "buildings.active": "#EFEADD",
   "buildings.businessCorridor": "#F4E6D8",
   "buildings.businessCorridorOutline": "#DCCFC3",
-  "buildings.civic": "#F3E9DF",
-  "buildings.commercial": "#F3E9DF",
-  "buildings.destination": "#F3E9DF",
-  "buildings.extrusion": "#EBE1D8",
-  "buildings.fill": "#F3E9DF",
-  "buildings.generic": "#F3E9DF",
-  "buildings.industrial": "#F3E9DF",
-  "buildings.outline": "#DED5CA",
-  "buildings.residential": "#F3E9DF",
+  "buildings.civic": "#EFEADD",
+  "buildings.commercial": "#EFEADD",
+  "buildings.destination": "#EFEADD",
+  "buildings.extrusion": "#EEE4DA",
+  "buildings.contactShadow": "#8C8178",
+  "buildings.fill": "#EFEADD",
+  "buildings.generic": "#EFEADD",
+  "buildings.industrial": "#EFEADD",
+  "buildings.outline": "#E0CDA5",
+  "buildings.residential": "#EFEADD",
   "buildings.shadow": "#BDB7B1",
   // Low-zoom bathymetry is composited over the ocean fill. These values are
   // deliberately pre-compensated so the rendered result, rather than the raw
@@ -8542,20 +8852,24 @@ var streetsLightColors = {
   "hydro.depth.m200": "#6ECEFE59",
   "hydro.depth.m2000": "#29B5FD59",
   "hydro.depth.m7000": "#15AFFA59",
-  "hydro.ferry": "#5A88A9",
+  "hydro.ferry": "#479CEB",
   "hydro.label": "#5A88A9",
   "hydro.ocean": "#98DCFE",
   "hydro.water": "#98DCFE",
   "hydro.waterway": "#98DCFE",
-  "labels.country": "#303230",
-  "labels.halo": "#F4F0EF",
+  "labels.country": "#000000",
+  "labels.ferry": "#2682D9",
+  "labels.ferryHalo": "#98DCFE",
+  "labels.halo": "#F5F1F0",
+  "labels.placeHalo": "#FFFFFF",
+  "labels.roadHalo": "#F2F2F2",
   "labels.muted": "#6D6E6C",
   "labels.neighborhood": "#626361",
   "labels.overview": "#5B5C5A",
   "labels.poi": "#555654",
   "labels.primary": "#5B5C5A",
-  "labels.road": "#505050",
-  "labels.settlement": "#242624",
+  "labels.road": "#404040",
+  "labels.settlement": "#000000",
   "labels.shield.dark": "#1B1D27",
   "labels.shield.light": "#FFFFFF",
   "labels.strong": "#505050",
@@ -8570,72 +8884,72 @@ var streetsLightColors = {
   "landcover.global.shrub": "#D4F0C5",
   "landcover.global.snow": "#F4F7F8",
   "landcover.global.trees": "#C1EFBE",
-  "landcover.global.urban": "#F4F0EF",
-  "landcover.grass": "#CFF0C6",
-  "landcover.greenspace": "#B1EAAC",
+  "landcover.global.urban": "#F5F1F0",
+  "landcover.grass": "#C2EEBE",
+  "landcover.greenspace": "#B3EAAD",
   "landcover.greenspaceDark": "#B8E0AE",
   "landcover.ice": "#F4F7F8",
-  "landcover.meadow": "#CFF0C6",
+  "landcover.meadow": "#C2EEBE",
   "landcover.protected": "#D5E8D0",
-  "landcover.recreationGround": "#B1EAAC",
+  "landcover.recreationGround": "#B3EAAD",
   "landcover.rock": "#E9E8ED",
   "landcover.sand": "#F0ECC6",
   "landcover.scrub": "#D2EEC6",
-  "landcover.urbanPark": "#B1EAAC",
+  "landcover.urbanPark": "#B3EAAD",
   "landcover.villageGreen": "#C2E7B5",
   "landcover.wetland": "#D7E9DE",
-  "landcover.wood": "#9BE494",
+  "landcover.wood": "#A7DFA0",
   "landuse.businessCorridor": "#FBEDE2",
   "landuse.businessCorridorOutline": "#E6D8CA",
   "landuse.cemetery": "#CCE5C6",
-  "landuse.civic": "#F4F0EF",
+  "landuse.civic": "#F5F1F0",
   "landuse.commercial": "#FBEDE2",
   "landuse.education": "#ECE4D2",
-  "landuse.government": "#F4F0EF",
+  "landuse.government": "#F5F1F0",
   "landuse.industrial": "#E8E8F0",
   "landuse.medical": "#EEE0DF",
-  "landuse.military": "#F4F0EF",
+  "landuse.military": "#F5F1F0",
   "landuse.parking": "#E9E6E7",
   "landuse.parkingOutline": "#C8C8CF",
   "landuse.railway": "#E8E8F0",
-  "landuse.recreation": "#B1EAAC",
+  "landuse.recreation": "#B3EAAD",
   "landuse.recreationOutline": "#AED7A5",
   "landuse.residential": "#F5F0EF",
-  "poi.arts-entertainment": "#B85CA4",
-  "poi.education": "#987A55",
-  "poi.food-drink": "#D7892C",
+  "poi.arts-entertainment": "#F042B6",
+  "poi.education": "#916130",
+  "poi.food-drink": "#F57A00",
   "poi.halo": "#FFFFFF",
   "poi.icon": "#777876",
   "poi.label": "#555654",
-  "poi.landmark": "#B85CA4",
-  "poi.lodging": "#806DC4",
-  "poi.medical": "#C95E6B",
-  "poi.park-nature": "#4C9478",
-  "poi.public-services": "#667C9E",
-  "poi.religion": "#8A756B",
-  "poi.retail": "#557BC4",
-  "poi.sport-leisure": "#4C9478",
-  "poi.transport": "#5C74D6",
-  "poi.visitor-amenity": "#557BC4",
+  "poi.landmark": "#F042B6",
+  "poi.lodging": "#664CE6",
+  "poi.medical": "#F53D3D",
+  "poi.park-nature": "#267915",
+  "poi.public-services": "#586E84",
+  "poi.religion": "#586E84",
+  "poi.retail": "#2D87E1",
+  "poi.sport-leisure": "#1891AA",
+  "poi.transport": "#3359CC",
+  "poi.visitor-amenity": "#586E84",
   "roads.bridge": "#BEC5D8",
-  "roads.casing": "#ADB3C3",
-  "roads.city.casing": "#E8E5E6",
-  "roads.city.minor": "#CDCED7",
-  "roads.city.primary": "#C1C6D3",
-  "roads.city.secondary": "#C2C6D6",
-  "roads.city.tertiary": "#C2C6D6",
+  "roads.casing": "#9EA9C4",
+  "roads.city.casing": "#9EA9C4",
+  "roads.city.minor": "#BEC5D8",
+  "roads.city.primary": "#BEC5D8",
+  "roads.city.secondary": "#BEC5D8",
+  "roads.city.tertiary": "#BEC5D8",
   "roads.city.tunnel": "#E0E0E5",
   "roads.city.tunnelCasing": "#C5C5CF",
   "roads.cycleway": "#67AD73",
   "roads.default": "#BEC5D8",
-  "roads.default.casing": "#ADB3C3",
+  "roads.default.casing": "#9EA9C4",
   "roads.default.tunnel": "#DEE0E8",
-  "roads.ferry": "#5A88A9",
-  "roads.major": "#A1B0C2",
+  "roads.ferry": "#479CEB",
+  "roads.major": "#A1B0C4",
   "roads.minor": "#BEC5D8",
-  "roads.motorway": "#A1B0C2",
+  "roads.motorway": "#A1B0C4",
   "roads.motorway.casing": "#8D9EAE",
-  "roads.motorway.tunnel": "#D5DCE0",
+  "roads.motorway.tunnel": "#BEC8D6",
   "roads.parkPath": "#D8E1D8",
   "roads.path": "#EFECEF",
   "roads.path.casing": "#D1C7C7",
@@ -8645,15 +8959,19 @@ var streetsLightColors = {
   "roads.rail": "#8B8E99",
   "roads.railTransit": "#8E909D",
   "roads.secondary": "#BEC5D8",
+  "roads.sidewalk.surface": "rgba(0, 0, 0, 0.06)",
   "roads.trunk": "#A3A6C2",
   "roads.trunk.casing": "#8F91AA",
   "roads.trunk.tunnel": "#C6C8D4",
   "roads.tunnel": "#DEE0E8",
-  "surface.background": "#F4F0EF",
-  "surface.building": "#F3E9DF",
-  "surface.land": "#F4F0EF",
-  "surface.park": "#B1EAAC",
+  "surface.background": "#F5F1F0",
+  "surface.building": "#EFEADD",
+  "surface.land": "#F5F1F0",
+  "surface.park": "#B3EAAD",
   "surface.water": "#98DCFE",
+  "terrain.hillshade.accent": "#A6AB91",
+  "terrain.hillshade.highlight": "#FFFFFF",
+  "terrain.hillshade.shadow": "#727B64",
   "transit.primary": "#5C74D6",
   "vegetation.tree.bark": "#918878",
   "vegetation.tree.broadleaf.a": "#83AD83",
@@ -8679,6 +8997,7 @@ var streetsDarkColors = {
   "buildings.commercial": "#2C2E3D",
   "buildings.destination": "#3A3947",
   "buildings.extrusion": "#343646",
+  "buildings.contactShadow": "#121522",
   "buildings.fill": "#2C2E3D",
   "buildings.generic": "#2C2E3D",
   "buildings.industrial": "#2C2E3D",
@@ -8695,7 +9014,11 @@ var streetsDarkColors = {
   "hydro.water": "#18223B",
   "hydro.waterway": "#18223B",
   "labels.country": "#A6A7AC",
+  "labels.ferry": "#8799BE",
+  "labels.ferryHalo": "#18223B",
   "labels.halo": "#252839",
+  "labels.placeHalo": "#252839",
+  "labels.roadHalo": "#252839",
   "labels.muted": "#8F9098",
   "labels.neighborhood": "#8F9098",
   "labels.overview": "#B2B1B7",
@@ -8749,19 +9072,19 @@ var streetsDarkColors = {
   "landuse.recreationOutline": "#63756A",
   "landuse.residential": "#2D3043",
   "poi.arts-entertainment": "#C786BC",
-  "poi.education": "#8F9098",
-  "poi.food-drink": "#D69A58",
+  "poi.education": "#B6A783",
+  "poi.food-drink": "#D8BD65",
   "poi.halo": "#252839",
   "poi.icon": "#8F9098",
   "poi.label": "#B8B7BD",
   "poi.landmark": "#C786BC",
   "poi.lodging": "#AA94DA",
   "poi.medical": "#DC7C89",
-  "poi.park-nature": "#76B59A",
+  "poi.park-nature": "#89B871",
   "poi.public-services": "#8F9098",
-  "poi.religion": "#C786BC",
-  "poi.retail": "#76B59A",
-  "poi.sport-leisure": "#76B59A",
+  "poi.religion": "#9DAAB0",
+  "poi.retail": "#94BCE3",
+  "poi.sport-leisure": "#89B871",
   "poi.transport": "#8296E6",
   "poi.visitor-amenity": "#8F9098",
   "roads.bridge": "#636779",
@@ -8792,6 +9115,7 @@ var streetsDarkColors = {
   "roads.rail": "#7C7F8C",
   "roads.railTransit": "#777B89",
   "roads.secondary": "#636779",
+  "roads.sidewalk.surface": "rgba(255, 255, 255, 0.06)",
   "roads.trunk": "#6F7188",
   "roads.trunk.casing": "#505264",
   "roads.trunk.tunnel": "#5B5D70",
@@ -8801,6 +9125,9 @@ var streetsDarkColors = {
   "surface.land": "#2D3043",
   "surface.park": "#34453F",
   "surface.water": "#18223B",
+  "terrain.hillshade.accent": "#252D36",
+  "terrain.hillshade.highlight": "#576374",
+  "terrain.hillshade.shadow": "#101827",
   "transit.primary": "#8296E6",
   "vegetation.tree.bark": "#52483D",
   "vegetation.tree.broadleaf.a": "#35473F",
@@ -8811,24 +9138,126 @@ var streetsDarkColors = {
   "vegetation.tree.conifer.b": "#384A40",
   "vegetation.tree.conifer.c": "#405348"
 };
+function parseStreetsColor(value) {
+  const hex = /^#([\da-f]{3,4}|[\da-f]{6}|[\da-f]{8})$/i.exec(value);
+  if (hex) {
+    const digits = hex[1];
+    const expanded = digits.length < 5 ? [...digits].map((digit) => digit + digit).join("") : digits;
+    return {
+      r: Number.parseInt(expanded.slice(0, 2), 16),
+      g: Number.parseInt(expanded.slice(2, 4), 16),
+      b: Number.parseInt(expanded.slice(4, 6), 16),
+      a: expanded.length === 8 ? Number.parseInt(expanded.slice(6, 8), 16) / 255 : 1
+    };
+  }
+  const rgb = /^rgba?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)(?:\s*,\s*(\d+(?:\.\d+)?))?\s*\)$/i.exec(
+    value
+  );
+  if (rgb) {
+    return {
+      r: Number(rgb[1]),
+      g: Number(rgb[2]),
+      b: Number(rgb[3]),
+      a: rgb[4] === void 0 ? 1 : Number(rgb[4])
+    };
+  }
+  throw new Error(`Unsupported Streets theme color: ${value}`);
+}
+function formatStreetsColor({ a, b, g, r }, format) {
+  const channel = (value) => Math.max(0, Math.min(255, Math.round(value)));
+  if (format.startsWith("rgba")) {
+    return `rgba(${channel(r)}, ${channel(g)}, ${channel(b)}, ${Number(a.toFixed(3))})`;
+  }
+  const hex = (value) => channel(value).toString(16).padStart(2, "0");
+  return `#${hex(r)}${hex(g)}${hex(b)}${format.length === 9 ? hex(a * 255) : ""}`;
+}
+function mixStreetsColor(color, tint, amount) {
+  const target = parseStreetsColor(tint);
+  return {
+    r: color.r + (target.r - color.r) * amount,
+    g: color.g + (target.g - color.g) * amount,
+    b: color.b + (target.b - color.b) * amount,
+    a: color.a
+  };
+}
+function adjustStreetsColors(colors, transform) {
+  return Object.fromEntries(
+    Object.entries(colors).map(([role, value]) => [
+      role,
+      formatStreetsColor(transform(role, parseStreetsColor(value)), value)
+    ])
+  );
+}
+function applyStreetsLightPreset(colors, preset) {
+  if (preset === "day" || preset === "night") return { ...colors };
+  const dawn = preset === "dawn";
+  return adjustStreetsColors(colors, (role, color) => {
+    if (role.startsWith("hydro.") || role === "boundaries.maritime" || role === "surface.water" || role === "labels.water" || role === "labels.waterHalo" || role === "labels.ferry" || role === "labels.ferryHalo") {
+      return mixStreetsColor(color, dawn ? "#8EA9B8" : "#7893AA", dawn ? 0.24 : 0.2);
+    }
+    if (role.startsWith("roads.")) {
+      return mixStreetsColor(color, dawn ? "#B8AEB0" : "#9698A8", dawn ? 0.17 : 0.2);
+    }
+    const greenLandcover = role.startsWith("landcover.") && !/(?:^|\.)(?:barren|ice|rock|sand|snow|urban)$/.test(role);
+    if (greenLandcover || role.startsWith("vegetation.tree.") || role === "surface.park" || role === "landuse.cemetery" || role === "landuse.recreation" || role === "landuse.recreationOutline") {
+      return mixStreetsColor(color, dawn ? "#B9D5AB" : "#A6BDA8", dawn ? 0.13 : 0.17);
+    }
+    const halo = role === "labels.halo" || role.endsWith("Halo") || role === "poi.halo";
+    if (role.startsWith("labels.") && !halo) {
+      return mixStreetsColor(color, dawn ? "#514B48" : "#494A54", dawn ? 0.06 : 0.08);
+    }
+    if (halo) {
+      return mixStreetsColor(color, dawn ? "#F2E3D7" : "#E5DFE4", dawn ? 0.23 : 0.18);
+    }
+    if (role.startsWith("landuse.parking")) {
+      return mixStreetsColor(color, dawn ? "#D7D6D5" : "#CECFD7", dawn ? 0.16 : 0.2);
+    }
+    if (role.startsWith("buildings.") || role.startsWith("landuse.") || role.startsWith("surface.") || role === "boundaries.halo") {
+      return mixStreetsColor(color, dawn ? "#F2E3D7" : "#E5DFE4", dawn ? 0.23 : 0.18);
+    }
+    return color;
+  });
+}
+function applyStreetsColorTheme(colors, theme, isDark) {
+  if (theme === "default") return { ...colors };
+  if (theme === "monochrome") {
+    return adjustStreetsColors(colors, (_role, color) => {
+      const gray = color.r * 0.2126 + color.g * 0.7152 + color.b * 0.0722;
+      return { ...color, r: gray, g: gray, b: gray };
+    });
+  }
+  const background = isDark ? "#292C3A" : "#F1F0ED";
+  return adjustStreetsColors(colors, (_role, color) => {
+    const gray = color.r * 0.2126 + color.g * 0.7152 + color.b * 0.0722;
+    const desaturated = {
+      ...color,
+      r: gray + (color.r - gray) * 0.52,
+      g: gray + (color.g - gray) * 0.52,
+      b: gray + (color.b - gray) * 0.52
+    };
+    return mixStreetsColor(desaturated, background, isDark ? 0.08 : 0.12);
+  });
+}
+function streetsPaletteColors(preset, colorTheme) {
+  const isDark = preset === "night";
+  const base = isDark ? streetsDarkColors : streetsLightColors;
+  return applyStreetsColorTheme(applyStreetsLightPreset(base, preset), colorTheme, isDark);
+}
 var streetsFonts = {
+  // DIN Pro Medium has much lighter strokes than Noto Sans Bold. Of the
+  // hosted Noto faces, Regular is the closer match for navigation and POIs.
   default: "Noto Sans Regular",
-  places: "Noto Sans Bold"
+  places: "Noto Sans Bold",
+  regular: "Noto Sans Regular",
+  water: "Noto Sans Italic"
 };
 var streetsImages = {
-  "poi.arts-entertainment": "culture",
-  "poi.education": "education",
-  "poi.food-drink": "food",
-  "poi.landmark": "culture",
-  "poi.lodging": "lodging",
-  "poi.medical": "health",
-  "poi.park-nature": "services",
-  "poi.public-services": "services",
-  "poi.religion": "culture",
-  "poi.retail": "shopping",
-  "poi.sport-leisure": "culture",
-  "poi.transport": "major-transit",
-  "poi.visitor-amenity": "services",
+  ...Object.fromEntries(
+    ["round", "open", "tall", "conifer", "columnar", "palm-feather", "palm-fan"].map((form) => [
+      `vegetation.tree.${form}`,
+      `streets-tree-${form}`
+    ])
+  ),
   "roads.crosswalk": "crosswalk",
   "roads.oneway": "oneway",
   "roads.shield.circleNeutral": "road-shield-circle-neutral",
@@ -8840,95 +9269,136 @@ var streetsImages = {
   "roads.shield.rectangleYellow": "road-shield-rectangle-yellow",
   "roads.sidewalkPattern": "sidewalk-dot"
 };
-var streetsThemes = Object.freeze({
-  light: defineTheme2({
-    id: "streets-light",
-    version: 1,
-    colorScheme: "light",
-    tokens: {
-      color: streetsLightColors,
-      number: {},
-      font: streetsFonts,
-      image: streetsImages
-    },
-    typography: {
-      font: token4.font("default"),
-      places: { font: token4.font("places") },
-      poi: { font: token4.font("default") },
-      roads: { font: token4.font("default") },
-      water: { font: token4.font("default") }
-    },
-    lighting: {
-      anchor: "viewport",
-      color: "#FFFFFF",
-      intensity: 0.15,
-      position: [1.15, 210, 30]
+var streetsLightTheme = defineTheme2({
+  id: "streets-light",
+  version: 1,
+  colorScheme: "light",
+  tokens: {
+    color: streetsLightColors,
+    number: {},
+    font: streetsFonts,
+    image: { ...streetsImages, ...streetsPoiImageTokens("light") }
+  },
+  typography: {
+    font: token5.font("default"),
+    places: { font: token5.font("places") },
+    poi: { font: token5.font("default") },
+    roads: { font: token5.font("default") },
+    water: { font: token5.font("default") }
+  },
+  lighting: {
+    // A broad, high light keeps warm roofs bright and facades softly shaded.
+    // Anchor it to the map so rotating the camera does not move the light.
+    anchor: "map",
+    color: "#FFFFFF",
+    intensity: 0.08,
+    position: [1.15, 210, 30]
+  }
+});
+var streetsDarkTheme = defineTheme2({
+  id: "streets-dark",
+  version: 1,
+  colorScheme: "dark",
+  tokens: {
+    color: streetsDarkColors,
+    number: {},
+    font: streetsFonts,
+    image: {
+      ...streetsImages,
+      ...streetsPoiImageTokens("dark"),
+      ...Object.fromEntries(
+        Object.entries(streetsImages).filter(([role]) => role.startsWith("vegetation.tree.")).map(([role, image2]) => [role, `${image2}-dark`])
+      ),
+      "roads.sidewalkPattern": "sidewalk-dot-dark"
     }
-  }),
-  dark: defineTheme2({
-    id: "streets-dark",
+  },
+  typography: {
+    font: token5.font("default"),
+    places: { font: token5.font("places") },
+    poi: { font: token5.font("default") },
+    roads: { font: token5.font("default") },
+    water: { font: token5.font("default") }
+  },
+  lighting: {
+    anchor: "viewport",
+    color: "#9FB6D0",
+    intensity: 0.08,
+    position: [1.15, 210, 30]
+  }
+});
+function defineStreetsPaletteTheme(name, preset, colorTheme) {
+  const isDark = preset === "night";
+  const imageVariant = colorTheme === "monochrome" ? isDark ? "monochrome-dark" : "monochrome" : void 0;
+  return defineTheme2(isDark ? streetsDarkTheme : streetsLightTheme, {
+    id: `streets-${name}`,
     version: 1,
-    colorScheme: "dark",
+    colorScheme: isDark ? "dark" : "light",
     tokens: {
-      color: streetsDarkColors,
-      number: {},
-      font: streetsFonts,
-      image: {
-        ...streetsImages,
-        "roads.sidewalkPattern": "sidewalk-dot-dark"
-      }
-    },
-    typography: {
-      font: token4.font("default"),
-      places: { font: token4.font("places") },
-      poi: { font: token4.font("default") },
-      roads: { font: token4.font("default") },
-      water: { font: token4.font("default") }
-    },
-    lighting: {
-      anchor: "viewport",
-      color: "#9FB6D0",
-      intensity: 0.08,
-      position: [1.15, 210, 30]
+      color: streetsPaletteColors(preset, colorTheme),
+      ...imageVariant ? { image: streetsPoiImageTokens(imageVariant) } : {}
     }
-  })
+  });
+}
+var streetsThemes = Object.freeze({
+  light: streetsLightTheme,
+  dark: streetsDarkTheme,
+  dawn: defineStreetsPaletteTheme("dawn", "dawn", "default"),
+  dusk: defineStreetsPaletteTheme("dusk", "dusk", "default"),
+  faded: defineStreetsPaletteTheme("faded", "day", "faded"),
+  monochrome: defineStreetsPaletteTheme("monochrome", "day", "monochrome"),
+  "dawn-faded": defineStreetsPaletteTheme("dawn-faded", "dawn", "faded"),
+  "dawn-monochrome": defineStreetsPaletteTheme("dawn-monochrome", "dawn", "monochrome"),
+  "dusk-faded": defineStreetsPaletteTheme("dusk-faded", "dusk", "faded"),
+  "dusk-monochrome": defineStreetsPaletteTheme("dusk-monochrome", "dusk", "monochrome"),
+  "dark-faded": defineStreetsPaletteTheme("dark-faded", "night", "faded"),
+  "dark-monochrome": defineStreetsPaletteTheme("dark-monochrome", "night", "monochrome")
 });
 var streetsVisual = {
   boundary: {
-    admin: token4.color("boundaries.admin"),
-    halo: token4.color("boundaries.halo"),
-    regional: token4.color("boundaries.regional"),
-    overviewLabel: token4.color("labels.overview")
+    admin: token5.color("boundaries.admin"),
+    halo: token5.color("boundaries.halo"),
+    regional: token5.color("boundaries.regional"),
+    overviewLabel: token5.color("labels.overview")
   },
   building: {
-    extrusion: token4.color("buildings.extrusion"),
-    fill: token4.color("buildings.fill"),
-    outline: token4.color("buildings.outline"),
-    shadow: token4.color("buildings.shadow")
+    contactShadow: token5.color("buildings.contactShadow"),
+    extrusion: token5.color("buildings.extrusion"),
+    fill: token5.color("buildings.fill"),
+    outline: token5.color("buildings.outline"),
+    shadow: token5.color("buildings.shadow")
+  },
+  terrain: {
+    accent: token5.color("terrain.hillshade.accent"),
+    highlight: token5.color("terrain.hillshade.highlight"),
+    shadow: token5.color("terrain.hillshade.shadow")
   },
   hydro: {
-    depth0: token4.color("hydro.depth.m0"),
-    depth200: token4.color("hydro.depth.m200"),
-    depth2000: token4.color("hydro.depth.m2000"),
-    depth7000: token4.color("hydro.depth.m7000"),
-    ocean: token4.color("hydro.ocean"),
-    water: token4.color("hydro.water")
+    depth0: token5.color("hydro.depth.m0"),
+    depth200: token5.color("hydro.depth.m200"),
+    depth2000: token5.color("hydro.depth.m2000"),
+    depth7000: token5.color("hydro.depth.m7000"),
+    ocean: token5.color("hydro.ocean"),
+    water: token5.color("hydro.water")
   },
   label: {
-    country: token4.color("labels.country"),
-    halo: token4.color("labels.halo"),
-    muted: token4.color("labels.muted"),
-    neighborhood: token4.color("labels.neighborhood"),
-    overview: token4.color("labels.overview"),
-    poi: token4.color("labels.poi"),
-    primary: token4.color("labels.primary"),
-    road: token4.color("labels.road"),
-    settlement: token4.color("labels.settlement"),
-    shieldDark: token4.color("labels.shield.dark"),
-    shieldLight: token4.color("labels.shield.light"),
-    strong: token4.color("labels.strong"),
-    water: token4.color("labels.water"),
-    waterHalo: token4.color("labels.waterHalo")
+    country: token5.color("labels.country"),
+    ferry: token5.color("labels.ferry"),
+    ferryHalo: token5.color("labels.ferryHalo"),
+    halo: token5.color("labels.halo"),
+    muted: token5.color("labels.muted"),
+    neighborhood: token5.color("labels.neighborhood"),
+    overview: token5.color("labels.overview"),
+    poi: token5.color("labels.poi"),
+    primary: token5.color("labels.primary"),
+    road: token5.color("labels.road"),
+    settlement: token5.color("labels.settlement"),
+    shieldDark: token5.color("labels.shield.dark"),
+    shieldLight: token5.color("labels.shield.light"),
+    strong: token5.color("labels.strong"),
+    water: token5.color("labels.water"),
+    waterHalo: token5.color("labels.waterHalo"),
+    placeHalo: token5.color("labels.placeHalo"),
+    roadHalo: token5.color("labels.roadHalo")
   },
   landcover: Object.fromEntries(
     [
@@ -8949,12 +9419,12 @@ var streetsVisual = {
       "villageGreen",
       "wetland",
       "wood"
-    ].map((name) => [name, token4.color(`landcover.${name}`)])
+    ].map((name) => [name, token5.color(`landcover.${name}`)])
   ),
   globalLandcover: Object.fromEntries(
     ["barren", "crop", "grass", "shrub", "snow", "trees", "urban"].map((name) => [
       name,
-      token4.color(`landcover.global.${name}`)
+      token5.color(`landcover.global.${name}`)
     ])
   ),
   landuse: Object.fromEntries(
@@ -8975,7 +9445,7 @@ var streetsVisual = {
       "recreation",
       "recreationOutline",
       "residential"
-    ].map((name) => [name, token4.color(`landuse.${name}`)])
+    ].map((name) => [name, token5.color(`landuse.${name}`)])
   ),
   poi: Object.fromEntries(
     [
@@ -8995,68 +9465,309 @@ var streetsVisual = {
       "sport-leisure",
       "transport",
       "visitor-amenity"
-    ].map((name) => [name, token4.color(`poi.${name}`)])
+    ].map((name) => [name, token5.color(`poi.${name}`)])
   ),
   road: {
-    casing: token4.color("roads.default.casing"),
-    cityCasing: token4.color("roads.city.casing"),
-    cityMinor: token4.color("roads.city.minor"),
-    cityPrimary: token4.color("roads.city.primary"),
-    citySecondary: token4.color("roads.city.secondary"),
-    cityTertiary: token4.color("roads.city.tertiary"),
-    cityTunnel: token4.color("roads.city.tunnel"),
-    cityTunnelCasing: token4.color("roads.city.tunnelCasing"),
-    cycleway: token4.color("roads.cycleway"),
-    default: token4.color("roads.default"),
-    ferry: token4.color("roads.ferry"),
-    motorway: token4.color("roads.motorway"),
-    motorwayCasing: token4.color("roads.motorway.casing"),
-    motorwayTunnel: token4.color("roads.motorway.tunnel"),
-    parkPath: token4.color("roads.parkPath"),
-    path: token4.color("roads.path"),
-    pathCasing: token4.color("roads.path.casing"),
-    pathTransition: token4.color("roads.path.transition"),
-    pathTunnel: token4.color("roads.path.tunnel"),
-    rail: token4.color("roads.rail"),
-    railTransit: token4.color("roads.railTransit"),
-    trunk: token4.color("roads.trunk"),
-    trunkCasing: token4.color("roads.trunk.casing"),
-    trunkTunnel: token4.color("roads.trunk.tunnel"),
-    tunnel: token4.color("roads.default.tunnel")
+    casing: token5.color("roads.default.casing"),
+    cityCasing: token5.color("roads.city.casing"),
+    cityMinor: token5.color("roads.city.minor"),
+    cityPrimary: token5.color("roads.city.primary"),
+    citySecondary: token5.color("roads.city.secondary"),
+    cityTertiary: token5.color("roads.city.tertiary"),
+    cityTunnel: token5.color("roads.city.tunnel"),
+    cityTunnelCasing: token5.color("roads.city.tunnelCasing"),
+    cycleway: token5.color("roads.cycleway"),
+    default: token5.color("roads.default"),
+    ferry: token5.color("roads.ferry"),
+    motorway: token5.color("roads.motorway"),
+    motorwayCasing: token5.color("roads.motorway.casing"),
+    motorwayTunnel: token5.color("roads.motorway.tunnel"),
+    parkPath: token5.color("roads.parkPath"),
+    path: token5.color("roads.path"),
+    pathCasing: token5.color("roads.path.casing"),
+    pathTransition: token5.color("roads.path.transition"),
+    pathTunnel: token5.color("roads.path.tunnel"),
+    rail: token5.color("roads.rail"),
+    railTransit: token5.color("roads.railTransit"),
+    sidewalkSurface: token5.color("roads.sidewalk.surface"),
+    trunk: token5.color("roads.trunk"),
+    trunkCasing: token5.color("roads.trunk.casing"),
+    trunkTunnel: token5.color("roads.trunk.tunnel"),
+    tunnel: token5.color("roads.default.tunnel")
   },
   surface: {
-    background: token4.color("surface.background"),
-    building: token4.color("surface.building"),
-    land: token4.color("surface.land"),
-    park: token4.color("surface.park"),
-    water: token4.color("surface.water")
+    background: token5.color("surface.background"),
+    building: token5.color("surface.building"),
+    land: token5.color("surface.land"),
+    park: token5.color("surface.park"),
+    water: token5.color("surface.water")
   },
-  transit: token4.color("transit.primary"),
+  transit: token5.color("transit.primary"),
   tree: {
-    bark: token4.color("vegetation.tree.bark"),
+    bark: token5.color("vegetation.tree.bark"),
     broadleaf: ["a", "b", "c", "d"].map(
-      (suffix) => token4.color(`vegetation.tree.broadleaf.${suffix}`)
+      (suffix) => token5.color(`vegetation.tree.broadleaf.${suffix}`)
     ),
-    conifer: ["a", "b", "c"].map((suffix) => token4.color(`vegetation.tree.conifer.${suffix}`))
+    conifer: ["a", "b", "c"].map((suffix) => token5.color(`vegetation.tree.conifer.${suffix}`))
   },
   image: {
-    crosswalk: token4.image("roads.crosswalk"),
-    oneway: token4.image("roads.oneway"),
-    shieldCircleNeutral: token4.image("roads.shield.circleNeutral"),
-    shieldRectangleBlue: token4.image("roads.shield.rectangleBlue"),
-    shieldRectangleGreen: token4.image("roads.shield.rectangleGreen"),
-    shieldRectangleNeutral: token4.image("roads.shield.rectangleNeutral"),
-    shieldRectangleOrange: token4.image("roads.shield.rectangleOrange"),
-    shieldRectangleRed: token4.image("roads.shield.rectangleRed"),
-    shieldRectangleYellow: token4.image("roads.shield.rectangleYellow"),
-    sidewalkPattern: token4.image("roads.sidewalkPattern")
+    crosswalk: token5.image("roads.crosswalk"),
+    oneway: token5.image("roads.oneway"),
+    shieldCircleNeutral: token5.image("roads.shield.circleNeutral"),
+    shieldRectangleBlue: token5.image("roads.shield.rectangleBlue"),
+    shieldRectangleGreen: token5.image("roads.shield.rectangleGreen"),
+    shieldRectangleNeutral: token5.image("roads.shield.rectangleNeutral"),
+    shieldRectangleOrange: token5.image("roads.shield.rectangleOrange"),
+    shieldRectangleRed: token5.image("roads.shield.rectangleRed"),
+    shieldRectangleYellow: token5.image("roads.shield.rectangleYellow"),
+    sidewalkPattern: token5.image("roads.sidewalkPattern")
   },
   font: {
-    default: token4.font("default"),
-    places: token4.font("places")
+    default: token5.font("default"),
+    places: token5.font("places"),
+    regular: token5.font("regular"),
+    water: token5.font("water")
   }
 };
 
+// src/official/streets-trees.ts
+import {
+  expr as expr10,
+  field as field9,
+  renderPass as renderPass8,
+  token as token6,
+  vegetation as vegetation6,
+  withRenderStack as withRenderStack8,
+  zoom as zoom9
+} from "@tileflow/core";
+var seed = expr10.toNumber(expr10.id(), 0);
+var genus = expr10.get(field9("genus"));
+var leaf = expr10.get(field9("leafType"));
+var named = (names) => expr10.match(
+  genus,
+  [{ labels: names.flatMap((name) => [name, name.toLowerCase()]), value: true }],
+  false
+);
+var image = (form) => token6.image(`vegetation.tree.${form}`);
+var broadleaf = expr10.match(
+  expr10.modulo(seed, 3),
+  [
+    { labels: [0], value: image("round") },
+    { labels: [1], value: image("open") }
+  ],
+  image("tall")
+);
+var palm = expr10.match(
+  expr10.modulo(seed, 2),
+  [{ labels: [0], value: image("palm-feather") }],
+  image("palm-fan")
+);
+var crownImage = expr10.case(
+  [
+    {
+      when: expr10.any(
+        expr10.eq(leaf, "palm"),
+        named([
+          "Acoelorrhaphe",
+          "Adonidia",
+          "Archontophoenix",
+          "Areca",
+          "Bismarckia",
+          "Brahea",
+          "Butia",
+          "Caryota",
+          "Chamaedorea",
+          "Chamaerops",
+          "Coccothrinax",
+          "Cocos",
+          "Dypsis",
+          "Elaeis",
+          "Howea",
+          "Jubaea",
+          "Licuala",
+          "Livistona",
+          "Phoenix",
+          "Pritchardia",
+          "Ptychosperma",
+          "Rhapis",
+          "Roystonea",
+          "Sabal",
+          "Serenoa",
+          "Syagrus",
+          "Thrinax",
+          "Trachycarpus",
+          "Veitchia",
+          "Washingtonia",
+          "Wodyetia"
+        ])
+      ),
+      value: palm
+    },
+    { when: named(["Cupressus", "Calocedrus", "Thuja"]), value: image("columnar") },
+    {
+      when: expr10.any(
+        expr10.eq(leaf, "needleleaved"),
+        named([
+          "Abies",
+          "Araucaria",
+          "Cedrus",
+          "Cryptomeria",
+          "Juniperus",
+          "Larix",
+          "Metasequoia",
+          "Picea",
+          "Pinus",
+          "Pseudotsuga",
+          "Sequoia",
+          "Sequoiadendron",
+          "Taxodium",
+          "Taxus",
+          "Tsuga"
+        ])
+      ),
+      value: image("conifer")
+    },
+    {
+      when: named([
+        "Acacia",
+        "Albizia",
+        "Arbutus",
+        "Bursera",
+        "Ceratonia",
+        "Delonix",
+        "Ficus",
+        "Gleditsia",
+        "Jacaranda",
+        "Olea",
+        "Quercus",
+        "Robinia",
+        "Schinus",
+        "Sophora",
+        "Styphnolobium",
+        "Tamarix"
+      ]),
+      value: image("open")
+    },
+    {
+      when: named([
+        "Betula",
+        "Celtis",
+        "Fraxinus",
+        "Ginkgo",
+        "Liquidambar",
+        "Liriodendron",
+        "Magnolia",
+        "Platanus",
+        "Populus",
+        "Pyrus",
+        "Ulmus",
+        "Zelkova"
+      ]),
+      value: image("tall")
+    },
+    {
+      when: named([
+        "Acer",
+        "Aesculus",
+        "Carpinus",
+        "Castanea",
+        "Catalpa",
+        "Cercis",
+        "Citrus",
+        "Fagus",
+        "Lagerstroemia",
+        "Malus",
+        "Melia",
+        "Morus",
+        "Prunus",
+        "Sorbus",
+        "Tilia"
+      ]),
+      value: image("round")
+    }
+  ],
+  broadleaf
+);
+var diameter = expr10.toNumber(expr10.get(field9("diameterCrown")), 0);
+var crownFactor = expr10.divide(
+  expr10.max(3, expr10.min(18, expr10.case([{ when: expr10.gt(diameter, 0), value: diameter }], 7))),
+  7
+);
+var size = (divisor) => expr10.interpolate({ kind: "exponential", base: 2 }, expr10.zoom(), [
+  [15, expr10.multiply(crownFactor, 2.1 / divisor)],
+  [22, expr10.multiply(crownFactor, 268.8 / divisor)]
+]);
+var streetsTrees = withRenderStack8(
+  vegetation6({
+    // Models stay 3D in overhead and tilted views; unsupported renderers omit trees.
+    mode: "3d",
+    fallback: "none",
+    visible: true,
+    flat: {
+      minZoom: 15.5,
+      color: token6.color("vegetation.tree.broadleaf.a"),
+      radius: size(2),
+      opacity: zoom9.linear([
+        [15.5, 0],
+        [16, 0.12]
+      ]),
+      blur: 0.7,
+      pitchAlignment: "map",
+      pitchScale: "map",
+      strokeOpacity: 0
+    },
+    threeDimensional: {
+      barkColor: token6.color("vegetation.tree.bark"),
+      broadleafColors: ["a", "b", "c", "d"].map(
+        (shade) => token6.color(`vegetation.tree.broadleaf.${shade}`)
+      ),
+      coniferColors: ["a", "b", "c"].map(
+        (shade) => token6.color(`vegetation.tree.conifer.${shade}`)
+      ),
+      palmColors: ["a", "b", "c"].map((shade) => token6.color(`vegetation.tree.broadleaf.${shade}`)),
+      crownScale: 1,
+      heightScale: 1,
+      finish: "faceted",
+      edges: 0,
+      forms: {
+        round: { models: ["streets-tree-round"] },
+        open: { models: ["streets-tree-open"] },
+        tall: { models: ["streets-tree-tall"] },
+        conifer: { models: ["streets-tree-conifer"] },
+        columnar: { models: ["streets-tree-columnar"] },
+        palm: { models: ["streets-tree-palm-feather", "streets-tree-palm-fan"] }
+      }
+    }
+  }),
+  {
+    crowns: renderPass8({
+      placement: { above: "vegetation.trees" },
+      // Inherit the optional tree binding from the anchor; generic OpenMapTiles omits it.
+      requirements: ["vegetation"],
+      renderer: "symbol",
+      selector: { kind: "geometry", geometry: "point" },
+      style: {
+        minZoom: 15.5,
+        icon: {
+          image: crownImage,
+          size: size(52),
+          opacity: zoom9.linear([
+            [15.5, 0],
+            [16, 0.88],
+            [18, 1]
+          ]),
+          rotate: expr10.modulo(expr10.multiply(seed, 137.508), 360),
+          rotationAlignment: "map",
+          pitchAlignment: "map",
+          allowOverlap: true,
+          ignorePlacement: true,
+          padding: 0
+        }
+      }
+    })
+  }
+);
+
 // src/official/streets.ts
 var streetsDetailPalette = {
   greenspace: streetsVisual.landcover.greenspace,
@@ -9134,7 +9845,7 @@ var streetsGlobalLandcoverPalette = {
   trees: streetsVisual.globalLandcover.trees,
   urban: streetsVisual.globalLandcover.urban
 };
-var globalLandcoverOpacity = zoom9.linear([
+var globalLandcoverOpacity = zoom10.linear([
   // At world and country zooms the source classes are the terrain palette.
   // Blending them into the neutral land token desaturates forests and crops
   // into one pale wash, so keep the authored colours intact until the detailed
@@ -9149,39 +9860,54 @@ var globalLandcoverOpacity = zoom9.linear([
   [10.75, 0.25],
   [11, 0]
 ]);
-var detailedLandcoverOpacity = zoom9.linear([
+var detailedLandcoverOpacity = zoom10.linear([
   [7, 0],
   [8, 0.35],
   [9, 0.7],
   [10, 0.9],
   [11, 1]
 ]);
-var detailedUrbanGreenOpacity = zoom9.linear([
+var detailedUrbanGreenOpacity = zoom10.linear([
   [8, 0],
   [9, 1]
 ]);
-var protectedAreaOpacity = zoom9.linear([
+var protectedAreaOpacity = zoom10.linear([
   [7, 0],
   [8, 0.28],
   [9, 0.32]
 ]);
-var streetsPoiStyle = {
-  icon: {
-    size: zoom9.linear([
-      [12, 1.04],
-      [15, 1.1],
-      [17, 1.14]
-    ])
-  }
-};
-var sparseStreetsPoiStyle = {
-  ...streetsPoiStyle,
-  density: 2
-};
-var deferredStreetsPoiStyle = {
-  ...streetsPoiStyle,
-  minZoom: 15.5
-};
+function streetsPoiStyle(category) {
+  const filterRank = expr11.toNumber(expr11.get(field10("poiFilterRank")), 6);
+  const sizeRank = expr11.toNumber(expr11.get(field10("poiSizeRank")), 17);
+  const featured = expr11.all(expr11.lte(filterRank, 0), expr11.lt(sizeRank, 5));
+  const featuredDetail = expr11.all(expr11.lte(filterRank, 1), expr11.lt(sizeRank, 13));
+  return {
+    icon: {
+      image: streetsPoiImage(),
+      // Keep the authored 24px cell at native scale. Fractional resizing
+      // softens the small pictogram strokes even with a correct 2x atlas.
+      // The SVG itself fits the Maki artwork into a centered 12px box.
+      size: 1
+    },
+    text: {
+      font: streetsVisual.font.default,
+      haloWidth: 1,
+      haloBlur: 0,
+      letterSpacing: 0.01,
+      lineHeight: 1.2,
+      maxWidth: 9,
+      anchor: "top",
+      offset: [0, 0.8],
+      padding: zoom10.linear([
+        [16, 6],
+        [17, 4]
+      ]),
+      size: category === "transport" ? 13 : expr11.step(expr11.zoom(), expr11.case([{ when: featured, value: 18 }], 13), [
+        [17, expr11.case([{ when: featuredDetail, value: 18 }], 13)]
+      ])
+    }
+  };
+}
 var mapboxBuildingPalette = {
   fill: streetsVisual.building.fill,
   outline: streetsVisual.building.outline
@@ -9210,7 +9936,7 @@ function cityRoadColorStops(minZoom, cityColor, detailedColor) {
 function cityRoadCasingColorStops(minZoom) {
   return cityRoadColorStops(minZoom, streetsDetailPalette.roadCasing, mapboxRoadPalette.roadCasing);
 }
-var roadBorderZoom = 6;
+var roadBorderZoom = 15;
 var roadBorderTotalWidth = 1;
 var roadWidthInterpolationBase = 1.5;
 var roadSurfaceColor = mapboxRoadPalette.road;
@@ -9230,94 +9956,78 @@ var visibleBuilding3dSelector = {
     { field: "hide3d", kind: "compare", operator: "ne", value: "1" }
   ]
 };
-var building3dHeight = expr9.max(
+var groundedBuilding3dSelector = {
+  kind: "all",
+  selectors: [
+    visibleBuilding3dSelector,
+    {
+      field: "renderMinHeight",
+      coerce: "number",
+      fallback: 0,
+      kind: "compare",
+      operator: "lte",
+      value: 0
+    },
+    {
+      kind: "any",
+      selectors: [
+        { kind: "not", selector: { kind: "has", field: "renderHeight" } },
+        {
+          field: "renderHeight",
+          coerce: "number",
+          fallback: 5,
+          kind: "compare",
+          operator: "gt",
+          value: 0
+        }
+      ]
+    }
+  ]
+};
+var building3dHeight = expr11.max(
   0,
-  expr9.toNumber(expr9.coalesce(expr9.get(field8("renderHeight")), 5), 5)
+  expr11.toNumber(expr11.coalesce(expr11.get(field10("renderHeight")), 5), 5)
 );
-var building3dBase = expr9.max(
+var building3dBase = expr11.max(
   0,
-  expr9.min(
-    expr9.toNumber(expr9.coalesce(expr9.get(field8("renderMinHeight")), 0), 0),
+  expr11.min(
+    expr11.toNumber(expr11.coalesce(expr11.get(field10("renderMinHeight")), 0), 0),
     building3dHeight
   )
 );
-var circularRoadRadiusAtZ15 = expr9.toNumber(expr9.get(field8("circularRadiusAtZoom15")), 0);
-var circularRoadRadiusMetres = expr9.toNumber(expr9.get(field8("circularRadiusMeters")), 0);
-var circularRoadOuterRadiusMetres = expr9.toNumber(
-  expr9.get(field8("circularOuterRadiusMeters")),
+var circularRoadRadiusAtZ15 = expr11.toNumber(expr11.get(field10("circularRadiusAtZoom15")), 0);
+var circularRoadRadiusMetres = expr11.toNumber(expr11.get(field10("circularRadiusMeters")), 0);
+var circularRoadOuterRadiusMetres = expr11.toNumber(
+  expr11.get(field10("circularOuterRadiusMeters")),
   0
 );
-var circularRoadInnerRadiusMetres = expr9.toNumber(
-  expr9.get(field8("circularInnerRadiusMeters")),
+var circularRoadInnerRadiusMetres = expr11.toNumber(
+  expr11.get(field10("circularInnerRadiusMeters")),
   0
 );
-var roadNeedsStructuralButtCap = expr9.any(
-  expr9.eq(expr9.get(field8("brunnel")), "tunnel"),
-  expr9.eq(expr9.get(field8("class")), "steps"),
-  expr9.eq(expr9.get(field8("subclass")), "steps")
-);
-var roadNeedsControlledSurfaceButtCap = expr9.all(
-  expr9.match(
-    expr9.get(field8("brunnel")),
-    [{ labels: ["tunnel", "bridge"], value: false }],
-    true
-  ),
-  expr9.eq(expr9.get(field8("foot")), "no"),
-  expr9.match(
-    expr9.get(field8("class")),
-    [
-      {
-        labels: [
-          "motorway",
-          "trunk",
-          "primary",
-          "motorway_construction",
-          "trunk_construction",
-          "primary_construction"
-        ],
-        value: true
-      }
-    ],
-    false
-  )
-);
-var roadLineCap = expr9.step(
-  expr9.zoom(),
-  expr9.case([{ when: roadNeedsStructuralButtCap, value: "butt" }], "round"),
-  [
-    [
-      17,
-      expr9.case(
-        [
-          {
-            when: expr9.any(roadNeedsStructuralButtCap, roadNeedsControlledSurfaceButtCap),
-            value: "butt"
-          }
-        ],
-        "round"
-      )
-    ]
-  ]
-);
-var roadLineJoin = zoom9.step([
+var roadLineCap = zoom10.step([
+  [3, "butt"],
+  [14, "round"]
+]);
+var roadLineJoin = zoom10.step([
   [3, "miter"],
   [14, "round"]
 ]);
-var pathLineCap = zoom9.step([
+var pathLineCap = zoom10.step([
   [12, "butt"],
   [16, "round"]
 ]);
-var pathLineJoin = zoom9.step([
+var pathLineJoin = zoom10.step([
   [12, "miter"],
   [16, "round"]
 ]);
-var hasPhysicalCircularRadii = expr9.all(
-  expr9.gt(circularRoadRadiusMetres, 0),
-  expr9.gt(circularRoadOuterRadiusMetres, circularRoadInnerRadiusMetres),
-  expr9.gte(circularRoadInnerRadiusMetres, 0)
+var hasPhysicalCircularRadii = expr11.all(
+  expr11.gt(circularRoadRadiusMetres, 0),
+  expr11.gt(circularRoadOuterRadiusMetres, circularRoadInnerRadiusMetres),
+  expr11.gte(circularRoadInnerRadiusMetres, 0)
 );
-var circularRoadBaseWidth = expr9.match(
-  expr9.coalesce(expr9.get(field8("class")), "minor"),
+var circularRoadBaseWidth = expr11.match(
+  expr11.coalesce(expr11.get(field10("class")), "minor"),
   [
     { labels: "motorway", value: 6 },
     { labels: "trunk", value: 5.5 },
@@ -9333,39 +10043,39 @@ var circularRoadRadius = circularRoadInnerRadius(false);
 var circularRoadCasingRadius = circularRoadInnerRadius(true);
 var circularRoadWidth = circularRoadStrokeWidth(false);
 var circularRoadCasingWidth = circularRoadStrokeWidth(true);
-var expresswayWidthScale = 1.06;
+var expresswayWidthScale = 1;
 var tunnelBorderDash = [3, 3];
 var tunnelBorderWidth = 1;
-function circularRoadLegacyScale(level) {
+function circularRoadFallbackScale(level) {
   const interpolationBase = 1.35;
   const progress = (interpolationBase ** (level - 15) - 1) / (interpolationBase ** (22 - 15) - 1);
   return 1 + progress * 1.2;
 }
 function circularRoadWidthAtLevel(level) {
-  const scale = circularRoadLegacyScale(level);
-  return level === 15 ? circularRoadBaseWidth : expr9.multiply(circularRoadBaseWidth, scale);
+  const scale = circularRoadFallbackScale(level);
+  return level === 15 ? circularRoadBaseWidth : expr11.multiply(circularRoadBaseWidth, scale);
 }
 function circularRoadCenterlineRadiusAtLevel(level) {
-  return level === 15 ? circularRoadRadiusAtZ15 : expr9.multiply(circularRoadRadiusAtZ15, 2 ** (level - 15));
+  return level === 15 ? circularRoadRadiusAtZ15 : expr11.multiply(circularRoadRadiusAtZ15, 2 ** (level - 15));
 }
 function circularRoadInnerRadiusAtLevel(level, casing) {
   const centerlineRadius = circularRoadCenterlineRadiusAtLevel(level);
-  const physicalInnerRadius = expr9.multiply(
+  const physicalInnerRadius = expr11.multiply(
     centerlineRadius,
-    expr9.divide(circularRoadInnerRadiusMetres, circularRoadRadiusMetres)
+    expr11.divide(circularRoadInnerRadiusMetres, circularRoadRadiusMetres)
   );
-  const fallbackInnerRadius = expr9.subtract(
+  const fallbackInnerRadius = expr11.subtract(
     centerlineRadius,
-    expr9.divide(circularRoadWidthAtLevel(level), 2)
+    expr11.divide(circularRoadWidthAtLevel(level), 2)
   );
-  const innerRadius = expr9.case(
+  const innerRadius = expr11.case(
     [{ when: hasPhysicalCircularRadii, value: physicalInnerRadius }],
     fallbackInnerRadius
   );
-  return expr9.max(0, casing ? expr9.subtract(innerRadius, roadBorderTotalWidth / 2) : innerRadius);
+  return expr11.max(0, casing ? expr11.subtract(innerRadius, roadBorderTotalWidth / 2) : innerRadius);
 }
 function circularRoadInnerRadius(casing) {
-  return expr9.interpolate({ kind: "linear" }, expr9.zoom(), [
+  return expr11.interpolate({ kind: "exponential", base: 2 }, expr11.zoom(), [
     [15, circularRoadInnerRadiusAtLevel(15, casing)],
     [16, circularRoadInnerRadiusAtLevel(16, casing)],
     [17, circularRoadInnerRadiusAtLevel(17, casing)],
@@ -9373,28 +10083,30 @@ function circularRoadInnerRadius(casing) {
     [19, circularRoadInnerRadiusAtLevel(19, casing)],
     [20, circularRoadInnerRadiusAtLevel(20, casing)],
     [21, circularRoadInnerRadiusAtLevel(21, casing)],
-    [22, circularRoadInnerRadiusAtLevel(22, casing)]
+    [22, circularRoadInnerRadiusAtLevel(22, casing)],
+    [23, circularRoadInnerRadiusAtLevel(23, casing)],
+    [24, circularRoadInnerRadiusAtLevel(24, casing)]
   ]);
 }
 function circularRoadStrokeWidthAtLevel(level, casing) {
   const fallbackWidth = circularRoadWidthAtLevel(level);
   const centerlineRadius = circularRoadCenterlineRadiusAtLevel(level);
-  const physicalWidth = expr9.multiply(
+  const physicalWidth = expr11.multiply(
     centerlineRadius,
-    expr9.divide(
-      expr9.subtract(circularRoadOuterRadiusMetres, circularRoadInnerRadiusMetres),
+    expr11.divide(
+      expr11.subtract(circularRoadOuterRadiusMetres, circularRoadInnerRadiusMetres),
       circularRoadRadiusMetres
     )
   );
-  const physicalOutput = casing ? expr9.add(physicalWidth, roadBorderTotalWidth) : physicalWidth;
-  const fallbackOutput = casing ? expr9.add(fallbackWidth, roadBorderTotalWidth) : fallbackWidth;
-  return expr9.case(
+  const physicalOutput = casing ? expr11.add(physicalWidth, roadBorderTotalWidth) : physicalWidth;
+  const fallbackOutput = casing ? expr11.add(fallbackWidth, roadBorderTotalWidth) : fallbackWidth;
+  return expr11.case(
     [{ when: hasPhysicalCircularRadii, value: physicalOutput }],
     fallbackOutput
   );
 }
 function circularRoadStrokeWidth(casing) {
-  return expr9.interpolate({ kind: "linear" }, expr9.zoom(), [
+  return expr11.interpolate({ kind: "exponential", base: 2 }, expr11.zoom(), [
     [15, circularRoadStrokeWidthAtLevel(15, casing)],
     [16, circularRoadStrokeWidthAtLevel(16, casing)],
     [17, circularRoadStrokeWidthAtLevel(17, casing)],
@@ -9402,20 +10114,22 @@ function circularRoadStrokeWidth(casing) {
     [19, circularRoadStrokeWidthAtLevel(19, casing)],
     [20, circularRoadStrokeWidthAtLevel(20, casing)],
     [21, circularRoadStrokeWidthAtLevel(21, casing)],
-    [22, circularRoadStrokeWidthAtLevel(22, casing)]
+    [22, circularRoadStrokeWidthAtLevel(22, casing)],
+    [23, circularRoadStrokeWidthAtLevel(23, casing)],
+    [24, circularRoadStrokeWidthAtLevel(24, casing)]
   ]);
 }
 function roadWidth(widths, oneWayScale, rampWidths) {
   const augmentedWidths = [...widths].sort(([left], [right]) => left - right);
   const widthOutput = (level, width) => {
-    const ordinaryWidth = oneWayScale === 1 ? width : expr9.match(
-      expr9.get(field8("oneway")),
+    const ordinaryWidth = oneWayScale === 1 ? width : expr11.match(
+      expr11.get(field10("oneway")),
       [{ labels: [1, -1], value: width * oneWayScale }],
       width
     );
     const rampWidth = rampWidths?.find(([rampLevel]) => rampLevel === level)?.[1];
-    const surfaceWidth = rampWidth === void 0 ? ordinaryWidth : expr9.case(
-      [{ when: expr9.eq(expr9.get(field8("ramp")), 1), value: rampWidth }],
+    const surfaceWidth = rampWidth === void 0 ? ordinaryWidth : expr11.case(
+      [{ when: expr11.eq(expr11.get(field10("ramp")), 1), value: rampWidth }],
       ordinaryWidth
     );
     return surfaceWidth;
@@ -9425,35 +10139,26 @@ function roadWidth(widths, oneWayScale, rampWidths) {
   );
   const firstWidthStop = widthStops[0];
   if (firstWidthStop === void 0) throw new Error("Road widths require at least one zoom stop.");
-  return expr9.interpolate({ base: roadWidthInterpolationBase, kind: "exponential" }, expr9.zoom(), [
+  return expr11.interpolate({ base: roadWidthInterpolationBase, kind: "exponential" }, expr11.zoom(), [
     firstWidthStop,
     ...widthStops.slice(1)
   ]);
 }
-function roadCasingStrokeWidth() {
-  return zoom9.linear([
-    // Keep the visible border below one physical pixel at ordinary city
-    // zooms. A full 1 px stroke per side can cover a second pixel column on
-    // curved or fractionally positioned lines and make one edge look doubled.
-    [6, 0.4],
-    [12, 0.55],
-    [15, 0.75],
-    [18, 1],
-    [22, 1.5]
+function roadCasingWidth(major) {
+  return expr11.interpolate({ kind: "exponential", base: 1.5 }, expr11.zoom(), [
+    [
+      14,
+      major ? expr11.case([{ when: expr11.eq(expr11.get(field10("ramp")), 1), value: 0.8 }], 1) : 0.8
+    ],
+    [22, 2]
   ]);
 }
-var tunnelRoadCasingWidth = zoom9.linear([
-  [15, 0],
-  [15.5, tunnelBorderWidth],
-  [22, tunnelBorderWidth]
-]);
-var pathCasingStrokeWidth = zoom9.exponential(1.5, [
-  [15, 0],
-  [15.5, 0.5],
+var pathCasingStrokeWidth = zoom10.exponential(1.5, [
+  [14, 0.5],
   [18, 1],
   [22, 2]
 ]);
-var pathTunnelCasingWidth = zoom9.linear([
+var pathTunnelCasingWidth = zoom10.linear([
   [15, 0],
   [15.5, tunnelBorderWidth],
   [22, tunnelBorderWidth]
@@ -9463,62 +10168,15 @@ var mapboxPathWidthStops = [
   [18, 6],
   [22, 80]
 ];
-var googleParkPathWidthStops = [
-  [12, 0],
-  [15, 0.75],
-  [16, 1],
-  [18, 2],
-  [22, 20]
-];
-var unpavedPathCondition = expr9.eq(expr9.get(field8("surface")), "unpaved");
-var contextualPathLineWidth = expr9.interpolate(
-  { base: 1.5, kind: "exponential" },
-  expr9.zoom(),
-  [
-    [12, expr9.case([{ when: unpavedPathCondition, value: 0 }], 0)],
-    [15, expr9.case([{ when: unpavedPathCondition, value: 0.75 }], 1)],
-    [16, expr9.case([{ when: unpavedPathCondition, value: 1 }], 1.5)],
-    [17, expr9.case([{ when: unpavedPathCondition, value: 1.4 }], 3)],
-    [18, expr9.case([{ when: unpavedPathCondition, value: 2 }], 6)],
-    [19, expr9.case([{ when: unpavedPathCondition, value: 3.7 }], 12)],
-    [20, expr9.case([{ when: unpavedPathCondition, value: 7.5 }], 22)],
-    [22, expr9.case([{ when: unpavedPathCondition, value: 20 }], 60)]
-  ]
-);
-var contextualPathColor = expr9.interpolate({ kind: "linear" }, expr9.zoom(), [
-  [
-    15,
-    expr9.case(
-      [{ when: unpavedPathCondition, value: streetsDetailPalette.parkPath }],
-      mapboxRoadPalette.pathAtZ15
-    )
-  ],
-  [
-    16,
-    expr9.case(
-      [{ when: unpavedPathCondition, value: streetsDetailPalette.parkPath }],
-      mapboxRoadPalette.pathFromZ16
-    )
-  ]
+var contextualPathLineWidth = zoom10.exponential(1.5, mapboxPathWidthStops);
+var contextualPathColor = expr11.interpolate({ kind: "linear" }, expr11.zoom(), [
+  [15, mapboxRoadPalette.pathAtZ15],
+  [16, mapboxRoadPalette.pathFromZ16]
 ]);
-var contextualPathCasingColor = expr9.case(
-  [{ when: unpavedPathCondition, value: streetsDetailPalette.parkPath }],
-  mapboxRoadPalette.pathCasing
-);
-var contextualPathCasingWidth = expr9.interpolate(
-  { base: 1.5, kind: "exponential" },
-  expr9.zoom(),
-  [
-    [15, expr9.case([{ when: unpavedPathCondition, value: 0 }], 0)],
-    [15.5, expr9.case([{ when: unpavedPathCondition, value: 0 }], 0.5)],
-    [18, expr9.case([{ when: unpavedPathCondition, value: 0 }], 1)],
-    [22, expr9.case([{ when: unpavedPathCondition, value: 0 }], 2)]
-  ]
-);
-var googleParkPathClasses = ["pathway", "footway", "steps", "pedestrian"];
-function googleParkPathRefinements() {
+var parkPathClasses = ["pathway", "footway", "steps", "pedestrian"];
+function parkPathRefinements() {
   return Object.fromEntries(
-    googleParkPathClasses.flatMap(
+    parkPathClasses.flatMap(
       (roadClass) => ["surface", "bridge"].flatMap((structure) => [
         [
           `${roadClass}-${structure}-fill`,
@@ -9526,6 +10184,7 @@ function googleParkPathRefinements() {
             renderer: "line",
             style: {
               color: roadClass === "steps" ? mapboxRoadPalette.pathFromZ16 : contextualPathColor,
+              minZoom: roadClass === "steps" ? 14 : structure === "surface" ? 12 : roadClass === "pedestrian" ? 13 : 14,
               ...roadClass === "steps" ? { dash: [0.18, 0.15] } : {},
               width: contextualPathLineWidth
             },
@@ -9537,9 +10196,10 @@ function googleParkPathRefinements() {
           refineRenderTarget3({
             renderer: "line",
             style: {
-              color: contextualPathCasingColor,
+              color: mapboxRoadPalette.pathCasing,
+              minZoom: roadClass === "steps" || roadClass === "pedestrian" && structure === "surface" ? 14 : 15,
               gapWidth: roadClass === "steps" ? 0 : contextualPathLineWidth,
-              width: roadClass === "steps" ? contextualPathLineWidth : contextualPathCasingWidth
+              width: roadClass === "steps" ? contextualPathLineWidth : pathCasingStrokeWidth
             },
             target: `roads.classes.${roadClass}.${structure}.casing`
           })
@@ -9589,7 +10249,7 @@ var namedCitySelector = {
 };
 function streetsBoundaryRenderStack() {
   return {
-    admin2Background: renderPass8({
+    admin2Background: renderPass9({
       placement: { below: "boundaries.admin4" },
       feature: "boundary",
       renderer: "line",
@@ -9615,23 +10275,23 @@ function streetsBoundaryRenderStack() {
         ]
       },
       style: {
-        blur: zoom9.linear([
+        blur: zoom10.linear([
           [3, 0],
           [12, 2]
         ]),
         color: streetsVisual.boundary.halo,
         minZoom: 1,
-        opacity: zoom9.linear([
+        opacity: zoom10.linear([
           [3, 0],
           [4, 0.5]
         ]),
-        width: zoom9.linear([
+        width: zoom10.linear([
           [3, 4],
           [12, 8]
         ])
       }
     }),
-    admin4Background: renderPass8({
+    admin4Background: renderPass9({
       placement: { below: "boundaries.admin4" },
       feature: "boundary",
       renderer: "line",
@@ -9657,17 +10317,17 @@ function streetsBoundaryRenderStack() {
         ]
       },
       style: {
-        blur: zoom9.linear([
+        blur: zoom10.linear([
           [3, 0],
           [12, 1]
         ]),
         color: streetsVisual.boundary.halo,
         minZoom: 2,
-        opacity: zoom9.linear([
+        opacity: zoom10.linear([
           [2, 0],
           [4, 0.42]
         ]),
-        width: zoom9.linear([
+        width: zoom10.linear([
           [3, 2.4],
           [6, 3.1],
           [12, 4.2]
@@ -9678,7 +10338,7 @@ function streetsBoundaryRenderStack() {
     // module deliberately exposes only the stable admin-2/admin-4 pair.
     // Standard uses the next tier as a restrained dotted municipal cue from
     // metro zooms onward, so Streets adds it as an explicit semantic pass.
-    admin6: renderPass8({
+    admin6: renderPass9({
       placement: { above: "boundaries.admin4" },
       feature: "boundary",
       renderer: "line",
@@ -9707,12 +10367,12 @@ function streetsBoundaryRenderStack() {
         color: streetsVisual.boundary.regional,
         dash: [1, 1.5],
         minZoom: 8,
-        opacity: zoom9.linear([
+        opacity: zoom10.linear([
           [8, 0],
           [9, 0.5],
           [12, 0.68]
         ]),
-        width: zoom9.linear([
+        width: zoom10.linear([
           [8, 0.45],
           [10, 0.7],
           [12, 0.95]
@@ -9723,7 +10383,27 @@ function streetsBoundaryRenderStack() {
 }
 function streetsLandRenderStack() {
   return {
-    businessArea: renderPass8({
+    // A park polygon is the base surface. Explicit lawns and meadows inside
+    // it must remain visible instead of being painted over by the park fill.
+    grassDetail: refineRenderTarget3({
+      placement: { above: "land.landuse.recreation.fill" },
+      target: "land.landcover.grass.fill"
+    }),
+    meadowDetail: refineRenderTarget3({
+      placement: { above: "land.landcover.grass.fill" },
+      target: "land.landcover.meadow.fill"
+    }),
+    // Mapped parking surfaces cut through broad park/forest polygons. They
+    // remain below the road network and only fill areas present in the tiles.
+    parkingSurface: refineRenderTarget3({
+      placement: "above-land",
+      target: "land.landuse.parking.fill"
+    }),
+    parkingOutline: refineRenderTarget3({
+      placement: { above: "land.landuse.parking.fill" },
+      target: "land.landuse.parking.outline"
+    }),
+    businessArea: renderPass9({
       placement: { above: "land.landuse.residential.fill" },
       feature: "landuse",
       renderer: "fill",
@@ -9741,7 +10421,7 @@ function streetsBuildingRenderStack() {
     // Keep just enough ambient separation for dense footprint clusters. The
     // fill and its close-colour outline carry the 2D building hierarchy; a
     // dark shadow at z15 would turn every footprint into a heavy sticker.
-    flatShadow: renderPass8({
+    flatShadow: renderPass9({
       placement: { below: "buildings.flat.fill" },
       feature: "building",
       renderer: "line",
@@ -9749,7 +10429,7 @@ function streetsBuildingRenderStack() {
         blur: 2,
         color: buildingShadowColor,
         minZoom: 15.5,
-        opacity: zoom9.linear([
+        opacity: zoom10.linear([
           [15.5, 0],
           [16, 0.03],
           [18, 0.08],
@@ -9757,7 +10437,7 @@ function streetsBuildingRenderStack() {
         ]),
         translate: [0.5, 0.75],
         translateAnchor: "viewport",
-        width: zoom9.linear([
+        width: zoom10.linear([
           [15.5, 0.5],
           [16, 1],
           [18, 3],
@@ -9765,38 +10445,69 @@ function streetsBuildingRenderStack() {
         ])
       }
     }),
-    shadowSoft: renderPass8({
+    shadowSoft: renderPass9({
       placement: { below: "buildings.flat.fill" },
       feature: "building",
       renderer: "line",
-      selector: visibleBuilding3dSelector,
+      selector: groundedBuilding3dSelector,
       style: {
-        blur: 7,
-        color: buildingShadowColor,
-        minZoom: 16,
-        opacity: 0.12,
-        translate: [3, 5],
-        translateAnchor: "viewport",
+        // A diffuse contact band, not a displaced footprint. It stays attached
+        // to the walls when the camera rotates and fades in at street detail.
+        blur: zoom10.linear([
+          [15.5, 2],
+          [18, 6],
+          [20, 10]
+        ]),
+        cap: "round",
+        color: streetsVisual.building.contactShadow,
+        join: "round",
+        minZoom: 15.5,
+        opacity: zoom10.linear([
+          [15.5, 0],
+          [16.5, 0.12],
+          [18, 0.22],
+          [20, 0.24]
+        ]),
         visibilityGroup: "building",
-        width: 9
+        width: zoom10.linear([
+          [15.5, 1],
+          [16.5, 4],
+          [18, 10],
+          [20, 18]
+        ])
       }
     }),
-    shadowCore: renderPass8({
+    shadowCore: renderPass9({
       placement: { below: "buildings.flat.fill" },
       feature: "building",
-      renderer: "fill",
-      selector: visibleBuilding3dSelector,
+      renderer: "line",
+      selector: groundedBuilding3dSelector,
       style: {
-        antialias: true,
-        color: buildingShadowColor,
-        minZoom: 16,
-        opacity: 0.1,
-        translate: [2, 4],
-        translateAnchor: "viewport",
-        visibilityGroup: "building"
+        blur: zoom10.linear([
+          [15.5, 0.5],
+          [18, 1.5],
+          [20, 2.5]
+        ]),
+        cap: "round",
+        color: streetsVisual.building.contactShadow,
+        join: "round",
+        minZoom: 15.5,
+        opacity: zoom10.linear([
+          [15.5, 0],
+          [16.5, 0.08],
+          [18, 0.16],
+          [20, 0.18]
+        ]),
+        visibilityGroup: "building",
+        width: zoom10.linear([
+          [15.5, 0.5],
+          [16.5, 1],
+          [18, 2.5],
+          [20, 4]
+        ])
       }
     }),
-    extrusion: renderPass8({
+    extrusion: renderPass9({
       placement: { above: "buildings.flat.outline" },
       feature: "building",
       renderer: "extrusion",
@@ -9815,7 +10526,89 @@ function streetsBuildingRenderStack() {
 }
 function streetsLabelRenderStack() {
   return {
-    settlementMarker: renderPass8({
+    // Ground passes belong to Streets' label design. They do not depend on the
+    // optional class targets emitted by a replacement roads module. Keep the
+    // structural roads last within this group so they win road-name collisions.
+    streetPedestrian: streetNamePass(
+      "pedestrian",
+      12,
+      ["path", "path_construction"],
+      ["pedestrian"]
+    ),
+    streetPaths: streetNamePass(
+      "path",
+      15,
+      ["path", "path_construction"],
+      ["path", "bridleway", "corridor", "footway", "cycleway", "steps"]
+    ),
+    streetService: streetNamePass("service", 15, [
+      "service",
+      "busway",
+      "bus_guideway",
+      "service_construction"
+    ]),
+    streetMinor: streetNamePass("street", 13, [
+      "minor",
+      "residential",
+      "unclassified",
+      "minor_construction"
+    ]),
+    streetTertiary: streetNamePass("major", 13, ["tertiary", "tertiary_construction"]),
+    streetArterial: streetNamePass("major", 12, [
+      "primary",
+      "primary_construction",
+      "secondary",
+      "secondary_construction"
+    ]),
+    streetHighway: streetNamePass("major", 10, [
+      "motorway",
+      "motorway_construction",
+      "trunk",
+      "trunk_construction"
+    ]),
+    ferry: renderPass9({
+      feature: "roadName",
+      placement: "below-labels",
+      renderer: "symbol",
+      selector: {
+        kind: "all",
+        selectors: [
+          { field: "name", kind: "has" },
+          { field: "name", kind: "compare", operator: "ne", value: "" },
+          {
+            kind: "any",
+            selectors: [
+              { field: "class", kind: "compare", operator: "eq", value: "ferry" },
+              { field: "subclass", kind: "compare", operator: "eq", value: "ferry" }
+            ]
+          }
+        ]
+      },
+      style: {
+        minZoom: 15,
+        placement: "line",
+        spacing: 250,
+        text: {
+          field: expr11.get(field10("name")),
+          font: streetsVisual.font.default,
+          color: streetsVisual.label.ferry,
+          haloColor: streetsVisual.label.ferryHalo,
+          haloWidth: 1,
+          haloBlur: 1,
+          letterSpacing: 0.01,
+          maxAngle: 30,
+          padding: 1,
+          pitchAlignment: "viewport",
+          rotationAlignment: "map",
+          size: zoom10.linear([
+            [10, 6.5],
+            [18, 13]
+          ]),
+          transform: "uppercase"
+        }
+      }
+    }),
+    settlementMarker: renderPass9({
       placement: { below: "labels.places.city" },
       feature: "place",
       renderer: "circle",
@@ -9824,7 +10617,7 @@ function streetsLabelRenderStack() {
         color: streetsVisual.label.settlement,
         maxZoom: 8,
         minZoom: 2,
-        radius: expr9.step(expr9.coalesce(expr9.get(field8("rank")), 99), 3, [
+        radius: expr11.step(expr11.coalesce(expr11.get(field10("rank")), 99), 3, [
           [3, 2.5],
           [7, 2]
         ]),
@@ -9838,7 +10631,15 @@ function streetsLabelRenderStack() {
         kind: "all",
         selectors: [
           { field: "name", kind: "has" },
-          { field: "class", kind: "compare", operator: "eq", value: "country" }
+          { field: "class", kind: "compare", operator: "eq", value: "country" },
+          {
+            fallback: rankAtMost(4),
+            kind: "step",
+            stops: [
+              { selector: rankAtMost(4), zoom: 3 },
+              { selector: { kind: "literal", value: true }, zoom: 5 }
+            ]
+          }
         ]
       },
       style: {},
@@ -9932,8 +10733,11 @@ function streetsLabelRenderStack() {
             fallback: rankAtMost(18),
             kind: "step",
             stops: [
-              { selector: rankAtMost(16), zoom: 12 },
-              { selector: { kind: "literal", value: true }, zoom: 14 }
+              // World ranks are local to each source zoom: Manhattan, for
+              // example, moves from rank 11 at z12 to 30 at z13. Once city
+              // detail begins, retain the producer's candidates and let
+              // collisions choose which fit instead of hiding them again.
+              { selector: { kind: "literal", value: true }, zoom: 12 }
             ]
           }
         ]
@@ -9943,9 +10747,50 @@ function streetsLabelRenderStack() {
     })
   };
 }
+function streetsRoadEligibility() {
+  return Object.fromEntries(
+    ["motorway", "trunk", "primary", "secondary", "tertiary"].map((roadClass) => [
+      `${roadClass}-surface-eligibility`,
+      refineRenderTarget3({
+        renderer: "line",
+        selector: {
+          kind: "all",
+          selectors: [
+            { kind: "geometry", geometry: "line" },
+            { kind: "in", field: "class", values: [roadClass, `${roadClass}_construction`] },
+            {
+              kind: "step",
+              fallback: { kind: "literal", value: true },
+              stops: [
+                {
+                  zoom: 5,
+                  selector: {
+                    kind: "all",
+                    selectors: [
+                      { kind: "compare", field: "brunnel", operator: "ne", value: "tunnel" },
+                      { kind: "compare", field: "brunnel", operator: "ne", value: "bridge" }
+                    ]
+                  }
+                }
+              ]
+            },
+            {
+              kind: "step",
+              fallback: { kind: "compare", field: "ramp", operator: "ne", value: 1 },
+              stops: [{ zoom: 12, selector: { kind: "literal", value: true } }]
+            }
+          ]
+        },
+        style: {},
+        target: `roads.classes.${roadClass}.surface.fill`
+      })
+    ])
+  );
+}
 function streetsRoadRenderStack() {
   return {
-    ...googleParkPathRefinements(),
+    ...parkPathRefinements(),
+    ...streetsRoadEligibility(),
     oneWayMarkers: refineRenderTarget3({
       renderer: "symbol",
       style: {
@@ -9954,27 +10799,27 @@ function streetsRoadRenderStack() {
           ignorePlacement: true,
           image: streetsVisual.image.oneway,
           keepUpright: false,
-          opacity: expr9.interpolate({ kind: "linear" }, expr9.zoom(), [
-            [15, 0],
-            [15.5, 0.92],
-            [16, 1]
+          opacity: expr11.interpolate({ kind: "linear" }, expr11.zoom(), [
+            [16.5, 0],
+            [17, 0.92],
+            [17.5, 1]
           ]),
           padding: 0,
           pitchAlignment: "map",
-          rotate: expr9.case(
-            [{ when: expr9.eq(expr9.get(field8("oneway")), -1), value: 180 }],
+          rotate: expr11.case(
+            [{ when: expr11.eq(expr11.get(field10("oneway")), -1), value: 180 }],
             0
           ),
           rotationAlignment: "map",
-          size: expr9.interpolate({ kind: "linear" }, expr9.zoom(), [
+          size: expr11.interpolate({ kind: "linear" }, expr11.zoom(), [
             [15, 0.38],
             [17, 0.55],
             [19, 0.7],
             [22, 1]
           ])
         },
-        minZoom: 15,
-        spacing: expr9.interpolate({ kind: "linear" }, expr9.zoom(), [
+        minZoom: 16.5,
+        spacing: expr11.interpolate({ kind: "linear" }, expr11.zoom(), [
           [15, 95],
           [17, 115],
           [19, 150],
@@ -9982,8 +10827,8 @@ function streetsRoadRenderStack() {
         ]),
         text: {
           allowOverlap: true,
-          field: expr9.case(
-            [{ when: expr9.eq(expr9.get(field8("oneway")), -1), value: "\u2190" }],
+          field: expr11.case(
+            [{ when: expr11.eq(expr11.get(field10("oneway")), -1), value: "\u2190" }],
             "\u2192"
           ),
           ignorePlacement: true,
@@ -9992,7 +10837,7 @@ function streetsRoadRenderStack() {
           padding: 0,
           pitchAlignment: "map",
           rotationAlignment: "map",
-          size: expr9.interpolate({ kind: "linear" }, expr9.zoom(), [
+          size: expr11.interpolate({ kind: "linear" }, expr11.zoom(), [
             [15, 11],
             [17, 17],
             [19, 20],
@@ -10029,6 +10874,7 @@ function cityRoadStyle(color, widths, options = {}) {
     casingMinZoom = roadBorderZoom,
     colorStops,
     minZoom,
+    major = false,
     oneWayScale = 1,
     rampWidths,
     tunnelCasingColor = streetsDetailPalette.roadTunnelBorder,
@@ -10036,12 +10882,12 @@ function cityRoadStyle(color, widths, options = {}) {
     tunnelVisible = true
   } = options;
   const zoomRange = minZoom === void 0 ? {} : { minZoom };
-  const opacity = zoom9.linear([
+  const opacity = zoom10.linear([
     [3, 0],
     [3.5, 1]
   ]);
-  const surfaceColor = colorStops ? zoom9.linear(colorStops) : color;
-  const resolvedCasingColor = zoom9.linear(roadCasingColorStops(casingColorStops));
+  const surfaceColor = colorStops ? zoom10.linear(colorStops) : color;
+  const resolvedCasingColor = zoom10.linear(roadCasingColorStops(casingColorStops));
   const fill = {
     ...zoomRange,
     cap: roadLineCap,
@@ -10058,29 +10904,36 @@ function cityRoadStyle(color, widths, options = {}) {
     cap: roadLineCap,
     // Border reads as a subtle shade of the road itself rather than a white halo.
     color: resolvedCasingColor,
-    gapWidth: fill.width,
+    gapWidth: roadWidth(widths, oneWayScale, rampWidths),
     join: roadLineJoin,
     opacity,
-    width: roadCasingStrokeWidth()
+    width: roadCasingWidth(major)
   };
   return {
     surface: { casing, fill },
-    bridge: { casing, fill },
+    bridge: {
+      casing: { ...casing, cap: "butt", join: "miter", width: roadCasingWidth((minZoom ?? 0) < 12) },
+      fill: { ...fill, cap: "round", join: "miter", minZoom: Math.max(minZoom ?? 0, 13) }
+    },
     tunnel: tunnelVisible ? {
       casing: {
         ...casing,
-        cap: roadLineCap,
+        cap: "butt",
+        join: "miter",
+        minZoom: minZoom === 3 ? 13 : (minZoom ?? 0) < 12 ? 14 : minZoom === 12 ? 15 : 16,
         color: tunnelCasingColor,
         dash: tunnelBorderDash,
         gapWidth: roadWidth(widths, oneWayScale, rampWidths),
         opacity: 1,
-        width: tunnelRoadCasingWidth
+        width: roadCasingWidth((minZoom ?? 0) < 12)
       },
       fill: {
         ...fill,
-        cap: roadLineCap,
+        cap: "butt",
+        join: "miter",
+        minZoom: Math.max(minZoom ?? 0, 13),
         color: tunnelColor,
-        opacity: zoom9.linear([
+        opacity: zoom10.linear([
           [3, 0],
           [3.5, 0.8]
         ])
@@ -10098,7 +10951,7 @@ function cityRoadStyle(color, widths, options = {}) {
 }
 function pathRoadStyle(color, widths, options = {}) {
   const zoomRange = options.minZoom === void 0 ? {} : { minZoom: options.minZoom };
-  const surfaceColor = options.colorStops ? zoom9.linear(options.colorStops) : color;
+  const surfaceColor = options.colorStops ? zoom10.linear(options.colorStops) : color;
   const cap = options.steps ? "butt" : pathLineCap;
   const tunnelCap = "butt";
   const join = options.steps ? "round" : pathLineJoin;
@@ -10147,12 +11000,43 @@ function pathRoadStyle(color, widths, options = {}) {
     }
   };
 }
+function streetNamePass(kind, minZoom, classes, subclasses) {
+  const style = roadLabelStyle(kind);
+  return renderPass9({
+    feature: "roadName",
+    renderer: "symbol",
+    requirements: ["roads"],
+    placement: "below-buildings",
+    selector: {
+      kind: "all",
+      selectors: [
+        { field: "name", kind: "has" },
+        { field: "class", kind: "in", values: classes },
+        ...subclasses ? [{ field: "subclass", kind: "in", values: subclasses }] : []
+      ]
+    },
+    style: {
+      ...style,
+      minZoom,
+      text: {
+        ...style.text,
+        field: expr11.coalesce(
+          expr11.get(field10("name")),
+          expr11.get(field10("nameLatin")),
+          expr11.get(field10("nameEnglish"))
+        ),
+        optional: true
+      }
+    }
+  });
+}
 function roadLabelStyle(kind) {
   const major = kind === "major";
   const pedestrian = kind === "pedestrian";
   const path = kind === "path";
-  const startSize = major ? 9 : pedestrian ? 9 : path ? 6.5 : 8;
-  const endSize = major ? 16 : pedestrian ? 14 : path ? 13 : 14;
+  const small = path || kind === "service";
+  const startSize = major ? 9 : pedestrian ? 9 : small ? 6.5 : 8;
+  const endSize = major ? 16 : pedestrian ? 14 : small ? 13 : 14;
   return {
     placement: "line",
     priority: major ? 90 : 50,
@@ -10160,12 +11044,14 @@ function roadLabelStyle(kind) {
     text: {
       color: streetsVisual.label.road,
       font: streetsVisual.font.default,
-      haloColor: streetsDetailPalette.halo,
+      haloColor: streetsVisual.label.roadHalo,
       haloWidth: 1,
       letterSpacing: path || pedestrian ? 0.01 : 0.15,
       maxAngle: 30,
       padding: 1,
-      size: zoom9.linear([
+      pitchAlignment: "map",
+      rotationAlignment: "map",
+      size: zoom10.linear([
         [10, startSize],
         [18, endSize]
       ]),
@@ -10181,9 +11067,19 @@ var streets = bindOfficialMapTheme(
     glyphs: {
       kind: "url",
       url: "https://api.tileflow.dev/base/33d4de5e8086d9d629d67d3f39fedb87e23686c4c1ac653c27e2a52aee9d00b3/glyphs/{fontstack}/{range}.pbf",
-      fontStacks: ["Noto Sans Regular", "Noto Sans Bold"]
+      fontStacks: ["Noto Sans Regular", "Noto Sans Bold", "Noto Sans Italic"]
     },
     themes: streetsThemes,
+    timeOfDay: {
+      light: { day: "light", dawn: "dawn", dusk: "dusk", night: "dark" },
+      faded: { day: "faded", dawn: "dawn-faded", dusk: "dusk-faded", night: "dark-faded" },
+      monochrome: {
+        day: "monochrome",
+        dawn: "dawn-monochrome",
+        dusk: "dusk-monochrome",
+        night: "dark-monochrome"
+      }
+    },
     defaultTheme: "light",
     systemThemes: { light: "light", dark: "dark" },
     projection: "globe",
@@ -10194,25 +11090,57 @@ var streets = bindOfficialMapTheme(
       type: "tileflow-world"
     },
     icons: [streetsIcons],
-    // The development terrain archive currently returns uncached tiles in the reviewed cities.
-    // Keep it disabled until that archive is complete so navigation does not wait on failed DEM requests.
-    terrain: "none",
+    models: [streetsModels],
+    // The same open DEM used by the other terrain maps. Restrict relief to
+    // regional zooms so street detail does not fetch high-resolution DEM tiles.
+    terrain: {
+      mode: "hillshade",
+      encoding: "terrarium",
+      url: "https://tiles.mapterhorn.com/tilejson.json",
+      attribution: 'Terrain: <a href="https://mapterhorn.com/attribution">\xA9 Mapterhorn</a>',
+      hillshade: {
+        minZoom: 5,
+        maxZoom: 14,
+        accentColor: streetsVisual.terrain.accent,
+        highlightColor: streetsVisual.terrain.highlight,
+        shadowColor: streetsVisual.terrain.shadow,
+        exaggeration: 0.23,
+        illuminationAnchor: "map",
+        illuminationDirection: 315
+      }
+    },
     modules: {
       // Optional keys: addresses, aeroways, boundaries, buildings, labels, land,
       // landforms, poi, roads, transit, vegetation, water. Object order never
       // controls layer order.
       // Streets deliberately omits parcel-level house numbers. POI and road/place
       // labels carry the useful navigation hierarchy without close-zoom numeric noise.
-      addresses: disable6(),
-      land: withRenderStack8(
+      addresses: addresses4({
+        labels: {
+          minZoom: 17,
+          text: {
+            font: streetsVisual.font.default,
+            color: streetsVisual.label.muted,
+            haloColor: streetsVisual.label.placeHalo,
+            haloWidth: 1,
+            maxWidth: 10,
+            padding: 20,
+            size: zoom10.linear([
+              [18, 11],
+              [20, 13]
+            ])
+          }
+        }
+      }),
+      land: withRenderStack9(
         land8({
           background: {
             color: streetsSurfacePalette.background,
             opacity: 1
           },
           globalLandcover: {
-            color: expr9.match(
-              expr9.get(field8("class")),
+            color: expr11.match(
+              expr11.get(field10("class")),
               [
                 { labels: "barren", value: streetsGlobalLandcoverPalette.barren },
                 { labels: "crop", value: streetsGlobalLandcoverPalette.crop },
@@ -10348,7 +11276,7 @@ var streets = bindOfficialMapTheme(
             industrial: { fill: { color: streetsSurfacePalette.industrial, opacity: 1 } },
             medical: { fill: { color: streetsSurfacePalette.medical, opacity: 1 } },
             parking: {
-              fill: { color: streetsSurfacePalette.parking, minZoom: 15, opacity: 0.9 },
+              fill: { color: streetsSurfacePalette.parking, minZoom: 15, opacity: 1 },
               outline: {
                 color: streetsSurfacePalette.parkingOutline,
                 minZoom: 16,
@@ -10378,9 +11306,9 @@ var streets = bindOfficialMapTheme(
       water: water8({
         bathymetry: {
           antialias: false,
-          color: expr9.interpolate(
+          color: expr11.interpolate(
             { kind: "linear" },
-            expr9.multiply(-1, expr9.toNumber(expr9.get(field8("bathymetryMinDepth")), 0)),
+            expr11.multiply(-1, expr11.toNumber(expr11.get(field10("bathymetryMinDepth")), 0)),
             [
               [0, streetsSurfacePalette.waterDepth0],
               [200, streetsSurfacePalette.waterDepth200],
@@ -10390,7 +11318,7 @@ var streets = bindOfficialMapTheme(
           ),
           maxZoom: 8,
           minZoom: 0,
-          opacity: zoom9.linear([
+          opacity: zoom10.linear([
             [0, 1],
             [6, 1],
             [8, 0]
@@ -10398,8 +11326,8 @@ var streets = bindOfficialMapTheme(
         },
         bodies: {
           fill: {
-            color: expr9.match(
-              expr9.get(field8("class")),
+            color: expr11.match(
+              expr11.get(field10("class")),
               [{ labels: ["ocean", "sea"], value: streetsSurfacePalette.waterOcean }],
               streetsSurfacePalette.water
             ),
@@ -10424,7 +11352,7 @@ var streets = bindOfficialMapTheme(
             join: "round",
             minZoom: 8,
             opacity: 0.96,
-            width: zoom9.linear([
+            width: zoom10.linear([
               [8, 0.35],
               [13, 1.05],
               [16, 2.2]
@@ -10436,7 +11364,7 @@ var streets = bindOfficialMapTheme(
             join: "round",
             minZoom: 12,
             opacity: 0.92,
-            width: zoom9.linear([
+            width: zoom10.linear([
               [12, 0.35],
               [14, 0.8],
               [16, 1.4]
@@ -10448,7 +11376,7 @@ var streets = bindOfficialMapTheme(
             join: "round",
             minZoom: 6,
             opacity: 0.96,
-            width: zoom9.linear([
+            width: zoom10.linear([
               [6, 0.45],
               [13, 1.25],
               [16, 3.2]
@@ -10460,7 +11388,7 @@ var streets = bindOfficialMapTheme(
             join: "round",
             minZoom: 10,
             opacity: 0.94,
-            width: zoom9.linear([
+            width: zoom10.linear([
               [10, 0.3],
               [12, 0.55],
               [13, 0.9],
@@ -10470,31 +11398,8 @@ var streets = bindOfficialMapTheme(
           }
         }
       }),
-      vegetation: vegetation6({
-        flat: {
-          color: streetsDetailPalette.greenspaceDark,
-          minZoom: 16,
-          opacity: 0.82,
-          pitchAlignment: "map",
-          pitchScale: "map",
-          radius: zoom9.linear([
-            [16, 2.2],
-            [20, 8]
-          ]),
-          strokeColor: streetsDetailPalette.greenspace,
-          strokeOpacity: 0.55,
-          strokeWidth: 0.8
-        },
-        mode: "3d",
-        threeDimensional: {
-          barkColor: streetsVisual.tree.bark,
-          broadleafColors: streetsVisual.tree.broadleaf,
-          coniferColors: streetsVisual.tree.conifer,
-          crownScale: 1,
-          heightScale: 1
-        }
-      }),
-      boundaries: withRenderStack8(
+      vegetation: streetsTrees,
+      boundaries: withRenderStack9(
         boundaries8({
           // Mapbox Standard's admin-0/admin-1 layers map to OpenMapTiles
           // admin_level 2/4 respectively.
@@ -10503,7 +11408,7 @@ var streets = bindOfficialMapTheme(
             dash: [10, 0],
             minZoom: 1,
             opacity: 1,
-            width: zoom9.linear([
+            width: zoom10.linear([
               [3, 0.8],
               [6, 1.35],
               [12, 2.1]
@@ -10513,11 +11418,11 @@ var streets = bindOfficialMapTheme(
             color: streetsOverviewPalette.admin1,
             dash: [3, 2],
             minZoom: 2,
-            opacity: zoom9.linear([
+            opacity: zoom10.linear([
               [2, 0],
               [3, 1]
             ]),
-            width: zoom9.linear([
+            width: zoom10.linear([
               [3, 0.7],
               [6, 1.2],
               [12, 1.8]
@@ -10525,12 +11430,12 @@ var streets = bindOfficialMapTheme(
           },
           disputed: {
             color: streetsOverviewPalette.admin0,
-            dash: expr9.step(expr9.zoom(), expr9.literal([3, 2, 5]), [
-              [7, expr9.literal([2, 1.5])]
+            dash: expr11.step(expr11.zoom(), expr11.literal([3, 2, 5]), [
+              [7, expr11.literal([2, 1.5])]
             ]),
             minZoom: 1,
             opacity: 1,
-            width: zoom9.linear([
+            width: zoom10.linear([
               [3, 0.5],
               [12, 2]
             ])
@@ -10539,7 +11444,7 @@ var streets = bindOfficialMapTheme(
         }),
         streetsBoundaryRenderStack()
       ),
-      roads: withRenderStack8(
+      roads: withRenderStack9(
         roads7({
           detail: "all",
           // 'none' | 'highways' | 'major' | 'streets' | 'all'.
@@ -10557,10 +11462,12 @@ var streets = bindOfficialMapTheme(
           },
           crossings: {
             image: streetsVisual.image.crosswalk,
-            minZoom: 15,
-            opacity: zoom9.linear([
-              [15, 0],
-              [15.5, 1]
+            // At city detail these white markings wash out otherwise matching
+            // road fills. Introduce them with the closer street-level detail.
+            minZoom: 16.5,
+            opacity: zoom10.linear([
+              [16.5, 0],
+              [17, 1]
             ])
           },
           roundabouts: {
@@ -10590,9 +11497,12 @@ var streets = bindOfficialMapTheme(
               pattern: streetsVisual.image.sidewalkPattern
             },
             surface: {
-              color: streetsDetailPalette.roadCasing,
+              // Preserve the ground beneath mapped pedestrian polygons. A
+              // neutral translucent tint darkens grass as green and pavement
+              // as neutral, without requiring a spatial join in the style.
+              color: streetsVisual.road.sidewalkSurface,
               minZoom: 17,
-              opacity: 0.96
+              opacity: 1
             }
           },
           modifiers: {
@@ -10601,11 +11511,10 @@ var streets = bindOfficialMapTheme(
             // phases accept color, opacity, dash, blur, gapWidth, offset, and width.
             construction: {
               surface: {
-                casing: {
-                  color: mapboxRoadPalette.roadCasing,
-                  dash: [1.5, 1],
-                  opacity: 0.9
-                },
+                // Keep construction dashes in the fill. A conditional casing
+                // dash adds a [1, 0] fallback to every ordinary road, selecting
+                // MapLibre's SDF dash shader and stippling thin hollow borders.
+                casing: { dash: [1, 0], opacity: 0 },
                 fill: {
                   color: mapboxRoadPalette.road,
                   dash: [1.5, 1],
@@ -10726,6 +11635,7 @@ var streets = bindOfficialMapTheme(
                   [22, mapboxRoadPalette.motorway]
                 ],
                 minZoom: 3,
+                major: true,
                 rampWidths: mapboxMajorRampWidthStops,
                 tunnelCasingColor: mapboxRoadPalette.motorwayCasing,
                 tunnelColor: mapboxRoadPalette.motorwayTunnel
@@ -10749,6 +11659,7 @@ var streets = bindOfficialMapTheme(
                   [22, mapboxRoadPalette.trunk]
                 ],
                 minZoom: 3,
+                major: true,
                 rampWidths: mapboxMajorRampWidthStops,
                 tunnelCasingColor: mapboxRoadPalette.trunkCasing,
                 tunnelColor: mapboxRoadPalette.trunkTunnel
@@ -10758,7 +11669,7 @@ var streets = bindOfficialMapTheme(
               primaryRoadSurfaceColor,
               [
                 [3, 0.8],
-                [12, 2.6],
+                [12, 3],
                 [18, 28],
                 [22, 280]
               ],
@@ -10769,7 +11680,8 @@ var streets = bindOfficialMapTheme(
                   streetsCityRoadPalette.primary,
                   primaryRoadSurfaceColor
                 ),
-                minZoom: 5,
+                minZoom: 6,
+                major: true,
                 rampWidths: mapboxArterialRampWidthStops,
                 tunnelCasingColor: mapboxRoadPalette.roadCasing,
                 tunnelColor: mapboxRoadPalette.roadTunnel
@@ -10779,7 +11691,7 @@ var streets = bindOfficialMapTheme(
               secondaryRoadSurfaceColor,
               [
                 [3, 0],
-                [12, 1.8],
+                [12, 2.2],
                 [18, 26],
                 [22, 260]
               ],
@@ -10800,7 +11712,7 @@ var streets = bindOfficialMapTheme(
               tertiaryRoadSurfaceColor,
               [
                 [3, 0],
-                [12, 1.2],
+                [12, 2.2],
                 [18, 26],
                 [22, 260]
               ],
@@ -10821,13 +11733,12 @@ var streets = bindOfficialMapTheme(
               roadSurfaceColor,
               [
                 [3, 0],
-                [12, 0.35],
+                [12, 0.5],
                 [18, 20],
                 [22, 200]
               ],
               {
                 casingColorStops: cityRoadCasingColorStops(12),
-                casingMinZoom: 14.5,
                 colorStops: cityRoadColorStops(12, streetsCityRoadPalette.minor, roadSurfaceColor),
                 minZoom: 12,
                 tunnelCasingColor: mapboxRoadPalette.roadCasing,
@@ -10838,16 +11749,12 @@ var streets = bindOfficialMapTheme(
               roadSurfaceColor,
               [
                 [3, 0],
-                [13, 0],
-                [13.5, 0.35],
-                [14, 0.8],
-                [15, 2.2],
-                [16, 3.8],
+                [12, 0],
                 [18, 10],
                 [22, 100]
               ],
               {
-                casingMinZoom: 14.5,
+                casingMinZoom: 16,
                 casingColorStops: [
                   [14.5, mapboxRoadPalette.roadCasing],
                   [22, mapboxRoadPalette.roadCasing]
@@ -10856,24 +11763,21 @@ var streets = bindOfficialMapTheme(
                   [13.5, roadSurfaceColor],
                   [22, roadSurfaceColor]
                 ],
-                minZoom: 13.5,
-                tunnelVisible: false
+                minZoom: 15,
+                tunnelCasingColor: mapboxRoadPalette.roadCasing,
+                tunnelColor: mapboxRoadPalette.roadTunnel
               }
             ),
             track: cityRoadStyle(
               mapboxRoadPalette.road,
               [
                 [3, 0],
-                [13, 0],
-                [13.5, 0.25],
-                [14, 0.6],
-                [15, 1.8],
-                [16, 3.2],
+                [12, 0],
                 [18, 10],
                 [22, 100]
               ],
               {
-                casingMinZoom: 14.5,
+                casingMinZoom: 16,
                 casingColorStops: [
                   [14.5, mapboxRoadPalette.roadCasing],
                   [22, mapboxRoadPalette.roadCasing]
@@ -10882,32 +11786,28 @@ var streets = bindOfficialMapTheme(
                   [13.5, mapboxRoadPalette.road],
                   [22, mapboxRoadPalette.road]
                 ],
-                minZoom: 13.5,
+                minZoom: 15,
                 tunnelCasingColor: mapboxRoadPalette.roadCasing,
                 tunnelColor: mapboxRoadPalette.roadTunnel
               }
             ),
-            pathway: pathRoadStyle(streetsDetailPalette.parkPath, googleParkPathWidthStops, {
-              casingColor: streetsDetailPalette.parkPath,
-              casingWidth: 0,
+            pathway: pathRoadStyle(mapboxRoadPalette.pathFromZ16, mapboxPathWidthStops, {
               minZoom: 12
             }),
-            footway: pathRoadStyle(streetsDetailPalette.parkPath, googleParkPathWidthStops, {
-              casingColor: streetsDetailPalette.parkPath,
-              casingWidth: 0,
+            footway: pathRoadStyle(mapboxRoadPalette.pathFromZ16, mapboxPathWidthStops, {
               minZoom: 12
             }),
             cycleway: pathRoadStyle(mapboxRoadPalette.cycleway, mapboxPathWidthStops, {
               casingColor: mapboxRoadPalette.pathCasing,
               casingGapWidth: roadWidth(mapboxPathWidthStops, 1),
-              fillOpacity: zoom9.linear([
+              fillOpacity: zoom10.linear([
                 [15, 0],
                 [16, 1]
               ]),
               minZoom: 15,
               underlay: {
                 cap: pathLineCap,
-                color: zoom9.linear([
+                color: zoom10.linear([
                   [15, mapboxRoadPalette.pathAtZ15],
                   [16, mapboxRoadPalette.pathFromZ16]
                 ]),
@@ -10916,16 +11816,16 @@ var streets = bindOfficialMapTheme(
                 opacity: 1,
                 width: roadWidth(mapboxPathWidthStops, 1)
               },
-              width: zoom9.linear([
+              width: zoom10.linear([
                 [12, 0],
                 [18, 2],
                 [22, 20]
               ])
             }),
-            steps: pathRoadStyle(streetsDetailPalette.parkPath, googleParkPathWidthStops, {
+            steps: pathRoadStyle(mapboxRoadPalette.pathFromZ16, mapboxPathWidthStops, {
               casingMinZoom: 14,
-              casingColor: streetsDetailPalette.parkPath,
-              casingWidth: 0,
+              casingWidth: contextualPathLineWidth,
+              casingGapWidth: 0,
               // World V1 overzooms its native z15 tile above street level.
               // Keep this literal: a zoom-dependent dash is evaluated at the
               // source tile zoom and would remain a continuous line at z16+.
@@ -10935,18 +11835,35 @@ var streets = bindOfficialMapTheme(
               minZoom: 14,
               steps: true
             }),
-            pedestrian: pathRoadStyle(streetsDetailPalette.parkPath, googleParkPathWidthStops, {
+            pedestrian: pathRoadStyle(mapboxRoadPalette.pathFromZ16, mapboxPathWidthStops, {
               casingMinZoom: 14,
-              casingColor: streetsDetailPalette.parkPath,
-              casingWidth: 0,
               minZoom: 12
             })
           }
         }),
         streetsRoadRenderStack()
       ),
-      transit: transit8(mapboxRailTransitStyle(mapboxRailColor)),
-      buildings: withRenderStack8(
+      transit: transit8({
+        ...mapboxRailTransitStyle(mapboxRailColor),
+        // Fine blue routes fade in at regional scale; street-scale dashes
+        // and names follow the same hierarchy as the Standard reference.
+        ferry: {
+          color: streetsVisual.road.ferry,
+          minZoom: 8,
+          dash: expr11.step(expr11.zoom(), expr11.literal([1, 0]), [
+            [13, expr11.literal([12, 4])]
+          ]),
+          opacity: zoom10.linear([
+            [8, 0],
+            [17, 1]
+          ]),
+          width: zoom10.exponential(1.5, [
+            [14, 0.5],
+            [20, 1]
+          ])
+        }
+      }),
+      buildings: withRenderStack9(
         buildings7({
           mode: "flat",
           // 'flat' | '3d'.
@@ -10961,7 +11878,7 @@ var streets = bindOfficialMapTheme(
             fill: {
               color: buildingFillColor,
               minZoom: 14.25,
-              opacity: zoom9.linear([
+              opacity: zoom10.linear([
                 [14.25, 0],
                 [14.75, 0.5],
                 [15, 1]
@@ -10970,14 +11887,14 @@ var streets = bindOfficialMapTheme(
             outline: {
               color: buildingOutlineColor,
               minZoom: 14.5,
-              opacity: zoom9.linear([
+              opacity: zoom10.linear([
                 [14.5, 0],
                 [15, 0.6],
                 [16, 0.82],
                 [17, 0.96],
                 [18, 1]
               ]),
-              width: zoom9.linear([
+              width: zoom10.linear([
                 [14.5, 0.25],
                 [15, 0.4],
                 [16, 0.65],
@@ -10989,15 +11906,15 @@ var streets = bindOfficialMapTheme(
         }),
         streetsBuildingRenderStack()
       ),
-      labels: withRenderStack8(
+      labels: withRenderStack9(
         labels8({
           collisionPriority: "navigation",
           language: "local",
           // 'auto' | 'local' | 'en' | another language field suffix.
           places: "all",
           // 'none' | 'major' | 'all'.
-          roads: "all",
-          // 'none' | 'highways' | 'major' | 'streets' | 'all'.
+          // Street names use the ground passes below; shields remain in the foreground.
+          roads: "none",
           shields: "major",
           // 'none' | 'major' | 'all'.
           junctions: true,
@@ -11006,7 +11923,7 @@ var streets = bindOfficialMapTheme(
           // 'none' | 'major' | 'all'.
           styles: {
             places: {
-              // Mapbox Streets v12 hierarchy: continents disappear first, then
+              // Standard overview hierarchy: continents disappear first, then
               // countries and administrative regions hand over to settlements.
               continent: {
                 minZoom: 0.75,
@@ -11014,17 +11931,17 @@ var streets = bindOfficialMapTheme(
                 priority: 100,
                 text: {
                   color: streetsOverviewPalette.label,
-                  haloColor: streetsDetailPalette.halo,
+                  haloColor: streetsVisual.label.placeHalo,
                   haloWidth: 1.5,
                   letterSpacing: 0.05,
                   lineHeight: 1.1,
                   maxWidth: 6,
-                  opacity: zoom9.linear([
+                  opacity: zoom10.linear([
                     [0, 0.8],
                     [1.5, 0.5],
                     [2.5, 0.5]
                   ]),
-                  size: zoom9.exponential(0.5, [
+                  size: zoom10.exponential(0.5, [
                     [0, 10],
                     [2.5, 15]
                   ]),
@@ -11036,46 +11953,33 @@ var streets = bindOfficialMapTheme(
                 maxZoom: 10,
                 priority: 95,
                 text: {
+                  font: streetsVisual.font.default,
                   color: streetsOverviewPalette.label,
-                  haloColor: streetsDetailPalette.halo,
+                  haloColor: streetsVisual.label.placeHalo,
                   haloWidth: 1.25,
                   lineHeight: 1.1,
                   maxWidth: 6,
                   padding: 3,
-                  radialOffset: zoom9.step([
+                  radialOffset: zoom10.step([
                     [1, 0.6],
                     [8, 0]
                   ]),
-                  size: expr9.interpolate(
+                  size: expr11.interpolate(
                     { kind: "cubic-bezier", x1: 0.2, x2: 0.7, y1: 0, y2: 1 },
-                    expr9.zoom(),
+                    expr11.zoom(),
                     [
                       [
                         1,
-                        expr9.step(expr9.coalesce(expr9.get(field8("rank")), 99), 11, [
+                        expr11.step(expr11.coalesce(expr11.get(field10("rank")), 99), 11, [
                           [4, 9],
                           [5, 8]
                         ])
                       ],
-                      [
-                        5,
-                        expr9.step(expr9.coalesce(expr9.get(field8("rank")), 99), 14, [
-                          [3, 13],
-                          [5, 11]
-                        ])
-                      ],
-                      [
-                        7,
-                        expr9.step(expr9.coalesce(expr9.get(field8("rank")), 99), 16, [
-                          [3, 15],
-                          [5, 13]
-                        ])
-                      ],
                       [
                         9,
-                        expr9.step(expr9.coalesce(expr9.get(field8("rank")), 99), 18, [
-                          [3, 17],
-                          [5, 15]
+                        expr11.step(expr11.coalesce(expr11.get(field10("rank")), 99), 22, [
+                          [4, 19],
+                          [5, 17]
                         ])
                       ]
                     ]
@@ -11088,26 +11992,27 @@ var streets = bindOfficialMapTheme(
                 maxZoom: 9,
                 priority: 86,
                 text: {
+                  font: streetsVisual.font.places,
                   color: streetsOverviewPalette.label,
-                  haloColor: streetsDetailPalette.halo,
+                  haloColor: streetsVisual.label.placeHalo,
                   haloWidth: 1,
                   letterSpacing: 0.15,
                   maxWidth: 6,
                   opacity: 0.5,
-                  size: expr9.interpolate(
+                  size: expr11.interpolate(
                     { kind: "cubic-bezier", x1: 0.85, x2: 0.65, y1: 0.7, y2: 1 },
-                    expr9.zoom(),
+                    expr11.zoom(),
                     [
                       [
                         4,
-                        expr9.step(expr9.coalesce(expr9.get(field8("rank")), 99), 9, [
+                        expr11.step(expr11.coalesce(expr11.get(field10("rank")), 99), 9, [
                           [6, 8],
                           [7, 7]
                         ])
                       ],
                       [
                         9,
-                        expr9.step(expr9.coalesce(expr9.get(field8("rank")), 99), 21, [
+                        expr11.step(expr11.coalesce(expr11.get(field10("rank")), 99), 21, [
                           [6, 16],
                           [7, 14]
                         ])
@@ -11119,67 +12024,46 @@ var streets = bindOfficialMapTheme(
               },
               city: {
                 minZoom: 2,
-                maxZoom: 16,
-                priority: expr9.subtract(100, expr9.coalesce(expr9.get(field8("rank")), 20)),
+                maxZoom: 15,
+                priority: expr11.subtract(100, expr11.coalesce(expr11.get(field10("rank")), 20)),
                 text: {
-                  color: zoom9.linear([
+                  color: zoom10.linear([
                     [2, streetsOverviewPalette.label],
                     [4, streetsOverviewPalette.label],
                     [6, streetsVisual.label.settlement]
                   ]),
-                  haloColor: streetsDetailPalette.halo,
+                  haloColor: streetsVisual.label.placeHalo,
                   haloBlur: 1,
                   haloWidth: 1,
                   lineHeight: 1.1,
                   maxWidth: 7,
                   padding: 1,
-                  radialOffset: zoom9.step([
+                  radialOffset: zoom10.step([
                     [2, 0.6],
                     [8, 0]
                   ]),
-                  size: expr9.interpolate(
+                  size: expr11.interpolate(
                     { kind: "cubic-bezier", x1: 0.2, x2: 0.9, y1: 0, y2: 1 },
-                    expr9.zoom(),
+                    expr11.zoom(),
                     [
-                      [
-                        3,
-                        expr9.step(expr9.coalesce(expr9.get(field8("rank")), 99), 13, [
-                          [3, 12],
-                          [6, 10]
-                        ])
-                      ],
-                      [
-                        5,
-                        expr9.step(expr9.coalesce(expr9.get(field8("rank")), 99), 15, [
-                          [3, 13],
-                          [4, 12],
-                          [6, 11],
-                          [8, 10],
-                          [14, 9.5]
-                        ])
-                      ],
+                      [3, expr11.step(expr11.coalesce(expr11.get(field10("rank")), 99), 13, [[6, 11]])],
                       [
                         6,
-                        expr9.step(expr9.coalesce(expr9.get(field8("rank")), 99), 17, [
-                          [3, 15],
-                          [4, 13],
-                          [6, 12],
-                          [8, 10.5],
-                          [14, 10]
+                        expr11.step(expr11.coalesce(expr11.get(field10("rank")), 99), 18, [
+                          [6, 16],
+                          [7, 14]
                         ])
                       ],
                       [
                         8,
-                        expr9.step(expr9.coalesce(expr9.get(field8("rank")), 99), 20, [
-                          [3, 18],
-                          [6, 16],
-                          [9, 14],
-                          [12, 12]
+                        expr11.step(expr11.coalesce(expr11.get(field10("rank")), 99), 20, [
+                          [9, 16],
+                          [10, 14]
                         ])
                       ],
                       [
                         15,
-                        expr9.step(expr9.coalesce(expr9.get(field8("rank")), 99), 24, [
+                        expr11.step(expr11.coalesce(expr11.get(field10("rank")), 99), 24, [
                           [9, 20],
                           [12, 16],
                           [15, 14]
@@ -11187,54 +12071,41 @@ var streets = bindOfficialMapTheme(
                       ]
                     ]
                   ),
-                  // Regular minor-city labels leave room for the denser
-                  // regional label field used by Standard. Capital dots and
-                  // rank-driven size still carry the major-city hierarchy.
                   font: streetsVisual.font.default,
-                  variableAnchors: [
-                    "left",
-                    "right",
-                    "top",
-                    "bottom",
-                    "top-left",
-                    "top-right",
-                    "bottom-left",
-                    "bottom-right"
-                  ]
+                  variableAnchors: ["right"]
                 }
               },
               town: {
                 minZoom: 2,
-                maxZoom: 16,
-                priority: expr9.subtract(80, expr9.coalesce(expr9.get(field8("rank")), 20)),
+                maxZoom: 13,
+                priority: expr11.subtract(80, expr11.coalesce(expr11.get(field10("rank")), 20)),
                 text: {
                   color: streetsVisual.label.settlement,
-                  haloColor: streetsDetailPalette.halo,
+                  haloColor: streetsVisual.label.placeHalo,
                   haloBlur: 1,
                   haloWidth: 1,
                   lineHeight: 1.1,
                   maxWidth: 7,
                   padding: 1,
-                  radialOffset: zoom9.step([
+                  radialOffset: zoom10.step([
                     [2, 0.55],
-                    [8, 0.35],
-                    [11, 0]
+                    [8, 0]
                   ]),
-                  size: expr9.interpolate(
+                  size: expr11.interpolate(
                     { kind: "cubic-bezier", x1: 0.2, x2: 0.9, y1: 0, y2: 1 },
-                    expr9.zoom(),
+                    expr11.zoom(),
                     [
-                      [3, expr9.step(expr9.coalesce(expr9.get(field8("rank")), 99), 11, [[9, 10]])],
+                      [3, expr11.step(expr11.coalesce(expr11.get(field10("rank")), 99), 11, [[9, 10]])],
                       [
                         6,
-                        expr9.step(expr9.coalesce(expr9.get(field8("rank")), 99), 14, [
+                        expr11.step(expr11.coalesce(expr11.get(field10("rank")), 99), 14, [
                           [9, 12],
                           [12, 10]
                         ])
                       ],
                       [
                         8,
-                        expr9.step(expr9.coalesce(expr9.get(field8("rank")), 99), 16, [
+                        expr11.step(expr11.coalesce(expr11.get(field10("rank")), 99), 16, [
                           [9, 14],
                           [12, 12],
                           [15, 10]
@@ -11242,7 +12113,7 @@ var streets = bindOfficialMapTheme(
                       ],
                       [
                         13,
-                        expr9.step(expr9.coalesce(expr9.get(field8("rank")), 99), 22, [
+                        expr11.step(expr11.coalesce(expr11.get(field10("rank")), 99), 22, [
                           [9, 20],
                           [12, 16],
                           [15, 14]
@@ -11250,7 +12121,7 @@ var streets = bindOfficialMapTheme(
                       ]
                     ]
                   ),
-                  font: streetsVisual.font.default,
+                  font: streetsVisual.font.regular,
                   variableAnchors: [
                     "left",
                     "right",
@@ -11265,36 +12136,35 @@ var streets = bindOfficialMapTheme(
               },
               village: {
                 minZoom: 2,
-                maxZoom: 16,
-                priority: expr9.subtract(65, expr9.coalesce(expr9.get(field8("rank")), 20)),
+                maxZoom: 13,
+                priority: expr11.subtract(65, expr11.coalesce(expr11.get(field10("rank")), 20)),
                 text: {
                   color: streetsVisual.label.settlement,
-                  haloColor: streetsDetailPalette.halo,
+                  haloColor: streetsVisual.label.placeHalo,
                   haloBlur: 1,
                   haloWidth: 1,
                   lineHeight: 1.1,
                   maxWidth: 7,
                   padding: 1,
-                  radialOffset: zoom9.step([
+                  radialOffset: zoom10.step([
                     [2, 0.55],
-                    [8, 0.35],
-                    [11, 0]
+                    [8, 0]
                   ]),
-                  size: expr9.interpolate(
+                  size: expr11.interpolate(
                     { kind: "cubic-bezier", x1: 0.2, x2: 0.9, y1: 0, y2: 1 },
-                    expr9.zoom(),
+                    expr11.zoom(),
                     [
-                      [3, expr9.step(expr9.coalesce(expr9.get(field8("rank")), 99), 11, [[9, 10]])],
+                      [3, expr11.step(expr11.coalesce(expr11.get(field10("rank")), 99), 11, [[9, 10]])],
                       [
                         6,
-                        expr9.step(expr9.coalesce(expr9.get(field8("rank")), 99), 14, [
+                        expr11.step(expr11.coalesce(expr11.get(field10("rank")), 99), 14, [
                           [9, 12],
                           [12, 10]
                         ])
                       ],
                       [
                         8,
-                        expr9.step(expr9.coalesce(expr9.get(field8("rank")), 99), 16, [
+                        expr11.step(expr11.coalesce(expr11.get(field10("rank")), 99), 16, [
                           [9, 14],
                           [12, 12],
                           [15, 10]
@@ -11302,7 +12172,7 @@ var streets = bindOfficialMapTheme(
                       ],
                       [
                         13,
-                        expr9.step(expr9.coalesce(expr9.get(field8("rank")), 99), 22, [
+                        expr11.step(expr11.coalesce(expr11.get(field10("rank")), 99), 22, [
                           [9, 20],
                           [12, 16],
                           [15, 14]
@@ -11310,7 +12180,7 @@ var streets = bindOfficialMapTheme(
                       ]
                     ]
                   ),
-                  font: streetsVisual.font.default,
+                  font: streetsVisual.font.regular,
                   variableAnchors: [
                     "left",
                     "right",
@@ -11325,46 +12195,40 @@ var streets = bindOfficialMapTheme(
               },
               neighborhood: {
                 minZoom: 10,
-                maxZoom: 16,
-                priority: expr9.subtract(65, expr9.coalesce(expr9.get(field8("rank")), 20)),
+                maxZoom: 15,
+                priority: expr11.subtract(65, expr11.coalesce(expr11.get(field10("rank")), 20)),
                 text: {
+                  font: streetsVisual.font.default,
                   color: streetsVisual.label.neighborhood,
-                  haloColor: streetsDetailPalette.halo,
-                  haloBlur: 0.5,
+                  haloColor: streetsVisual.label.placeHalo,
+                  haloBlur: 0,
                   haloWidth: 1.3,
-                  letterSpacing: expr9.match(
-                    expr9.get(field8("class")),
+                  letterSpacing: expr11.match(
+                    expr11.get(field10("class")),
                     [{ labels: "suburb", value: 0.15 }],
                     0.05
                   ),
+                  lineHeight: 1.1,
                   maxWidth: 7,
-                  padding: 2,
-                  size: expr9.interpolate(
+                  padding: 3,
+                  size: expr11.interpolate(
                     { kind: "cubic-bezier", x1: 0.5, x2: 1, y1: 0, y2: 1 },
-                    expr9.zoom(),
+                    expr11.zoom(),
                     [
                       [
-                        10,
-                        expr9.match(
-                          expr9.get(field8("class")),
-                          [{ labels: "suburb", value: 10.5 }],
-                          10
-                        )
-                      ],
-                      [
-                        12,
-                        expr9.match(
-                          expr9.get(field8("class")),
+                        11,
+                        expr11.match(
+                          expr11.get(field10("class")),
                           [{ labels: "suburb", value: 12 }],
                           11.5
                         )
                       ],
                       [
                         15,
-                        expr9.match(
-                          expr9.get(field8("class")),
-                          [{ labels: "suburb", value: 15 }],
-                          14
+                        expr11.match(
+                          expr11.get(field10("class")),
+                          [{ labels: "suburb", value: 16 }],
+                          15
                         )
                       ]
                     ]
@@ -11377,11 +12241,12 @@ var streets = bindOfficialMapTheme(
                 maxZoom: 16,
                 priority: 40,
                 text: {
+                  font: streetsVisual.font.default,
                   color: streetsVisual.label.neighborhood,
-                  haloColor: streetsDetailPalette.halo,
+                  haloColor: streetsVisual.label.placeHalo,
                   haloBlur: 0.5,
                   haloWidth: 1,
-                  size: zoom9.linear([
+                  size: zoom10.linear([
                     [11, 10],
                     [15, 14]
                   ])
@@ -11389,32 +12254,17 @@ var streets = bindOfficialMapTheme(
               }
             },
             junctions: {
-              // Exit references are useful at street scale but overwhelm city overviews.
-              minZoom: 16,
+              // Standard exit references start at z14 and use the shield weight.
+              minZoom: 14,
               placement: "point",
               text: {
                 color: streetsVisual.label.road,
-                font: streetsVisual.font.default,
+                font: streetsVisual.font.places,
                 haloColor: streetsDetailPalette.halo,
-                haloWidth: 2,
-                size: 10
+                haloWidth: 1,
+                size: 9
               }
             },
-            roads: {
-              motorway: { ...roadLabelStyle("major"), minZoom: 10 },
-              trunk: { ...roadLabelStyle("major"), minZoom: 10 },
-              primary: { ...roadLabelStyle("major"), minZoom: 12 },
-              secondary: { ...roadLabelStyle("major"), minZoom: 12 },
-              tertiary: { ...roadLabelStyle("major"), minZoom: 13 },
-              minor: { ...roadLabelStyle("street"), minZoom: 13 },
-              service: { ...roadLabelStyle("street"), minZoom: 15 },
-              track: { ...roadLabelStyle("path"), visible: false },
-              pathway: { ...roadLabelStyle("path"), minZoom: 15 },
-              footway: { ...roadLabelStyle("path"), minZoom: 15 },
-              cycleway: { ...roadLabelStyle("path"), minZoom: 15 },
-              steps: { ...roadLabelStyle("path"), minZoom: 15 },
-              pedestrian: { ...roadLabelStyle("pedestrian"), minZoom: 12 }
-            },
             shields: {
               default: {
                 minZoom: 6,
@@ -11448,7 +12298,7 @@ var streets = bindOfficialMapTheme(
               detail: {
                 // Core switches to line placement at street scale while retaining viewport
                 // alignment, so each route reference remains horizontal during navigation.
-                spacing: zoom9.linear([
+                spacing: zoom10.linear([
                   [11, 400],
                   [14, 600]
                 ])
@@ -11473,11 +12323,12 @@ var streets = bindOfficialMapTheme(
                 minZoom: 1,
                 priority: 70,
                 text: {
+                  font: streetsVisual.font.water,
                   color: streetsDetailPalette.waterText,
                   haloColor: streetsVisual.label.waterHalo,
-                  haloWidth: 0.5,
-                  letterSpacing: 0.2,
-                  size: zoom9.linear([
+                  haloWidth: 0,
+                  letterSpacing: 0.25,
+                  size: zoom10.linear([
                     [1, 12],
                     [8, 18]
                   ])
@@ -11488,10 +12339,11 @@ var streets = bindOfficialMapTheme(
                 maxZoom: 15,
                 priority: 60,
                 text: {
+                  font: streetsVisual.font.water,
                   color: streetsDetailPalette.waterText,
                   haloColor: streetsVisual.label.waterHalo,
-                  haloWidth: 0.5,
-                  size: zoom9.linear([
+                  haloWidth: 0,
+                  size: zoom10.linear([
                     [5, 11],
                     [14, 16]
                   ])
@@ -11502,12 +12354,20 @@ var streets = bindOfficialMapTheme(
                 placement: "line-center",
                 priority: 65,
                 text: {
+                  font: streetsVisual.font.water,
                   color: streetsDetailPalette.waterText,
                   haloColor: streetsVisual.label.waterHalo,
-                  haloWidth: 0.5,
-                  letterSpacing: 0.12,
+                  haloWidth: 0,
+                  letterSpacing: expr11.match(
+                    expr11.get(field10("class")),
+                    [
+                      { labels: "ocean", value: 0.25 },
+                      { labels: ["sea", "bay"], value: 0.15 }
+                    ],
+                    0
+                  ),
                   maxAngle: 30,
-                  size: zoom9.linear([
+                  size: zoom10.linear([
                     [1, 12],
                     [8, 18]
                   ])
@@ -11516,15 +12376,17 @@ var streets = bindOfficialMapTheme(
               waterway: {
                 minZoom: 13,
                 placement: "line",
-                spacing: zoom9.linear([
+                spacing: zoom10.linear([
                   [15, 250],
                   [17, 400]
                 ]),
                 text: {
+                  font: streetsVisual.font.water,
                   color: streetsDetailPalette.waterText,
                   haloColor: streetsVisual.label.waterHalo,
+                  haloWidth: 0,
                   maxAngle: 30,
-                  size: zoom9.linear([
+                  size: zoom10.linear([
                     [13, 12],
                     [18, 18]
                   ])
@@ -11535,13 +12397,14 @@ var streets = bindOfficialMapTheme(
               minZoom: 8,
               priority: 68,
               text: {
+                font: streetsVisual.font.default,
                 color: streetsDetailPalette.transit,
                 haloColor: streetsDetailPalette.halo,
                 haloWidth: 1,
                 letterSpacing: 0.01,
                 lineHeight: 1.1,
                 maxWidth: 9,
-                size: zoom9.linear([
+                size: zoom10.linear([
                   [8, 12],
                   [14, 15]
                 ])
@@ -11552,9 +12415,9 @@ var streets = bindOfficialMapTheme(
         streetsLabelRenderStack()
       ),
       poi: poi4({
-        // World owns POI taxonomy, zoom eligibility and density tiers. Streets
-        // selects only the canonical categories and leaves final placement to
-        // MapLibre collision handling.
+        // World owns taxonomy, zoom eligibility, density ranks and importance. Streets
+        // shows every category at one density and places them all in World's importance
+        // order, so collision keeps the most relevant places whatever their category.
         categories: [
           "transport",
           "food-drink",
@@ -11578,26 +12441,30 @@ var streets = bindOfficialMapTheme(
         icons: true,
         labels: true,
         placement: {
-          // One collision unit: the circular icon is required while its name is
-          // optional and may move around the marker when space is tight.
+          // One collision unit: a POI shows its disc and its name, or nothing. Parking and
+          // toilets, whose pictogram says what they are, show the disc alone.
           coupleIconAndLabel: true,
-          iconPadding: 10,
-          textPadding: 12
+          iconPadding: 3,
+          order: "importance",
+          // Street and place names outrank everyday destinations ('navigation' labels), but
+          // not the places that make a city recognisable: World's two most important ranks.
+          prominentRank: 1,
+          textPadding: 3
         },
         styles: {
-          "arts-entertainment": sparseStreetsPoiStyle,
-          education: deferredStreetsPoiStyle,
-          "food-drink": streetsPoiStyle,
-          landmark: deferredStreetsPoiStyle,
-          lodging: sparseStreetsPoiStyle,
-          medical: deferredStreetsPoiStyle,
-          "park-nature": deferredStreetsPoiStyle,
-          "public-services": deferredStreetsPoiStyle,
-          religion: deferredStreetsPoiStyle,
-          retail: streetsPoiStyle,
-          "sport-leisure": streetsPoiStyle,
-          transport: streetsPoiStyle,
-          "visitor-amenity": deferredStreetsPoiStyle
+          "arts-entertainment": streetsPoiStyle("arts-entertainment"),
+          education: streetsPoiStyle("education"),
+          "food-drink": streetsPoiStyle("food-drink"),
+          landmark: streetsPoiStyle("landmark"),
+          lodging: streetsPoiStyle("lodging"),
+          medical: streetsPoiStyle("medical"),
+          "park-nature": streetsPoiStyle("park-nature"),
+          "public-services": streetsPoiStyle("public-services"),
+          religion: streetsPoiStyle("religion"),
+          retail: streetsPoiStyle("retail"),
+          "sport-leisure": streetsPoiStyle("sport-leisure"),
+          transport: streetsPoiStyle("transport"),
+          "visitor-amenity": streetsPoiStyle("visitor-amenity")
         }
       })
     },
@@ -11638,5 +12505,6 @@ export {
   soundingsIcons,
   streets2 as streets,
   streetsIcons,
+  streetsModels,
   streetsThemes
 };