@tileflow/maps 0.1.0-alpha.18 → 0.1.0-alpha.19

package/dist/index.js

@@ -556,22 +556,43 @@ var baedekerPathLabel = {
     ])
   }
 };
-function landcoverPattern(target, pattern, classes, options = {}) {
-  const classSelector = {
-    field: "class",
-    kind: "in",
-    values: classes
-  };
-  const selector = options.subclasses ? {
-    kind: "all",
-    selectors: [classSelector, { field: "subclass", kind: "in", values: options.subclasses }]
-  } : classSelector;
+function groundClass(...classes) {
+  return { field: "class", kind: "in", values: classes };
+}
+var gardenGround = {
+  kind: "all",
+  selectors: [
+    groundClass("garden"),
+    { kind: "not", selector: { field: "type", kind: "in", values: ["flowerbed"] } }
+  ]
+};
+var urbanParkGround = {
+  kind: "any",
+  selectors: [
+    {
+      kind: "all",
+      selectors: [
+        groundClass("park"),
+        {
+          kind: "not",
+          selector: {
+            field: "type",
+            kind: "in",
+            values: ["recreation_ground", "village_green", "zoo"]
+          }
+        }
+      ]
+    },
+    gardenGround
+  ]
+};
+function landcoverPattern(target, pattern, ground, options = {}) {
   const minZoom = options.minZoom ?? 9;
   return renderPass({
     placement: { above: target },
-    feature: "landcover",
+    feature: options.feature ?? "landuse",
     renderer: "fill",
-    selector,
+    selector: ground,
     style: {
       minZoom,
       opacity: zoom.linear([
@@ -625,8 +646,6 @@ var baedekerTheme = defineOfficialTheme({
     },
     buildings: {
       active: baedekerPalette.buildingActive,
-      businessCorridor: baedekerPalette.building,
-      businessCorridorOutline: baedekerPalette.buildingOutline,
       civic: "#C77659",
       commercial: "#C97E60",
       destination: baedekerPalette.buildingActive,
@@ -675,6 +694,8 @@ var baedekerTheme = defineOfficialTheme({
       wood: baedekerPalette.wood
     },
     landuse: {
+      activity: baedekerPalette.building,
+      activityOutline: baedekerPalette.buildingOutline,
       cemetery: "#D0D0B5",
       civic: "#E2D2BB",
       commercial: "#E3D0BB",
@@ -842,10 +863,6 @@ var baedeker = bindOfficialMapTheme(
       }),
       buildings: withRenderStack(
         buildings({
-          businessCorridor: {
-            fill: { visible: false },
-            outline: { visible: false }
-          },
           flat: {
             fill: {
               color: baedekerPalette.building,
@@ -1060,6 +1077,10 @@ var baedeker = bindOfficialMapTheme(
       }),
       land: withRenderStack(
         land({
+          activityAreas: {
+            fill: { visible: false },
+            outline: { visible: false }
+          },
           background: { opacity: 1, pattern: "baedeker-paper-grain" },
           globalLandcover: {
             color: expr.match(
@@ -1148,43 +1169,43 @@ var baedeker = bindOfficialMapTheme(
           rockHachures: landcoverPattern(
             "land.landcover.rock.fill",
             "baedeker-hachures",
-            ["rock"],
+            groundClass("rock"),
             { minZoom: 8, opacity: 0.44 }
           ),
           scrubHachures: landcoverPattern(
             "land.landcover.scrub.fill",
             "baedeker-hachures",
-            ["grass"],
-            { minZoom: 9, opacity: 0.34, subclasses: ["scrub"] }
+            groundClass("scrub"),
+            { minZoom: 9, opacity: 0.34 }
           ),
           orchardTexture: landcoverPattern(
             "land.landcover.urbanPark.fill",
             "baedeker-orchard",
-            ["grass"],
-            { minZoom: 11, opacity: 0.58, subclasses: ["garden", "orchard"] }
+            gardenGround,
+            { minZoom: 11, opacity: 0.58 }
           ),
           sandTexture: landcoverPattern(
             "land.landcover.sand.fill",
             "baedeker-sand",
-            ["sand", "beach"],
+            groundClass("sand"),
             { minZoom: 9, opacity: 0.48 }
           ),
           wetlandTexture: landcoverPattern(
             "land.landcover.wetland.fill",
             "baedeker-wetland",
-            ["wetland"],
-            { minZoom: 9, opacity: 0.56 }
+            groundClass("wetland"),
+            { feature: "landuseOverlay", minZoom: 9, opacity: 0.56 }
           ),
           parkStipple: landcoverPattern(
             "land.landcover.urbanPark.fill",
             "baedeker-park-stipple",
-            ["grass"],
-            { minZoom: 10, opacity: 0.74, subclasses: ["park", "garden"] }
+            urbanParkGround,
+            { minZoom: 10, opacity: 0.74 }
           ),
           woodStipple: landcoverPattern(
             "land.landcover.wood.fill",
             "baedeker-park-stipple",
-            ["wood", "forest"],
+            groundClass("wood"),
             { minZoom: 9, opacity: 0.5 }
           ),
           residentialTexture: landusePattern(
@@ -1580,14 +1601,7 @@ var baedeker = bindOfficialMapTheme(
             placement: { above: "water.bodies.fill" },
             feature: "water",
             renderer: "fill",
-            selector: {
-              coerce: "number",
-              fallback: 0,
-              field: "intermittent",
-              kind: "compare",
-              operator: "ne",
-              value: 1
-            },
+            selector: { field: "intermittent", kind: "compare", operator: "ne", value: true },
             style: {
               minZoom: 7,
               opacity: zoom.linear([
@@ -1602,14 +1616,7 @@ var baedeker = bindOfficialMapTheme(
             placement: { above: "water.intermittent.bodies.fill" },
             feature: "water",
             renderer: "fill",
-            selector: {
-              coerce: "number",
-              fallback: 0,
-              field: "intermittent",
-              kind: "compare",
-              operator: "eq",
-              value: 1
-            },
+            selector: { field: "intermittent", kind: "compare", operator: "eq", value: true },
             style: {
               minZoom: 9,
               opacity: 0.36,
@@ -1792,8 +1799,8 @@ var blueprintPrimaryPoiLabel = {
     opacity: 0.68
   }
 };
-var blueprintPoiFilterRank = expr2.toNumber(expr2.get(field2("poiFilterRank")), 6);
-var blueprintPoiSizeRank = expr2.toNumber(expr2.get(field2("poiSizeRank")), 17);
+var blueprintPoiFilterRank = expr2.toNumber(expr2.get(field2("filterrank")), 6);
+var blueprintPoiSizeRank = expr2.toNumber(expr2.get(field2("sizerank")), 17);
 var blueprintPoiPlacementPriority = expr2.add(
   expr2.multiply(blueprintPoiFilterRank, 17),
   blueprintPoiSizeRank
@@ -1801,7 +1808,7 @@ var blueprintPoiPlacementPriority = expr2.add(
 var blueprintPoiCalloutName = expr2.coalesce(
   expr2.get(field2("name")),
   expr2.get(field2("nameLatin")),
-  expr2.get(field2("nameEnglish")),
+  expr2.get(field2("nameEn")),
   ""
 );
 var prominentBuildingSelector = {
@@ -1834,7 +1841,7 @@ var prominentBuildingSelector = {
               selectors: [
                 {
                   fallback: "",
-                  field: "buildingTone",
+                  field: "tone",
                   kind: "compare",
                   operator: "eq",
                   value: "destination"
@@ -1844,14 +1851,14 @@ var prominentBuildingSelector = {
                   selectors: [
                     {
                       fallback: "",
-                      field: "buildingTone",
+                      field: "tone",
                       kind: "in",
                       values: ["active", "commercial"]
                     },
                     {
                       coerce: "number",
                       fallback: 0,
-                      field: "renderHeight",
+                      field: "height",
                       kind: "compare",
                       operator: "gte",
                       value: 24
@@ -1866,10 +1873,10 @@ var prominentBuildingSelector = {
     }
   ]
 };
-function technicalLandPattern(target, feature, pattern, selector, minZoom, opacity) {
+function technicalLandPattern(target, pattern, selector, minZoom, opacity) {
   return renderPass2({
     placement: { above: target },
-    feature,
+    feature: "landuse",
     renderer: "fill",
     selector,
     style: {
@@ -1909,8 +1916,6 @@ var blueprintTheme = defineOfficialTheme({
     },
     buildings: {
       active: blueprintPalette.buildingInk,
-      businessCorridor: blueprintPalette.building,
-      businessCorridorOutline: blueprintPalette.buildingMuted,
       civic: blueprintPalette.buildingInk,
       commercial: blueprintPalette.building,
       destination: blueprintPalette.buildingInk,
@@ -1959,6 +1964,8 @@ var blueprintTheme = defineOfficialTheme({
       wood: blueprintPalette.park
     },
     landuse: {
+      activity: blueprintPalette.building,
+      activityOutline: blueprintPalette.buildingMuted,
       cemetery: blueprintPalette.landDetail,
       civic: blueprintPalette.landDetail,
       commercial: blueprintPalette.landDetail,
@@ -2176,10 +2183,6 @@ var blueprint = bindOfficialMapTheme(
       }),
       buildings: withRenderStack2(
         buildings2({
-          businessCorridor: {
-            fill: { visible: false },
-            outline: { visible: false }
-          },
           flat: {
             fill: {
               color: blueprintPalette.building,
@@ -2274,11 +2277,11 @@ var blueprint = bindOfficialMapTheme(
               kind: "all",
               selectors: [
                 prominentBuildingSelector,
-                { field: "renderHeight", kind: "has" },
+                { field: "height", kind: "has" },
                 {
                   coerce: "number",
                   fallback: 0,
-                  field: "renderHeight",
+                  field: "height",
                   kind: "compare",
                   operator: "gte",
                   value: 24
@@ -2294,7 +2297,7 @@ var blueprint = bindOfficialMapTheme(
                 color: blueprintPalette.annotation,
                 field: expr2.concat(
                   "H \u2248 ",
-                  expr2.toString(expr2.toNumber(expr2.get(field2("renderHeight")), 0)),
+                  expr2.toString(expr2.toNumber(expr2.get(field2("height")), 0)),
                   " M"
                 ),
                 font: "Noto Sans Regular",
@@ -2515,6 +2518,10 @@ var blueprint = bindOfficialMapTheme(
       }),
       land: withRenderStack2(
         land2({
+          activityAreas: {
+            fill: { visible: false },
+            outline: { visible: false }
+          },
           background: { opacity: 1, pattern: "blueprint-grid" },
           globalLandcover: {
             color: expr2.match(
@@ -2650,36 +2657,56 @@ var blueprint = bindOfficialMapTheme(
         {
           landscapeHatch: technicalLandPattern(
             "land.landcover.wood.fill",
-            "landcover",
             "blueprint-landscape-hatch",
             {
               fallback: "",
               field: "class",
               kind: "in",
-              values: ["wood", "forest"]
+              values: ["wood"]
             },
             11,
             0.2
           ),
           parkHatch: technicalLandPattern(
             "land.landcover.urbanPark.fill",
-            "landcover",
             "blueprint-landscape-hatch",
+            // The parks and gardens the land module draws as urban parks.
             {
-              kind: "all",
+              kind: "any",
               selectors: [
                 {
-                  fallback: "",
-                  field: "class",
-                  kind: "compare",
-                  operator: "eq",
-                  value: "grass"
+                  kind: "all",
+                  selectors: [
+                    { fallback: "", field: "class", kind: "compare", operator: "eq", value: "park" },
+                    {
+                      kind: "not",
+                      selector: {
+                        fallback: "",
+                        field: "type",
+                        kind: "in",
+                        values: ["recreation_ground", "village_green", "zoo"]
+                      }
+                    }
+                  ]
                 },
                 {
-                  fallback: "",
-                  field: "subclass",
-                  kind: "in",
-                  values: ["park", "garden"]
+                  kind: "all",
+                  selectors: [
+                    {
+                      fallback: "",
+                      field: "class",
+                      kind: "compare",
+                      operator: "eq",
+                      value: "garden"
+                    },
+                    {
+                      fallback: "",
+                      field: "type",
+                      kind: "compare",
+                      operator: "ne",
+                      value: "flowerbed"
+                    }
+                  ]
                 }
               ]
             },
@@ -2688,20 +2715,25 @@ var blueprint = bindOfficialMapTheme(
           ),
           recreationHatch: technicalLandPattern(
             "land.landuse.recreation.fill",
-            "landuse",
             "blueprint-landscape-hatch",
             {
-              fallback: "",
-              field: "class",
-              kind: "in",
-              values: ["pitch", "track", "playground", "zoo"]
+              kind: "any",
+              selectors: [
+                { fallback: "", field: "class", kind: "in", values: ["pitch", "playground"] },
+                {
+                  kind: "all",
+                  selectors: [
+                    { fallback: "", field: "class", kind: "compare", operator: "eq", value: "park" },
+                    { fallback: "", field: "type", kind: "compare", operator: "eq", value: "zoo" }
+                  ]
+                }
+              ]
             },
             12,
             0.16
           ),
           industrialHatch: technicalLandPattern(
             "land.landuse.industrial.fill",
-            "landuse",
             "blueprint-building-hatch",
             {
               fallback: "",
@@ -2830,7 +2862,7 @@ var blueprint = bindOfficialMapTheme(
           architecturalCallouts: renderPass2({
             // Above every POI label: the first category listed is the top POI layer.
             placement: { above: "poi.transport.label" },
-            feature: "poi",
+            feature: "poiLabel",
             renderer: "symbol",
             selector: {
               kind: "all",
@@ -2838,7 +2870,7 @@ var blueprint = bindOfficialMapTheme(
                 { geometry: "point", kind: "geometry" },
                 {
                   fallback: "",
-                  field: "poiCategory",
+                  field: "class",
                   kind: "compare",
                   operator: "eq",
                   value: "landmark"
@@ -2848,14 +2880,14 @@ var blueprint = bindOfficialMapTheme(
                   selectors: [
                     { field: "name", kind: "has" },
                     { field: "nameLatin", kind: "has" },
-                    { field: "nameEnglish", kind: "has" }
+                    { field: "nameEn", kind: "has" }
                   ]
                 },
-                { field: "poiFilterRank", kind: "has" },
+                { field: "filterrank", kind: "has" },
                 {
                   coerce: "number",
                   fallback: 6,
-                  field: "poiFilterRank",
+                  field: "filterrank",
                   kind: "compare",
                   operator: "gte",
                   value: 0
@@ -2863,16 +2895,16 @@ var blueprint = bindOfficialMapTheme(
                 {
                   coerce: "number",
                   fallback: 6,
-                  field: "poiFilterRank",
+                  field: "filterrank",
                   kind: "compare",
                   operator: "lte",
                   value: 1
                 },
-                { field: "poiSizeRank", kind: "has" },
+                { field: "sizerank", kind: "has" },
                 {
                   coerce: "number",
                   fallback: 17,
-                  field: "poiSizeRank",
+                  field: "sizerank",
                   kind: "compare",
                   operator: "gte",
                   value: 0
@@ -2880,7 +2912,7 @@ var blueprint = bindOfficialMapTheme(
                 {
                   coerce: "number",
                   fallback: 17,
-                  field: "poiSizeRank",
+                  field: "sizerank",
                   kind: "compare",
                   operator: "lte",
                   value: 8
@@ -3114,14 +3146,14 @@ var blueprint = bindOfficialMapTheme(
                 },
                 {
                   fallback: "",
-                  field: "brunnel",
+                  field: "structure",
                   kind: "compare",
                   operator: "ne",
                   value: "bridge"
                 },
                 {
                   fallback: "",
-                  field: "brunnel",
+                  field: "structure",
                   kind: "compare",
                   operator: "ne",
                   value: "tunnel"
@@ -3312,14 +3344,7 @@ var blueprint = bindOfficialMapTheme(
             placement: { above: "water.bodies.fill" },
             feature: "water",
             renderer: "fill",
-            selector: {
-              coerce: "number",
-              fallback: 0,
-              field: "intermittent",
-              kind: "compare",
-              operator: "ne",
-              value: 1
-            },
+            selector: { field: "intermittent", kind: "compare", operator: "ne", value: true },
             style: {
               minZoom: 7,
               opacity: zoom2.linear([
@@ -3334,14 +3359,7 @@ var blueprint = bindOfficialMapTheme(
             placement: { above: "water.intermittent.bodies.fill" },
             feature: "water",
             renderer: "fill",
-            selector: {
-              coerce: "number",
-              fallback: 0,
-              field: "intermittent",
-              kind: "compare",
-              operator: "eq",
-              value: 1
-            },
+            selector: { field: "intermittent", kind: "compare", operator: "eq", value: true },
             style: {
               minZoom: 9,
               opacity: 0.2,
@@ -3492,7 +3510,7 @@ function streetName(minZoom, major = false) {
 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);
+  const principalPark = expr3.lte(expr3.toNumber(expr3.get(field3("sizerank")), 16), 4);
   return {
     minZoom,
     icon: {
@@ -3532,9 +3550,9 @@ function destination(image2, minZoom, color, featured = false, role = "caption")
     }
   };
 }
-function texture(above, feature, selector, pattern, minZoom, opacity) {
+function texture(above, selector, pattern, minZoom, opacity) {
   return renderPass3({
-    feature,
+    feature: "landuse",
     placement: { above },
     renderer: "fill",
     selector,
@@ -3548,7 +3566,7 @@ function texture(above, feature, selector, pattern, minZoom, opacity) {
     }
   });
 }
-var buildingTone = expr3.coalesce(expr3.get(field3("buildingTone")), "generic");
+var buildingTone = expr3.coalesce(expr3.get(field3("tone")), "generic");
 var buildingColor = expr3.match(
   buildingTone,
   [
@@ -3607,7 +3625,7 @@ var destinationSchedule = {
         },
         {
           kind: "compare",
-          field: "poiFilterRank",
+          field: "filterrank",
           coerce: "number",
           fallback: 6,
           operator: "lte",
@@ -3751,6 +3769,7 @@ var civica = bindOfficialMapTheme(
     modules: {
       land: withRenderStack3(
         land3({
+          activityAreas: { fill: { visible: false }, outline: { visible: false } },
           background: { color: ink.paper },
           globalLandcover: {
             minZoom: 0,
@@ -3819,12 +3838,31 @@ var civica = bindOfficialMapTheme(
         {
           parkGroves: texture(
             "land.landcover.urbanPark.fill",
-            "landcover",
+            // The parks and gardens the land module draws as urban parks.
             {
-              kind: "all",
+              kind: "any",
               selectors: [
-                { kind: "in", field: "class", values: ["grass"] },
-                { kind: "in", field: "subclass", values: ["park", "garden", "orchard"] }
+                {
+                  kind: "all",
+                  selectors: [
+                    { kind: "in", field: "class", values: ["park"] },
+                    {
+                      kind: "not",
+                      selector: {
+                        kind: "in",
+                        field: "type",
+                        values: ["recreation_ground", "village_green", "zoo"]
+                      }
+                    }
+                  ]
+                },
+                {
+                  kind: "all",
+                  selectors: [
+                    { kind: "in", field: "class", values: ["garden"] },
+                    { kind: "not", selector: { kind: "in", field: "type", values: ["flowerbed"] } }
+                  ]
+                }
               ]
             },
             "civica-park-groves",
@@ -3833,23 +3871,20 @@ var civica = bindOfficialMapTheme(
           ),
           woodlandGroves: texture(
             "land.landcover.wood.fill",
-            "landcover",
-            { kind: "in", field: "class", values: ["wood", "forest"] },
+            { kind: "in", field: "class", values: ["wood"] },
             "civica-park-groves",
             19,
             0.18
           ),
           orchardRows: texture(
             "land.landcover.grass.fill",
-            "landcover",
-            { kind: "in", field: "subclass", values: ["orchard", "vineyard"] },
+            { kind: "in", field: "class", values: ["orchard", "vineyard"] },
             "civica-orchard",
             19,
             0.2
           ),
           industrialHatch: texture(
             "land.landuse.industrial.fill",
-            "landuse",
             { kind: "in", field: "class", values: ["industrial"] },
             "civica-industrial-hatch",
             20,
@@ -3924,7 +3959,6 @@ var civica = bindOfficialMapTheme(
       buildings: withRenderStack3(
         buildings3({
           mode: "flat",
-          businessCorridor: { fill: { visible: false }, outline: { visible: false } },
           flat: {
             fill: {
               color: buildingColor,
@@ -4278,12 +4312,12 @@ var civica = bindOfficialMapTheme(
               selector: {
                 kind: "all",
                 selectors: [
-                  { kind: "in", field: "poiCategory", values: [category] },
-                  { kind: "has", field: "poiFilterRank" },
-                  { kind: "has", field: "poiSizeRank" },
+                  { kind: "in", field: "class", values: [category] },
+                  { kind: "has", field: "filterrank" },
+                  { kind: "has", field: "sizerank" },
                   {
                     kind: "compare",
-                    field: "poiFilterRank",
+                    field: "filterrank",
                     coerce: "number",
                     fallback: 6,
                     operator: "lte",
@@ -4297,7 +4331,7 @@ var civica = bindOfficialMapTheme(
                   },
                   {
                     kind: "compare",
-                    field: "poiFilterRank",
+                    field: "filterrank",
                     coerce: "number",
                     fallback: -1,
                     operator: "gte",
@@ -4305,7 +4339,7 @@ var civica = bindOfficialMapTheme(
                   },
                   {
                     kind: "compare",
-                    field: "poiSizeRank",
+                    field: "sizerank",
                     coerce: "number",
                     fallback: -1,
                     operator: "gte",
@@ -4313,7 +4347,7 @@ var civica = bindOfficialMapTheme(
                   },
                   {
                     kind: "compare",
-                    field: "poiSizeRank",
+                    field: "sizerank",
                     coerce: "number",
                     fallback: 17,
                     operator: "lte",
@@ -4330,14 +4364,14 @@ var civica = bindOfficialMapTheme(
                         selectors: [
                           {
                             kind: "compare",
-                            field: "poiFilterRank",
+                            field: "filterrank",
                             coerce: "number",
                             operator: "lte",
                             value: 1
                           },
                           {
                             kind: "compare",
-                            field: "poiSizeRank",
+                            field: "sizerank",
                             coerce: "number",
                             operator: "lt",
                             value: 16
@@ -4350,7 +4384,7 @@ var civica = bindOfficialMapTheme(
                   ...category === "transport" ? [
                     {
                       kind: "not",
-                      selector: { kind: "in", field: "poiType", values: ["airport"] }
+                      selector: { kind: "in", field: "type", values: ["airport"] }
                     },
                     {
                       kind: "step",
@@ -4358,7 +4392,7 @@ var civica = bindOfficialMapTheme(
                         kind: "not",
                         selector: {
                           kind: "in",
-                          field: "poiType",
+                          field: "type",
                           values: ["public_transit_facility"]
                         }
                       },
@@ -4499,6 +4533,61 @@ import {
   withRenderStack as withRenderStack4,
   zoom as zoom4
 } from "@tileflow/core";
+
+// src/official/world-roads.ts
+var worldRoadClasses = {
+  motorway: ["motorway"],
+  trunk: ["trunk"],
+  primary: ["primary"],
+  secondary: ["secondary"],
+  tertiary: ["tertiary"],
+  minor: ["street"],
+  service: ["service", "busway"],
+  track: ["track", "raceway"],
+  pathway: ["path"],
+  footway: ["path"],
+  cycleway: ["path"],
+  steps: ["path"],
+  pedestrian: ["pedestrian"]
+};
+var worldConstructionTypes = {
+  motorway: ["motorway", "motorway_link"],
+  trunk: ["trunk", "trunk_link"],
+  primary: ["primary", "primary_link"],
+  secondary: ["secondary", "secondary_link"],
+  tertiary: ["tertiary", "tertiary_link"],
+  minor: ["street", "residential", "unclassified", "living_street", "road"],
+  service: ["service", "busway"],
+  track: ["track", "raceway"],
+  pathway: ["path", "bridleway", "corridor"],
+  footway: ["footway"],
+  cycleway: ["cycleway"],
+  steps: ["steps"],
+  pedestrian: ["pedestrian"]
+};
+function worldConstructionSelector(...roadClasses) {
+  return {
+    kind: "all",
+    selectors: [
+      { kind: "compare", field: "class", operator: "eq", value: "construction" },
+      {
+        kind: "in",
+        field: "type",
+        values: [...new Set(roadClasses.flatMap((roadClass) => worldConstructionTypes[roadClass]))]
+      }
+    ]
+  };
+}
+function worldRoadSelector(roadClasses, options = {}) {
+  const inService = {
+    kind: "in",
+    field: "class",
+    values: [...new Set(roadClasses.flatMap((roadClass) => worldRoadClasses[roadClass]))]
+  };
+  return options.construction ? { kind: "any", selectors: [inService, worldConstructionSelector(...roadClasses)] } : inService;
+}
+
+// src/official/map-1777-roads.ts
 var majorWidths = [
   [3, 0.8],
   [12, 3.2],
@@ -4570,11 +4659,6 @@ var carriageways = [
   "service",
   "track"
 ];
-var aliases = {
-  minor: ["residential", "unclassified"],
-  service: ["busway", "bus_guideway"],
-  track: ["raceway"]
-};
 var restrictedAccess = expr4.all(
   expr4.has(field4("access")),
   expr4.not(
@@ -4590,17 +4674,18 @@ var restrictedAccess = expr4.all(
     )
   )
 );
-function roadSelector(classes, structure, extra = []) {
+function roadSelector(roads7, structure, extra = []) {
   return {
     kind: "all",
     selectors: [
       { kind: "geometry", geometry: "line" },
-      { kind: "in", field: "class", values: classes },
-      structure === "bridge" ? { kind: "compare", field: "brunnel", operator: "eq", value: "bridge" } : { kind: "not", selector: { kind: "in", field: "brunnel", values: ["bridge", "tunnel"] } },
+      roads7,
+      structure === "bridge" ? { kind: "compare", field: "structure", operator: "eq", value: "bridge" } : { kind: "not", selector: { kind: "in", field: "structure", values: ["bridge", "tunnel"] } },
       ...extra
     ]
   };
 }
+var link = { kind: "compare", field: "link", operator: "eq", value: true };
 function withMap1777RoadDetail(module, stack) {
   const detail = {};
   for (const roadClass of carriageways) {
@@ -4614,11 +4699,8 @@ function withMap1777RoadDetail(module, stack) {
             [
               // Preserve the domain's first-match width rules, including service ways.
               { when: restrictedAccess, value: base },
-              {
-                when: expr4.eq(expr4.toNumber(expr4.get(field4("expressway")), 0), 1),
-                value: base * 1.06
-              },
-              { when: expr4.eq(expr4.get(field4("ramp")), 1), value: base * 0.72 },
+              { when: expr4.eq(expr4.get(field4("expressway")), true), value: base * 1.06 },
+              { when: expr4.eq(expr4.get(field4("link")), true), value: base * 0.72 },
               ...roadClass === "service" ? Object.entries({
                 alley: 0.82,
                 crossover: 0.62,
@@ -4639,8 +4721,8 @@ function withMap1777RoadDetail(module, stack) {
         ...stops.slice(1)
       ]);
     };
-    const ordinary = [roadClass, ...aliases[roadClass] ?? []];
-    const construction = ordinary.filter((name) => name === roadClass || name === "raceway").map((name) => `${name}_construction`);
+    const ordinary = worldRoadSelector([roadClass]);
+    const construction = worldConstructionSelector(roadClass);
     const highway = roadClass === "motorway" || roadClass === "trunk";
     for (const phase of ["casing", "fill"]) {
       const paint = road.surface?.[phase];
@@ -4651,7 +4733,7 @@ function withMap1777RoadDetail(module, stack) {
         selector: roadSelector(
           ordinary,
           "surface",
-          highway && phase === "fill" ? [{ kind: "compare", field: "ramp", operator: "ne", value: 1 }] : []
+          highway && phase === "fill" ? [{ kind: "compare", field: "link", operator: "ne", value: true }] : []
         ),
         style: {}
       });
@@ -4680,17 +4762,8 @@ function withMap1777RoadDetail(module, stack) {
         detail[`${roadClass}-bridge-ordinary`] = refineRenderTarget2({
           target: `roads.classes.${roadClass}.bridge.fill`,
           renderer: "line",
-          selector: roadSelector([...ordinary, ...construction], "bridge", [
-            {
-              kind: "not",
-              selector: {
-                kind: "all",
-                selectors: [
-                  { kind: "in", field: "class", values: ordinary },
-                  { kind: "compare", field: "ramp", operator: "eq", value: 1 }
-                ]
-              }
-            }
+          selector: roadSelector(worldRoadSelector([roadClass], { construction: true }), "bridge", [
+            { kind: "not", selector: { kind: "all", selectors: [ordinary, link] } }
           ]),
           style: {}
         });
@@ -4700,9 +4773,7 @@ function withMap1777RoadDetail(module, stack) {
         renderer: "line",
         // Receiving carriageways cover the end of a link in the same band.
         placement: { below: `roads.classes.track.${structure}.fill` },
-        selector: roadSelector(ordinary, structure, [
-          { kind: "compare", field: "ramp", operator: "eq", value: 1 }
-        ]),
+        selector: roadSelector(ordinary, structure, [link]),
         style: {
           ...fill,
           width: width(0),
@@ -4712,7 +4783,7 @@ function withMap1777RoadDetail(module, stack) {
               [
                 { when: restrictedAccess, value: 0.9 },
                 { when: expr4.eq(expr4.get(field4("surface")), "unpaved"), value: 0.82 },
-                { when: expr4.eq(expr4.toNumber(expr4.get(field4("indoor")), 0), 1), value: 0.72 }
+                { when: expr4.eq(expr4.get(field4("indoor")), true), value: 0.72 }
               ],
               0.94
             )
@@ -4992,14 +5063,11 @@ function map1777RoadStyle(roadClass, fillColor, casingColor, minZoom, options =
 }
 var map1777BuildingHeight = expr5.max(
   0,
-  expr5.toNumber(expr5.coalesce(expr5.get(field5("renderHeight")), 5), 5)
+  expr5.toNumber(expr5.coalesce(expr5.get(field5("height")), 5), 5)
 );
 var map1777BuildingBase = expr5.max(
   0,
-  expr5.min(
-    expr5.toNumber(expr5.coalesce(expr5.get(field5("renderMinHeight")), 0), 0),
-    map1777BuildingHeight
-  )
+  expr5.min(expr5.toNumber(expr5.coalesce(expr5.get(field5("minHeight")), 0), 0), map1777BuildingHeight)
 );
 function map1777PathStyle(roadClass, color, minZoom, dash) {
   const style = map1777RoadStyle(roadClass, color, map1777Palette.roadCasing, minZoom, {
@@ -5060,9 +5128,9 @@ var map1777PathLabel = {
     ])
   }
 };
-function map1777StreetName(style, classes, subclasses) {
+function map1777StreetName(style, roadClasses) {
   return renderPass5({
-    feature: "roadName",
+    feature: "roadLabel",
     renderer: "symbol",
     requirements: ["roads"],
     placement: "below-buildings",
@@ -5070,8 +5138,7 @@ function map1777StreetName(style, classes, subclasses) {
       kind: "all",
       selectors: [
         { field: "name", kind: "has" },
-        { field: "class", kind: "in", values: classes },
-        ...subclasses ? [{ field: "subclass", kind: "in", values: subclasses }] : []
+        worldRoadSelector(roadClasses, { construction: true })
       ]
     },
     style: {
@@ -5081,29 +5148,49 @@ function map1777StreetName(style, classes, subclasses) {
         field: expr5.coalesce(
           expr5.get(field5("name")),
           expr5.get(field5("nameLatin")),
-          expr5.get(field5("nameEnglish"))
+          expr5.get(field5("nameEn"))
         )
       }
     }
   });
 }
 var map1777FieldVariant = expr5.modulo(expr5.toNumber(expr5.id(), 0), 3);
-function landcoverPattern2(target, pattern, classes, options = {}) {
-  const classSelector = {
-    field: "class",
-    kind: "in",
-    values: classes
-  };
-  const selector = options.subclasses ? {
-    kind: "all",
-    selectors: [classSelector, { field: "subclass", kind: "in", values: options.subclasses }]
-  } : classSelector;
+function groundClass2(...classes) {
+  return { field: "class", kind: "in", values: classes };
+}
+var urbanParkGround2 = {
+  kind: "any",
+  selectors: [
+    {
+      kind: "all",
+      selectors: [
+        groundClass2("park"),
+        {
+          kind: "not",
+          selector: {
+            field: "type",
+            kind: "in",
+            values: ["recreation_ground", "village_green", "zoo"]
+          }
+        }
+      ]
+    },
+    {
+      kind: "all",
+      selectors: [
+        groundClass2("garden"),
+        { kind: "not", selector: { field: "type", kind: "in", values: ["flowerbed"] } }
+      ]
+    }
+  ]
+};
+function landcoverPattern2(target, pattern, ground, options = {}) {
   const minZoom = options.minZoom ?? 9;
   return renderPass5({
     placement: { above: target },
-    feature: "landcover",
+    feature: options.feature ?? "landuse",
     renderer: "fill",
-    selector,
+    selector: ground,
     style: {
       minZoom,
       opacity: zoom5.linear([
@@ -5162,8 +5249,6 @@ var map1777Theme = defineOfficialTheme({
     },
     buildings: {
       active: map1777Palette.buildingActive,
-      businessCorridor: map1777Palette.building,
-      businessCorridorOutline: map1777Palette.buildingOutline,
       civic: "#AF4C42",
       commercial: "#C25B4D",
       destination: map1777Palette.buildingActive,
@@ -5212,6 +5297,8 @@ var map1777Theme = defineOfficialTheme({
       wood: map1777Palette.wood
     },
     landuse: {
+      activity: map1777Palette.building,
+      activityOutline: map1777Palette.buildingOutline,
       cemetery: "#BCC99D",
       civic: "#E8DCC3",
       commercial: "#E5D4BC",
@@ -5372,10 +5459,6 @@ var map1777Day = bindOfficialMapTheme(
             edgeColor: map1777Palette.buildingOutline,
             colorVariation: 0.035
           },
-          businessCorridor: {
-            fill: { visible: false },
-            outline: { visible: false }
-          },
           flat: {
             fill: {
               color: map1777Palette.building,
@@ -5430,14 +5513,8 @@ var map1777Day = bindOfficialMapTheme(
             placement: { above: "buildings.flat.outline" },
             feature: "building",
             renderer: "extrusion",
-            selector: {
-              kind: "all",
-              selectors: [
-                { field: "hide3d", kind: "compare", operator: "ne", value: true },
-                { field: "hide3d", kind: "compare", operator: "ne", value: 1 },
-                { field: "hide3d", kind: "compare", operator: "ne", value: "1" }
-              ]
-            },
+            // A footprint whose parts draw it in 3D says `extrude: false`.
+            selector: { field: "extrude", kind: "compare", operator: "ne", value: false },
             style: {
               base: map1777BuildingBase,
               color: map1777Palette.building,
@@ -5613,51 +5690,46 @@ var map1777Day = bindOfficialMapTheme(
         {
           // Own these ground labels here: replacing the roads module must not
           // leave refinements pointing at optional road-label contributions.
-          roadPaths: map1777StreetName(
-            map1777PathLabel,
-            ["path", "path_construction"],
-            ["path", "bridleway", "corridor", "footway", "cycleway", "steps", "pedestrian"]
-          ),
-          roadTrack: map1777StreetName(map1777PathLabel, [
-            "track",
-            "raceway",
-            "track_construction",
-            "raceway_construction"
+          roadPaths: map1777StreetName(map1777PathLabel, [
+            "pathway",
+            "footway",
+            "cycleway",
+            "steps",
+            "pedestrian"
           ]),
+          roadTrack: map1777StreetName(map1777PathLabel, ["track"]),
           roadService: map1777StreetName(
             { ...map1777RoadLabel, minZoom: 16, priority: 48, spacing: 340 },
-            ["service", "busway", "bus_guideway", "service_construction"]
+            ["service"]
           ),
-          roadMinor: map1777StreetName({ ...map1777RoadLabel, minZoom: 14 }, [
-            "minor",
-            "residential",
-            "unclassified",
-            "minor_construction"
-          ]),
+          roadMinor: map1777StreetName({ ...map1777RoadLabel, minZoom: 14 }, ["minor"]),
           roadTertiary: map1777StreetName({ ...map1777RoadLabel, minZoom: 12, priority: 72 }, [
-            "tertiary",
-            "tertiary_construction"
+            "tertiary"
           ]),
           roadSecondary: map1777StreetName(
             { ...map1777RoadLabel, minZoom: 11, priority: 80, spacing: 360 },
-            ["secondary", "secondary_construction"]
+            ["secondary"]
           ),
           roadPrimary: map1777StreetName(
             { ...map1777RoadLabel, minZoom: 10, priority: 86, spacing: 360 },
-            ["primary", "primary_construction"]
+            ["primary"]
           ),
           roadTrunk: map1777StreetName(
             { ...map1777RoadLabel, minZoom: 9, priority: 90, spacing: 400 },
-            ["trunk", "trunk_construction"]
+            ["trunk"]
           ),
           roadMotorway: map1777StreetName(
             { ...map1777RoadLabel, minZoom: 8, priority: 94, spacing: 400 },
-            ["motorway", "motorway_construction"]
+            ["motorway"]
           )
         }
       ),
       land: withRenderStack5(
         land4({
+          activityAreas: {
+            fill: { visible: false },
+            outline: { visible: false }
+          },
           background: { opacity: 1, pattern: "map-1777-paper-grain" },
           globalLandcover: {
             color: expr5.match(
@@ -5768,36 +5840,37 @@ var map1777Day = bindOfficialMapTheme(
               ],
               token3.image("land.field.hatch")
             ),
-            ["farmland"],
+            groundClass2("farmland", "orchard", "vineyard"),
             { minZoom: 8, opacity: 0.82 }
           ),
-          heathTexture: landcoverPattern2("land.landcover.scrub.fill", "map-1777-heath", ["grass"], {
-            minZoom: 9,
-            opacity: 0.72,
-            subclasses: ["scrub"]
-          }),
+          heathTexture: landcoverPattern2(
+            "land.landcover.scrub.fill",
+            "map-1777-heath",
+            groundClass2("scrub"),
+            { minZoom: 9, opacity: 0.72 }
+          ),
           orchardTexture: landcoverPattern2(
             "land.landcover.urbanPark.fill",
             "map-1777-orchard",
-            ["grass"],
-            { minZoom: 11, opacity: 0.64, subclasses: ["park", "garden"] }
+            urbanParkGround2,
+            { minZoom: 11, opacity: 0.64 }
           ),
           sandTexture: landcoverPattern2(
             "land.landcover.sand.fill",
             "map-1777-sand",
-            ["sand", "beach"],
+            groundClass2("sand"),
             { minZoom: 9, opacity: 0.72 }
           ),
           wetlandTexture: landcoverPattern2(
             "land.landcover.wetland.fill",
             "map-1777-wetland",
-            ["wetland"],
-            { minZoom: 9, opacity: 0.78 }
+            groundClass2("wetland"),
+            { feature: "landuseOverlay", minZoom: 9, opacity: 0.78 }
           ),
           woodTexture: landcoverPattern2(
             "land.landcover.wood.fill",
             "map-1777-woodland",
-            ["wood", "forest"],
+            groundClass2("wood"),
             { minZoom: 8, opacity: 0.82 }
           ),
           residentialTexture: landusePattern2(
@@ -6146,14 +6219,7 @@ var map1777Day = bindOfficialMapTheme(
             placement: { below: "water.bodies.outline" },
             feature: "water",
             renderer: "line",
-            selector: {
-              coerce: "number",
-              fallback: 0,
-              field: "intermittent",
-              kind: "compare",
-              operator: "ne",
-              value: 1
-            },
+            selector: { field: "intermittent", kind: "compare", operator: "ne", value: true },
             style: {
               color: map1777Palette.waterBank,
               minZoom: 9,
@@ -6171,14 +6237,7 @@ var map1777Day = bindOfficialMapTheme(
             placement: { above: "water.bodies.fill" },
             feature: "water",
             renderer: "fill",
-            selector: {
-              coerce: "number",
-              fallback: 0,
-              field: "intermittent",
-              kind: "compare",
-              operator: "ne",
-              value: 1
-            },
+            selector: { field: "intermittent", kind: "compare", operator: "ne", value: true },
             style: {
               minZoom: 7,
               opacity: zoom5.linear([
@@ -6193,14 +6252,7 @@ var map1777Day = bindOfficialMapTheme(
             placement: { above: "water.intermittent.bodies.fill" },
             feature: "water",
             renderer: "fill",
-            selector: {
-              coerce: "number",
-              fallback: 0,
-              field: "intermittent",
-              kind: "compare",
-              operator: "eq",
-              value: 1
-            },
+            selector: { field: "intermittent", kind: "compare", operator: "eq", value: true },
             style: {
               minZoom: 9,
               opacity: 0.2,
@@ -6309,8 +6361,6 @@ function createSiegfriedTheme(id, colorScheme, palette) {
       },
       buildings: {
         active: palette.ink,
-        businessCorridor: palette.paper,
-        businessCorridorOutline: palette.ink,
         civic: palette.ink,
         commercial: palette.ink,
         destination: palette.ink,
@@ -6359,6 +6409,8 @@ function createSiegfriedTheme(id, colorScheme, palette) {
         wood: palette.paper
       },
       landuse: {
+        activity: palette.paper,
+        activityOutline: palette.ink,
         cemetery: palette.paper,
         civic: palette.paper,
         commercial: palette.paper,
@@ -6579,13 +6631,13 @@ function landcoverFilter(classes, options = {}) {
     values: classes
   };
   const selectors = [classSelector];
-  if (options.subclasses) {
-    selectors.push({ field: "subclass", kind: "in", values: options.subclasses });
+  if (options.types) {
+    selectors.push({ field: "type", kind: "in", values: options.types });
   }
-  if (options.excludeSubclasses) {
+  if (options.excludeTypes) {
     selectors.push({
-      branches: [{ result: false, values: options.excludeSubclasses }],
-      field: "subclass",
+      branches: [{ result: false, values: options.excludeTypes }],
+      field: "type",
       kind: "match",
       otherwise: true
     });
@@ -6596,7 +6648,7 @@ function landcoverPattern3(target, pattern, classes, options = {}) {
   const minZoom = options.minZoom ?? 9;
   return renderPass6({
     placement: { above: target },
-    feature: "landcover",
+    feature: options.feature ?? "landuse",
     renderer: "fill",
     selector: landcoverFilter(classes, options),
     style: {
@@ -6612,7 +6664,7 @@ function landcoverPattern3(target, pattern, classes, options = {}) {
 function postContourLandcoverPattern(target, pattern, classes, options) {
   return renderPass6({
     placement: { above: target },
-    feature: "landcover",
+    feature: "landuse",
     renderer: "fill",
     requirements: ["land"],
     selector: landcoverFilter(classes, options),
@@ -6722,10 +6774,6 @@ var siegfried = bindOfficialMapTheme(
         }
       }),
       buildings: buildings5({
-        businessCorridor: {
-          fill: { visible: false },
-          outline: { visible: false }
-        },
         flat: {
           fill: {
             color: siegfriedPalette.ink,
@@ -6967,6 +7015,10 @@ var siegfried = bindOfficialMapTheme(
       }),
       land: withRenderStack6(
         land5({
+          activityAreas: {
+            fill: { visible: false },
+            outline: { visible: false }
+          },
           background: { opacity: 1, pattern: siegfriedVisual.pattern["paper-grain"] },
           globalLandcover: { visible: false },
           landcover: {
@@ -7022,26 +7074,26 @@ var siegfried = bindOfficialMapTheme(
           forestPattern: landcoverPattern3(
             "land.landcover.wood.outline",
             siegfriedVisual.pattern.forest,
-            ["wood", "forest"],
+            ["wood"],
             { minZoom: 8, opacity: 0.84 }
           ),
           gravelPattern: landcoverPattern3(
             "land.landcover.sand.fill",
             siegfriedVisual.pattern.gravel,
-            ["sand", "beach"],
+            ["sand"],
             { minZoom: 10, opacity: 0.64 }
           ),
           orchardPattern: landcoverPattern3(
             "land.landcover.urbanPark.fill",
             siegfriedVisual.pattern.orchard,
-            ["grass"],
-            { minZoom: 12, opacity: 0.62, subclasses: ["garden", "orchard"] }
+            ["garden"],
+            { excludeTypes: ["flowerbed"], minZoom: 12, opacity: 0.62 }
           ),
           wetlandPattern: landcoverPattern3(
             "land.landcover.wetland.fill",
             siegfriedVisual.pattern.wetland,
             ["wetland"],
-            { minZoom: 9, opacity: 0.8 }
+            { feature: "landuseOverlay", minZoom: 9, opacity: 0.8 }
           )
         }
       ),
@@ -7275,7 +7327,7 @@ var siegfried = bindOfficialMapTheme(
         {
           rockMask: renderPass6({
             placement: { below: "water.bodies.fill" },
-            feature: "landcover",
+            feature: "landuse",
             renderer: "fill",
             requirements: ["land"],
             selector: { field: "class", kind: "in", values: ["rock"] },
@@ -7290,7 +7342,7 @@ var siegfried = bindOfficialMapTheme(
             siegfriedVisual.pattern.rock,
             ["rock"],
             {
-              excludeSubclasses: ["scree", "talus"],
+              excludeTypes: ["scree", "talus"],
               minZoom: 9,
               opacity: 0.9
             }
@@ -7302,23 +7354,23 @@ var siegfried = bindOfficialMapTheme(
             {
               minZoom: 10,
               opacity: 0.82,
-              subclasses: ["scree", "talus"]
+              types: ["scree", "talus"]
             }
           ),
           glacierMask: renderPass6({
             placement: { below: "water.bodies.fill" },
-            feature: "landcover",
+            feature: "landuse",
             renderer: "fill",
             requirements: ["land"],
-            selector: { field: "class", kind: "in", values: ["ice", "glacier"] },
+            selector: { field: "class", kind: "in", values: ["ice"] },
             style: { color: siegfriedPalette.paper, minZoom: 7, opacity: 0.98 }
           }),
           glacierPattern: renderPass6({
             placement: { above: "water.render.glacierMask" },
-            feature: "landcover",
+            feature: "landuse",
             renderer: "fill",
             requirements: ["land"],
-            selector: { field: "class", kind: "in", values: ["ice", "glacier"] },
+            selector: { field: "class", kind: "in", values: ["ice"] },
             style: {
               minZoom: 8,
               opacity: zoom6.linear([
@@ -7331,10 +7383,10 @@ var siegfried = bindOfficialMapTheme(
           }),
           glacierOutline: renderPass6({
             placement: { above: "water.render.glacierPattern" },
-            feature: "landcover",
+            feature: "landuse",
             renderer: "line",
             requirements: ["land"],
-            selector: { field: "class", kind: "in", values: ["ice", "glacier"] },
+            selector: { field: "class", kind: "in", values: ["ice"] },
             style: {
               cap: "round",
               color: siegfriedPalette.blue,
@@ -7348,14 +7400,7 @@ var siegfried = bindOfficialMapTheme(
             placement: { above: "water.bodies.outline" },
             feature: "water",
             renderer: "fill",
-            selector: {
-              coerce: "number",
-              fallback: 0,
-              field: "intermittent",
-              kind: "compare",
-              operator: "ne",
-              value: 1
-            },
+            selector: { field: "intermittent", kind: "compare", operator: "ne", value: true },
             style: {
               minZoom: 7,
               opacity: zoom6.linear([
@@ -7370,14 +7415,7 @@ var siegfried = bindOfficialMapTheme(
             placement: { above: "water.intermittent.bodies.fill" },
             feature: "water",
             renderer: "fill",
-            selector: {
-              coerce: "number",
-              fallback: 0,
-              field: "intermittent",
-              kind: "compare",
-              operator: "eq",
-              value: 1
-            },
+            selector: { field: "intermittent", kind: "compare", operator: "eq", value: true },
             style: {
               minZoom: 9,
               opacity: 0.22,
@@ -7797,6 +7835,8 @@ var soundings = bindOfficialMapTheme(
         water: "all"
       }),
       land: land6({
+        // Buildings are off, and so are the areas where their activity concentrates.
+        activityAreas: { fill: { visible: false }, outline: { visible: false } },
         background: { opacity: 1, pattern: "soundings-paper-grain" },
         globalLandcover: {
           color: expr7.match(
@@ -7913,7 +7953,7 @@ var soundings = bindOfficialMapTheme(
           // Ferry names are operational context, not a recommended track.
           ferryLabels: renderPass7({
             placement: { above: "transit.ferry" },
-            feature: "roadName",
+            feature: "roadLabel",
             renderer: "symbol",
             selector: {
               kind: "all",
@@ -7924,7 +7964,7 @@ var soundings = bindOfficialMapTheme(
                   kind: "any",
                   selectors: [
                     { field: "class", kind: "compare", operator: "eq", value: "ferry" },
-                    { field: "subclass", kind: "compare", operator: "eq", value: "ferry" }
+                    { field: "type", kind: "compare", operator: "eq", value: "ferry" }
                   ]
                 }
               ]
@@ -8108,7 +8148,7 @@ var soundings = bindOfficialMapTheme(
               kind: "any",
               selectors: [
                 { field: "class", kind: "compare", operator: "eq", value: "pier" },
-                { field: "subclass", kind: "compare", operator: "eq", value: "pier" }
+                { field: "type", kind: "compare", operator: "eq", value: "pier" }
               ]
             },
             style: {
@@ -8136,7 +8176,7 @@ var soundings = bindOfficialMapTheme(
               kind: "any",
               selectors: [
                 { field: "class", kind: "compare", operator: "eq", value: "pier" },
-                { field: "subclass", kind: "compare", operator: "eq", value: "pier" }
+                { field: "type", kind: "compare", operator: "eq", value: "pier" }
               ]
             },
             style: {
@@ -8159,14 +8199,7 @@ var soundings = bindOfficialMapTheme(
             placement: { above: "water.bodies.fill" },
             feature: "water",
             renderer: "fill",
-            selector: {
-              coerce: "number",
-              fallback: 0,
-              field: "intermittent",
-              kind: "compare",
-              operator: "ne",
-              value: 1
-            },
+            selector: { field: "intermittent", kind: "compare", operator: "ne", value: true },
             style: {
               minZoom: 7,
               opacity: zoom7.linear([
@@ -8181,14 +8214,7 @@ var soundings = bindOfficialMapTheme(
             placement: { above: "water.intermittent.bodies.fill" },
             feature: "water",
             renderer: "fill",
-            selector: {
-              coerce: "number",
-              fallback: 0,
-              field: "intermittent",
-              kind: "compare",
-              operator: "eq",
-              value: 1
-            },
+            selector: { field: "intermittent", kind: "compare", operator: "eq", value: true },
             style: { minZoom: 9, opacity: 0.16, pattern: "soundings-water-dots" }
           })
         }
@@ -8299,6 +8325,12 @@ import {
   zoom as zoom11
 } from "@tileflow/core";
 
+// src/official/streets-climate.ts
+var streetsClimateImage = Object.freeze({
+  url: "https://api.tileflow.dev/base/2a01d3fc884ee9aea013c506a7e4625b5d869e45f1c467e63cc0829f2e7314a1/images/streets-climate-v1.png",
+  sha256: "bede2213b0ba74d77111fe182458ee30d219b989a9c11fe5ce121de1c549dfc4"
+});
+
 // src/official/streets-ground-and-access.ts
 import { expr as expr9, field as field8, renderPass as renderPass8, token as token5, zoom as zoom9 } from "@tileflow/core";
 var streetsDayGroundColors = {
@@ -8321,12 +8353,13 @@ var streetsDayGroundColors = {
   "roads.accessOverview": "#D7D3CE"
 };
 var streetsAgriculturalColor = expr9.match(
-  expr9.get(field8("subclass")),
-  [
-    { labels: "orchard", value: token5.color("landcover.orchard") },
-    { labels: "plant_nursery", value: token5.color("landcover.nursery") }
-  ],
-  token5.color("landcover.farmland")
+  expr9.get(field8("class")),
+  [{ labels: "orchard", value: token5.color("landcover.orchard") }],
+  expr9.match(
+    expr9.get(field8("type")),
+    [{ labels: "plant_nursery", value: token5.color("landcover.nursery") }],
+    token5.color("landcover.farmland")
+  )
 );
 var streetsGroundBackground = zoom9.linear([
   [10, token5.color("surface.background.overview")],
@@ -8342,7 +8375,7 @@ var streetsAccessOverview = renderPass8({
     selectors: [
       { kind: "geometry", geometry: "line" },
       { kind: "in", field: "class", values: ["track", "service"] },
-      { kind: "compare", field: "brunnel", operator: "ne", value: "tunnel" }
+      { kind: "compare", field: "structure", operator: "ne", value: "tunnel" }
     ]
   },
   style: {
@@ -8390,7 +8423,12 @@ function overviewWidth(width, local) {
     const factor = value[i] === 10 ? 1.12 : value[i] === 12 ? local ? 1.125 : 1.25 : value[i] === 14 ? 1.08 : 1;
     if (factor !== 1) {
       const authored = value[i + 1];
-      value[i + 1] = ["case", ["==", ["get", field9("ramp")], 1], authored, ["*", authored, factor]];
+      value[i + 1] = [
+        "case",
+        ["==", ["get", field9("link")], true],
+        authored,
+        ["*", authored, factor]
+      ];
     }
   }
   return { ...width, value };
@@ -8466,7 +8504,7 @@ function streetsOverviewRoads(roads7) {
           selectors: [
             { kind: "geometry", geometry: "line" },
             { kind: "in", field: "class", values: ["motorway", "trunk"] },
-            { kind: "compare", field: "brunnel", operator: "ne", value: "tunnel" }
+            { kind: "compare", field: "structure", operator: "ne", value: "tunnel" }
           ]
         },
         style: {
@@ -8501,18 +8539,18 @@ function streetsOverviewRoads(roads7) {
 }
 
 // src/official/streets-cartography.ts
-var visibleBuilding = {
-  kind: "all",
-  selectors: [
-    { field: "hide3d", kind: "compare", operator: "ne", value: true },
-    { field: "hide3d", kind: "compare", operator: "ne", value: 1 },
-    { field: "hide3d", kind: "compare", operator: "ne", value: "1" },
-    { field: "hide3d", kind: "compare", operator: "ne", value: "true" }
+var activityOpacity = expr10.interpolate(
+  { kind: "linear" },
+  expr10.toNumber(expr10.coalesce(expr10.get(field10("activity")), 1), 1),
+  [
+    [1, 0.4],
+    [5, 1]
   ]
-};
+);
+var visibleBuilding = { field: "extrude", kind: "compare", operator: "ne", value: false };
 function buildingColor2(outline = false, raised = false) {
   return expr10.match(
-    expr10.get(field10("buildingTone")),
+    expr10.get(field10("tone")),
     [
       {
         labels: ["commercial", "active"],
@@ -8561,8 +8599,29 @@ function withStreetsCartography(base) {
       land: withRenderStack8(
         {
           ...withoutStack(land8),
-          // The climate underlay is paused until it has a shared URL and visibility-aware loading.
-          // Its source, generator and attribution are retained in assets/streets/climate.
+          globalLandcoverUnderlay: {
+            url: streetsClimateImage.url,
+            coordinates: [
+              [-180, 85.0511287798066],
+              [180, 85.0511287798066],
+              [180, -85.0511287798066],
+              [-180, -85.0511287798066]
+            ],
+            attribution: 'Climate context: <a href="https://doi.org/10.1038/s41597-023-02549-6">Beck et al. (2023)</a>, <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>; colours and smoothing adapted by Tileflow',
+            maxZoom: 11,
+            opacity: zoom11.linear([
+              [0, token7.number("land.climate.opacity")],
+              [7, token7.number("land.climate.opacity")],
+              [8, token7.number("land.climate.opacity85")],
+              [9, token7.number("land.climate.opacity78")],
+              [10, token7.number("land.climate.opacity")],
+              [10.5, token7.number("land.climate.opacity55")],
+              [10.75, token7.number("land.climate.opacity25")],
+              [11, 0]
+            ])
+          },
+          // Streets draws activity areas in its own pass below, fading them out under buildings.
+          activityAreas: { fill: { visible: false }, outline: { visible: false } },
           background: { ...land8.background, color: streetsGroundBackground },
           landcover: {
             ...land8.landcover,
@@ -8574,17 +8633,19 @@ function withStreetsCartography(base) {
         },
         {
           ...landStack,
-          businessArea: renderPass10({
+          // Where shops, food, services and offices concentrate: stronger with the area's
+          // activity level, from 1 to 5, until buildings take over.
+          activityAreas: renderPass10({
             placement: { above: "land.landuse.residential.fill" },
-            feature: "landuse",
+            feature: "landuseOverlay",
             renderer: "fill",
-            selector: { field: "class", kind: "compare", operator: "eq", value: "business_area" },
+            selector: { field: "class", kind: "compare", operator: "eq", value: "activity_area" },
             style: {
-              color: token7.color("landuse.businessCorridor"),
+              color: token7.color("landuse.activity"),
               minZoom: 11,
-              opacity: zoom11.linear([
-                [15, 1],
-                [15.5, 0.75],
+              opacity: expr10.interpolate({ kind: "linear" }, expr10.zoom(), [
+                [15, activityOpacity],
+                [15.5, expr10.multiply(activityOpacity, 0.75)],
                 [16.25, 0]
               ])
             }
@@ -8685,7 +8746,14 @@ import {
   withRenderStack as withRenderStack9
 } from "@tileflow/core";
 function withStreetsConstruction(module, stack) {
-  const constructionPath = expr11.eq(expr11.get(field11("class")), "path_construction");
+  const constructionPath = expr11.all(
+    expr11.eq(expr11.get(field11("class")), "construction"),
+    expr11.match(
+      expr11.get(field11("type")),
+      [{ labels: [...worldConstructionTypes.pathway, "footway", "cycleway", "steps"], value: true }],
+      false
+    )
+  );
   const marks = Object.fromEntries(
     [
       "motorway",
@@ -8704,16 +8772,12 @@ function withStreetsConstruction(module, stack) {
         kind: "all",
         selectors: [
           { kind: "geometry", geometry: "line" },
-          {
-            kind: "in",
-            field: "class",
-            values: roadClass === "track" ? ["track_construction", "raceway_construction"] : [`${roadClass}_construction`]
-          },
-          { kind: "compare", field: "brunnel", operator: "ne", value: "bridge" },
-          { kind: "compare", field: "brunnel", operator: "ne", value: "tunnel" },
+          worldConstructionSelector(roadClass),
+          { kind: "compare", field: "structure", operator: "ne", value: "bridge" },
+          { kind: "compare", field: "structure", operator: "ne", value: "tunnel" },
           {
             kind: "step",
-            fallback: { kind: "compare", field: "ramp", operator: "ne", value: 1 },
+            fallback: { kind: "compare", field: "link", operator: "ne", value: true },
             stops: [{ zoom: 12, selector: { kind: "literal", value: true } }]
           }
         ]
@@ -9073,7 +9137,7 @@ function streetsPoiImage() {
     return {
       labels: category,
       value: first ? expr12.match(
-        expr12.get(field12("poiType")),
+        expr12.get(field12("type")),
         [first, ...rest],
         categoryRole
       ) : categoryRole
@@ -9088,7 +9152,7 @@ function streetsPoiImage() {
     expr12.get(field12("mode")),
     [firstMode, ...otherModes],
     expr12.match(
-      expr12.get(field12("poiCategory")),
+      expr12.get(field12("class")),
       [firstCategory, ...otherCategories],
       token9.image("poi.landmark")
     )
@@ -9100,7 +9164,7 @@ function streetsPoiImage() {
   return expr12.case(
     [
       {
-        when: expr12.eq(expr12.get(field12("poiCategory")), "transport"),
+        when: expr12.eq(expr12.get(field12("class")), "transport"),
         value: expr12.match(
           expr12.get(field12("network")),
           [firstNetwork, ...otherNetworks],
@@ -9387,7 +9451,7 @@ var rows = [
     ]
   ],
   [
-    "landuse.commercial landuse.businessCorridor buildings.businessCorridor",
+    "landuse.commercial landuse.activity",
     [
       "#FFDDBF",
       "#FEECDF",
@@ -10376,8 +10440,6 @@ var streetsDayColors = {
   "boundaries.maritime": "#FF668C",
   "boundaries.regional": "#FF809A",
   "buildings.active": "#EBECDE",
-  "buildings.businessCorridor": "#F9EFDD",
-  "buildings.businessCorridorOutline": "#D7D1C2",
   "buildings.civic": "#EBECDE",
   "buildings.commercial": "#EBECDE",
   "buildings.contactShadow": "#888378",
@@ -10458,8 +10520,8 @@ var streetsDayColors = {
   "landcover.villageGreen": "#ABEFBF",
   "landcover.wetland": "#C1F2CF",
   "landcover.wood": "#9BE1AF",
-  "landuse.businessCorridor": "#F9EFDD",
-  "landuse.businessCorridorOutline": "#E0DAC9",
+  "landuse.activity": "#F9EFDD",
+  "landuse.activityOutline": "#E0DAC9",
   "landuse.cemetery": "#BCECCB",
   "landuse.civic": "#F0F2EE",
   "landuse.commercial": "#F9EFDD",
@@ -10774,9 +10836,11 @@ function streetsCartographyThemes(base) {
             ["roads.path.groundOpacity", 1],
             ["labels.shield.spacing11", 420],
             ["labels.shield.spacing13", 480],
+            // Only daylight shows the climate; the other appearances keep the same layer clear,
+            // so every appearance shares one cartography.
             ...[100, 85, 78, 55, 25].map((value) => [
               `land.climate.opacity${value === 100 ? "" : value}`,
-              value / 100
+              name === "light" ? value / 100 : 0
             ])
           ])
         }
@@ -10822,11 +10886,11 @@ var defaultLighting = {
     sun: {
       azimuth: 180,
       altitude: 70,
-      color: "#FFF5E8",
-      intensity: 0.3,
-      shadowIntensity: 0.8
+      color: "#FFFFFF",
+      intensity: 0.2,
+      shadowIntensity: 1
     },
-    ambient: { color: "#E2EBF7", intensity: 0.7 }
+    ambient: { color: "#FFFFFF", intensity: 0.8 }
   },
   dusk: {
     sun: {
@@ -10866,7 +10930,7 @@ var fadedLighting = withLightColors({
     sun: "rgb(252.513725, 222.937729, 169.273879)",
     ambient: "rgb(254, 244.681815, 235.980392)"
   },
-  day: { sun: "#FFF8EF", ambient: "#EBF0F8" },
+  day: { sun: "#FFFFFF", ambient: "#FFFFFF" },
   dusk: {
     sun: "rgb(252.513725, 217.250027, 164.945083)",
     ambient: "rgb(87.776471, 97.427724, 126.419608)"
@@ -11222,8 +11286,6 @@ var streetsLightColors = {
   "boundaries.maritime": "#648AA4",
   "boundaries.regional": "#CE9698",
   "buildings.active": "#EFEADD",
-  "buildings.businessCorridor": "#F4E6D8",
-  "buildings.businessCorridorOutline": "#DCCFC3",
   "buildings.civic": "#EFEADD",
   "buildings.commercial": "#EFEADD",
   "buildings.destination": "#EFEADD",
@@ -11296,8 +11358,8 @@ var streetsLightColors = {
   "landcover.villageGreen": "#C2E7B5",
   "landcover.wetland": "#D7E9DE",
   "landcover.wood": "#A7DFA0",
-  "landuse.businessCorridor": "#FBEDE2",
-  "landuse.businessCorridorOutline": "#E6D8CA",
+  "landuse.activity": "#FBEDE2",
+  "landuse.activityOutline": "#E6D8CA",
   "landuse.cemetery": "#CCE5C6",
   "landuse.civic": "#F5F1F0",
   "landuse.commercial": "#FBEDE2",
@@ -11390,8 +11452,6 @@ var streetsDarkColors = {
   "boundaries.maritime": "#8192B3",
   "boundaries.regional": "#76586D",
   "buildings.active": "#373743",
-  "buildings.businessCorridor": "#45424E",
-  "buildings.businessCorridorOutline": "#56515A",
   "buildings.civic": "#2C2E3D",
   "buildings.commercial": "#2C2E3D",
   "buildings.destination": "#3A3947",
@@ -11459,8 +11519,8 @@ var streetsDarkColors = {
   "landcover.villageGreen": "#46564D",
   "landcover.wetland": "#33474A",
   "landcover.wood": "#34453F",
-  "landuse.businessCorridor": "#45424E",
-  "landuse.businessCorridorOutline": "#5A5561",
+  "landuse.activity": "#45424E",
+  "landuse.activityOutline": "#5A5561",
   "landuse.cemetery": "#45534D",
   "landuse.civic": "#2D3043",
   "landuse.commercial": "#45424E",
@@ -11632,8 +11692,6 @@ function calibratedStreetsColors(preset, theme) {
     }
     if (role === "buildings.extrusion")
       return { ...parseStreetsColor(profile.extrusion), a: color.a };
-    if (role.startsWith("buildings.businessCorridor"))
-      return shift(base["landuse.commercial"], profile.commercial);
     if (role.startsWith("buildings.") || role === "surface.building")
       return shift(base["buildings.fill"], profile.building);
     if (role === "labels.ferryHalo") return water8();
@@ -11658,7 +11716,7 @@ function calibratedStreetsColors(preset, theme) {
     if (role.startsWith("roads.")) return shift(base["roads.default"], profile.road);
     if (role.startsWith("landuse.recreation"))
       return shift(base["landuse.recreation"], profile.sport);
-    if (role.startsWith("landuse.businessCorridor") || role === "landuse.commercial")
+    if (role.startsWith("landuse.activity") || role === "landuse.commercial")
       return shift(base["landuse.commercial"], profile.commercial);
     const green = role.startsWith("landcover.") && !/(?:^|\.)(?:barren|ice|rock|sand|snow|urban)$/.test(role);
     if (green || role === "surface.park" || role === "landuse.cemetery")
@@ -11889,8 +11947,8 @@ var streetsVisual = {
   ),
   landuse: Object.fromEntries(
     [
-      "businessCorridor",
-      "businessCorridorOutline",
+      "activity",
+      "activityOutline",
       "cemetery",
       "civic",
       "commercial",
@@ -12323,8 +12381,8 @@ var streetsSurfacePalette = {
     [14, streetsVisual.surface.background]
   ]),
   barren: streetsVisual.landcover.barren,
-  businessCorridor: streetsVisual.landuse.businessCorridor,
-  businessCorridorOutline: streetsVisual.landuse.businessCorridorOutline,
+  activity: streetsVisual.landuse.activity,
+  activityOutline: streetsVisual.landuse.activityOutline,
   cemetery: streetsVisual.landuse.cemetery,
   civic: streetsVisual.landuse.civic,
   crop: streetsVisual.landcover.farmland,
@@ -12410,8 +12468,8 @@ var protectedAreaOpacity = zoom13.linear([
   [6, 1]
 ]);
 function streetsPoiStyle(category) {
-  const filterRank = expr14.toNumber(expr14.get(field14("poiFilterRank")), 6);
-  const sizeRank = expr14.toNumber(expr14.get(field14("poiSizeRank")), 17);
+  const filterRank = expr14.toNumber(expr14.get(field14("filterrank")), 6);
+  const sizeRank = expr14.toNumber(expr14.get(field14("sizerank")), 17);
   const featured = expr14.all(expr14.lte(filterRank, 0), expr14.lt(sizeRank, 5));
   const featuredDetail = expr14.all(expr14.lte(filterRank, 1), expr14.lt(sizeRank, 13));
   return {
@@ -12493,19 +12551,17 @@ var buildingOutlineColor = mapboxBuildingPalette.outline;
 var building3dColor = streetsVisual.building.extrusion;
 var buildingShadowColor = streetsVisual.building.shadow;
 var visibleBuilding3dSelector = {
-  kind: "all",
-  selectors: [
-    { field: "hide3d", kind: "compare", operator: "ne", value: true },
-    { field: "hide3d", kind: "compare", operator: "ne", value: 1 },
-    { field: "hide3d", kind: "compare", operator: "ne", value: "1" }
-  ]
+  field: "extrude",
+  kind: "compare",
+  operator: "ne",
+  value: false
 };
 var groundedBuilding3dSelector = {
   kind: "all",
   selectors: [
     visibleBuilding3dSelector,
     {
-      field: "renderMinHeight",
+      field: "minHeight",
       coerce: "number",
       fallback: 0,
       kind: "compare",
@@ -12515,9 +12571,9 @@ var groundedBuilding3dSelector = {
     {
       kind: "any",
       selectors: [
-        { kind: "not", selector: { kind: "has", field: "renderHeight" } },
+        { kind: "not", selector: { kind: "has", field: "height" } },
         {
-          field: "renderHeight",
+          field: "height",
           coerce: "number",
           fallback: 5,
           kind: "compare",
@@ -12528,16 +12584,10 @@ var groundedBuilding3dSelector = {
     }
   ]
 };
-var building3dHeight = expr14.max(
-  0,
-  expr14.toNumber(expr14.coalesce(expr14.get(field14("renderHeight")), 5), 5)
-);
+var building3dHeight = expr14.max(0, expr14.toNumber(expr14.coalesce(expr14.get(field14("height")), 5), 5));
 var building3dBase = expr14.max(
   0,
-  expr14.min(
-    expr14.toNumber(expr14.coalesce(expr14.get(field14("renderMinHeight")), 0), 0),
-    building3dHeight
-  )
+  expr14.min(expr14.toNumber(expr14.coalesce(expr14.get(field14("minHeight")), 0), 0), building3dHeight)
 );
 var roadLineCap = zoom13.step([
   [3, "butt"],
@@ -12556,7 +12606,7 @@ var pathLineJoin = zoom13.step([
   [16, "round"]
 ]);
 var circularRoadBaseWidth = expr14.match(
-  expr14.coalesce(expr14.get(field14("class")), "minor"),
+  expr14.coalesce(expr14.get(field14("class")), "street"),
   [
     { labels: "motorway", value: 6 },
     { labels: "trunk", value: 5.5 },
@@ -12586,14 +12636,13 @@ var tunnelBorderWidth = 1;
 function roadWidth(widths2, oneWayScale, rampWidths) {
   const augmentedWidths = [...widths2].sort(([left], [right]) => left - right);
   const widthOutput = (level, width) => {
-    const ordinaryWidth = oneWayScale === 1 ? width : expr14.match(
-      expr14.get(field14("oneway")),
-      [{ labels: [1, -1], value: width * oneWayScale }],
+    const ordinaryWidth = oneWayScale === 1 ? width : expr14.case(
+      [{ when: expr14.eq(expr14.get(field14("oneway")), true), value: width * oneWayScale }],
       width
     );
     const rampWidth = rampWidths ? sampleRoadWidth(rampWidths, level) : void 0;
     const surfaceWidth = rampWidth === void 0 ? ordinaryWidth : expr14.case(
-      [{ when: expr14.eq(expr14.get(field14("ramp")), 1), value: rampWidth }],
+      [{ when: expr14.eq(expr14.get(field14("link")), true), value: rampWidth }],
       ordinaryWidth
     );
     return surfaceWidth;
@@ -12633,7 +12682,7 @@ function roadCasingWidth(major) {
   return expr14.interpolate({ kind: "exponential", base: 1.5 }, expr14.zoom(), [
     [
       14,
-      major ? expr14.case([{ when: expr14.eq(expr14.get(field14("ramp")), 1), value: 0.8 }], 1) : 0.8
+      major ? expr14.case([{ when: expr14.eq(expr14.get(field14("link")), true), value: 0.8 }], 1) : 0.8
     ],
     [22, 2]
   ]);
@@ -12697,7 +12746,7 @@ function rankAtMost(value) {
   return {
     coerce: "number",
     fallback: 99,
-    field: "rank",
+    field: "symbolrank",
     kind: "compare",
     operator: "lte",
     value
@@ -12707,7 +12756,7 @@ var namedCitySelector = {
   kind: "all",
   selectors: [
     { field: "name", kind: "has" },
-    { field: "class", kind: "compare", operator: "eq", value: "city" },
+    { field: "type", kind: "compare", operator: "eq", value: "city" },
     {
       kind: "any",
       selectors: [
@@ -12736,7 +12785,7 @@ function streetsBoundaryRenderStack() {
   return {
     admin2Background: renderPass13({
       placement: { below: "boundaries.admin4" },
-      feature: "boundary",
+      feature: "admin",
       renderer: "line",
       selector: {
         kind: "all",
@@ -12778,7 +12827,7 @@ function streetsBoundaryRenderStack() {
     }),
     admin4Background: renderPass13({
       placement: { below: "boundaries.admin4" },
-      feature: "boundary",
+      feature: "admin",
       renderer: "line",
       selector: {
         kind: "all",
@@ -12825,7 +12874,7 @@ function streetsBoundaryRenderStack() {
     // metro zooms onward, so Streets adds it as an explicit semantic pass.
     admin6: renderPass13({
       placement: { above: "boundaries.admin4" },
-      feature: "boundary",
+      feature: "admin",
       renderer: "line",
       selector: {
         kind: "all",
@@ -12869,14 +12918,14 @@ function streetsBoundaryRenderStack() {
 function streetsLandRenderStack() {
   return {
     // Core orders general cover, parks, lawn detail and mapped built surfaces.
-    // Streets adds only its own business-corridor treatment.
-    businessArea: renderPass13({
+    // Streets adds only its own activity-area treatment.
+    activityAreas: renderPass13({
       placement: { above: "land.landuse.residential.fill" },
-      feature: "landuse",
+      feature: "landuseOverlay",
       renderer: "fill",
-      selector: { field: "class", kind: "compare", operator: "eq", value: "business_area" },
+      selector: { field: "class", kind: "compare", operator: "eq", value: "activity_area" },
       style: {
-        color: streetsSurfacePalette.businessCorridor,
+        color: streetsSurfacePalette.activity,
         minZoom: 11,
         opacity: 1
       }
@@ -13045,7 +13094,7 @@ function streetsBuildingRenderStack() {
 function streetsLabelRenderStack() {
   return {
     ferry: renderPass13({
-      feature: "roadName",
+      feature: "roadLabel",
       placement: "below-labels",
       renderer: "symbol",
       selector: {
@@ -13057,7 +13106,7 @@ function streetsLabelRenderStack() {
             kind: "any",
             selectors: [
               { field: "class", kind: "compare", operator: "eq", value: "ferry" },
-              { field: "subclass", kind: "compare", operator: "eq", value: "ferry" }
+              { field: "type", kind: "compare", operator: "eq", value: "ferry" }
             ]
           }
         ]
@@ -13088,14 +13137,14 @@ function streetsLabelRenderStack() {
     }),
     settlementMarker: renderPass13({
       placement: { below: "labels.places.city" },
-      feature: "place",
+      feature: "placeLabel",
       renderer: "circle",
       selector: namedCitySelector,
       style: {
         color: streetsVisual.label.settlement,
         maxZoom: 8,
         minZoom: 2,
-        radius: expr14.step(expr14.coalesce(expr14.get(field14("rank")), 99), 3, [
+        radius: expr14.step(expr14.coalesce(expr14.get(field14("symbolrank")), 99), 3, [
           [3, 2.5],
           [7, 2]
         ]),
@@ -13132,7 +13181,7 @@ function streetsLabelRenderStack() {
           {
             field: "class",
             kind: "in",
-            values: ["state", "province", "aboriginal_lands"]
+            values: ["state", "territory"]
           },
           {
             fallback: rankAtMost(1),
@@ -13159,7 +13208,7 @@ function streetsLabelRenderStack() {
         kind: "all",
         selectors: [
           { field: "name", kind: "has" },
-          { field: "class", kind: "compare", operator: "eq", value: "town" },
+          { field: "type", kind: "compare", operator: "eq", value: "town" },
           {
             fallback: rankAtMost(7),
             kind: "step",
@@ -13180,7 +13229,7 @@ function streetsLabelRenderStack() {
         kind: "all",
         selectors: [
           { field: "name", kind: "has" },
-          { field: "class", kind: "compare", operator: "eq", value: "village" },
+          { field: "type", kind: "compare", operator: "eq", value: "village" },
           {
             fallback: { kind: "literal", value: false },
             kind: "step",
@@ -13203,7 +13252,7 @@ function streetsLabelRenderStack() {
         selectors: [
           { field: "name", kind: "has" },
           {
-            field: "class",
+            field: "type",
             kind: "in",
             values: ["suburb", "neighbourhood", "quarter", "borough"]
           },
@@ -13238,7 +13287,14 @@ function cityRoadSurfaceColor(roadClass) {
       expr14.case(
         [
           {
-            when: expr14.eq(expr14.get(field14("class")), `${roadClass}_construction`),
+            when: expr14.all(
+              expr14.eq(expr14.get(field14("class")), "construction"),
+              expr14.match(
+                expr14.get(field14("type")),
+                [{ labels: [...worldConstructionTypes[roadClass]], value: true }],
+                false
+              )
+            ),
             value: roadSurfaceColor
           },
           {
@@ -13266,16 +13322,12 @@ function streetsRoadEligibility() {
             kind: "all",
             selectors: [
               { kind: "geometry", geometry: "line" },
-              {
-                kind: "in",
-                field: "class",
-                values: [roadClass, `${roadClass}_construction`]
-              },
+              worldRoadSelector([roadClass], { construction: true }),
               {
                 kind: "compare",
-                field: "ramp",
+                field: "link",
                 operator: phase === "rampFill" ? "eq" : "ne",
-                value: 1
+                value: true
               },
               {
                 kind: "step",
@@ -13286,8 +13338,8 @@ function streetsRoadEligibility() {
                     selector: {
                       kind: "all",
                       selectors: [
-                        { kind: "compare", field: "brunnel", operator: "ne", value: "tunnel" },
-                        { kind: "compare", field: "brunnel", operator: "ne", value: "bridge" }
+                        { kind: "compare", field: "structure", operator: "ne", value: "tunnel" },
+                        { kind: "compare", field: "structure", operator: "ne", value: "bridge" }
                       ]
                     }
                   }
@@ -13345,10 +13397,8 @@ function streetsRoadRenderStack() {
           ]),
           padding: 0,
           pitchAlignment: "map",
-          rotate: expr14.case(
-            [{ when: expr14.eq(expr14.get(field14("oneway")), -1), value: 180 }],
-            0
-          ),
+          // World orients one-way geometry in the direction of travel.
+          rotate: 0,
           rotationAlignment: "map",
           size: expr14.interpolate({ kind: "linear" }, expr14.zoom(), [
             [15, 0.38],
@@ -13366,10 +13416,7 @@ function streetsRoadRenderStack() {
         ]),
         text: {
           allowOverlap: true,
-          field: expr14.case(
-            [{ when: expr14.eq(expr14.get(field14("oneway")), -1), value: "\u2190" }],
-            "\u2192"
-          ),
+          field: "\u2192",
           ignorePlacement: true,
           keepUpright: false,
           opacity: 0,
@@ -13560,14 +13607,23 @@ function roadLabelStyle(kind, minZoom) {
     // Resolve dense parallel streets by road hierarchy, not incidental tile order.
     // All classes share this expression so the compiler retains one collision network.
     priority: expr14.match(
-      expr14.coalesce(expr14.get(field14("class")), "minor"),
+      // A road under construction ranks as the road it becomes.
+      expr14.case(
+        [
+          {
+            when: expr14.eq(expr14.get(field14("class")), "construction"),
+            value: expr14.coalesce(expr14.get(field14("type")), "")
+          }
+        ],
+        expr14.coalesce(expr14.get(field14("class")), "street")
+      ),
       [
-        { labels: ["motorway", "motorway_construction"], value: 6 },
-        { labels: ["trunk", "trunk_construction"], value: 5 },
-        { labels: ["primary", "primary_construction"], value: 4 },
-        { labels: ["secondary", "secondary_construction"], value: 3 },
-        { labels: ["tertiary", "tertiary_construction"], value: 2 },
-        { labels: ["minor", "minor_construction"], value: 1 }
+        { labels: [...worldConstructionTypes.motorway], value: 6 },
+        { labels: [...worldConstructionTypes.trunk], value: 5 },
+        { labels: [...worldConstructionTypes.primary], value: 4 },
+        { labels: [...worldConstructionTypes.secondary], value: 3 },
+        { labels: [...worldConstructionTypes.tertiary], value: 2 },
+        { labels: [...worldConstructionTypes.minor], value: 1 }
       ],
       0
     ),
@@ -14056,7 +14112,7 @@ var streetsBase = bindOfficialMapTheme(
             }
           },
           modifiers: {
-            // Optional keys: construction, expressway, indoor, official, ramp, unpaved.
+            // Optional keys: construction, expressway, indoor, ramp, unpaved.
             // Treatments accept enabled, widthScale, surface, tunnel, and bridge;
             // phases accept color, opacity, dash, blur, gapWidth, offset, and width.
             expressway: { widthScale: expresswayWidthScale },
@@ -14479,13 +14535,6 @@ var streetsBase = bindOfficialMapTheme(
               )
             }
           },
-          businessCorridor: {
-            // This compatibility layer contains selected building footprints,
-            // not ground. Streets renders the derived business_area class through
-            // landuse instead.
-            fill: { visible: false },
-            outline: { visible: false }
-          },
           flat: {
             fill: {
               color: buildingFillColor,
@@ -14618,14 +14667,14 @@ var streetsBase = bindOfficialMapTheme(
                     [
                       [
                         1,
-                        expr14.step(expr14.coalesce(expr14.get(field14("rank")), 99), 11, [
+                        expr14.step(expr14.coalesce(expr14.get(field14("symbolrank")), 99), 11, [
                           [4, 9],
                           [5, 8]
                         ])
                       ],
                       [
                         9,
-                        expr14.step(expr14.coalesce(expr14.get(field14("rank")), 99), 22, [
+                        expr14.step(expr14.coalesce(expr14.get(field14("symbolrank")), 99), 22, [
                           [4, 19],
                           [5, 17]
                         ])
@@ -14653,14 +14702,14 @@ var streetsBase = bindOfficialMapTheme(
                     [
                       [
                         4,
-                        expr14.step(expr14.coalesce(expr14.get(field14("rank")), 99), 9, [
+                        expr14.step(expr14.coalesce(expr14.get(field14("symbolrank")), 99), 9, [
                           [6, 8],
                           [7, 7]
                         ])
                       ],
                       [
                         9,
-                        expr14.step(expr14.coalesce(expr14.get(field14("rank")), 99), 21, [
+                        expr14.step(expr14.coalesce(expr14.get(field14("symbolrank")), 99), 21, [
                           [6, 16],
                           [7, 14]
                         ])
@@ -14673,7 +14722,7 @@ var streetsBase = bindOfficialMapTheme(
               city: {
                 minZoom: 2,
                 maxZoom: 15,
-                priority: expr14.subtract(100, expr14.coalesce(expr14.get(field14("rank")), 20)),
+                priority: expr14.subtract(100, expr14.coalesce(expr14.get(field14("symbolrank")), 20)),
                 text: {
                   color: zoom13.linear([
                     [2, streetsOverviewPalette.label],
@@ -14694,24 +14743,27 @@ var streetsBase = bindOfficialMapTheme(
                     { kind: "cubic-bezier", x1: 0.2, x2: 0.9, y1: 0, y2: 1 },
                     expr14.zoom(),
                     [
-                      [3, expr14.step(expr14.coalesce(expr14.get(field14("rank")), 99), 13, [[6, 11]])],
+                      [
+                        3,
+                        expr14.step(expr14.coalesce(expr14.get(field14("symbolrank")), 99), 13, [[6, 11]])
+                      ],
                       [
                         6,
-                        expr14.step(expr14.coalesce(expr14.get(field14("rank")), 99), 18, [
+                        expr14.step(expr14.coalesce(expr14.get(field14("symbolrank")), 99), 18, [
                           [6, 16],
                           [7, 14]
                         ])
                       ],
                       [
                         8,
-                        expr14.step(expr14.coalesce(expr14.get(field14("rank")), 99), 20, [
+                        expr14.step(expr14.coalesce(expr14.get(field14("symbolrank")), 99), 20, [
                           [9, 16],
                           [10, 14]
                         ])
                       ],
                       [
                         15,
-                        expr14.step(expr14.coalesce(expr14.get(field14("rank")), 99), 24, [
+                        expr14.step(expr14.coalesce(expr14.get(field14("symbolrank")), 99), 24, [
                           [9, 20],
                           [12, 16],
                           [15, 14]
@@ -14726,7 +14778,7 @@ var streetsBase = bindOfficialMapTheme(
               town: {
                 minZoom: 2,
                 maxZoom: 13,
-                priority: expr14.subtract(80, expr14.coalesce(expr14.get(field14("rank")), 20)),
+                priority: expr14.subtract(80, expr14.coalesce(expr14.get(field14("symbolrank")), 20)),
                 text: {
                   color: streetsVisual.label.settlement,
                   haloColor: streetsVisual.label.placeHalo,
@@ -14743,17 +14795,20 @@ var streetsBase = bindOfficialMapTheme(
                     { kind: "cubic-bezier", x1: 0.2, x2: 0.9, y1: 0, y2: 1 },
                     expr14.zoom(),
                     [
-                      [3, expr14.step(expr14.coalesce(expr14.get(field14("rank")), 99), 11, [[9, 10]])],
+                      [
+                        3,
+                        expr14.step(expr14.coalesce(expr14.get(field14("symbolrank")), 99), 11, [[9, 10]])
+                      ],
                       [
                         6,
-                        expr14.step(expr14.coalesce(expr14.get(field14("rank")), 99), 14, [
+                        expr14.step(expr14.coalesce(expr14.get(field14("symbolrank")), 99), 14, [
                           [9, 12],
                           [12, 10]
                         ])
                       ],
                       [
                         8,
-                        expr14.step(expr14.coalesce(expr14.get(field14("rank")), 99), 16, [
+                        expr14.step(expr14.coalesce(expr14.get(field14("symbolrank")), 99), 16, [
                           [9, 14],
                           [12, 12],
                           [15, 10]
@@ -14761,7 +14816,7 @@ var streetsBase = bindOfficialMapTheme(
                       ],
                       [
                         13,
-                        expr14.step(expr14.coalesce(expr14.get(field14("rank")), 99), 22, [
+                        expr14.step(expr14.coalesce(expr14.get(field14("symbolrank")), 99), 22, [
                           [9, 20],
                           [12, 16],
                           [15, 14]
@@ -14785,7 +14840,7 @@ var streetsBase = bindOfficialMapTheme(
               village: {
                 minZoom: 2,
                 maxZoom: 13,
-                priority: expr14.subtract(65, expr14.coalesce(expr14.get(field14("rank")), 20)),
+                priority: expr14.subtract(65, expr14.coalesce(expr14.get(field14("symbolrank")), 20)),
                 text: {
                   color: streetsVisual.label.settlement,
                   haloColor: streetsVisual.label.placeHalo,
@@ -14802,17 +14857,20 @@ var streetsBase = bindOfficialMapTheme(
                     { kind: "cubic-bezier", x1: 0.2, x2: 0.9, y1: 0, y2: 1 },
                     expr14.zoom(),
                     [
-                      [3, expr14.step(expr14.coalesce(expr14.get(field14("rank")), 99), 11, [[9, 10]])],
+                      [
+                        3,
+                        expr14.step(expr14.coalesce(expr14.get(field14("symbolrank")), 99), 11, [[9, 10]])
+                      ],
                       [
                         6,
-                        expr14.step(expr14.coalesce(expr14.get(field14("rank")), 99), 14, [
+                        expr14.step(expr14.coalesce(expr14.get(field14("symbolrank")), 99), 14, [
                           [9, 12],
                           [12, 10]
                         ])
                       ],
                       [
                         8,
-                        expr14.step(expr14.coalesce(expr14.get(field14("rank")), 99), 16, [
+                        expr14.step(expr14.coalesce(expr14.get(field14("symbolrank")), 99), 16, [
                           [9, 14],
                           [12, 12],
                           [15, 10]
@@ -14820,7 +14878,7 @@ var streetsBase = bindOfficialMapTheme(
                       ],
                       [
                         13,
-                        expr14.step(expr14.coalesce(expr14.get(field14("rank")), 99), 22, [
+                        expr14.step(expr14.coalesce(expr14.get(field14("symbolrank")), 99), 22, [
                           [9, 20],
                           [12, 16],
                           [15, 14]
@@ -14844,7 +14902,7 @@ var streetsBase = bindOfficialMapTheme(
               neighborhood: {
                 minZoom: 10,
                 maxZoom: 15,
-                priority: expr14.subtract(65, expr14.coalesce(expr14.get(field14("rank")), 20)),
+                priority: expr14.subtract(65, expr14.coalesce(expr14.get(field14("symbolrank")), 20)),
                 text: {
                   font: streetsVisual.font.default,
                   color: streetsVisual.label.neighborhood,
@@ -14852,7 +14910,7 @@ var streetsBase = bindOfficialMapTheme(
                   haloBlur: 0,
                   haloWidth: 1.3,
                   letterSpacing: expr14.match(
-                    expr14.get(field14("class")),
+                    expr14.get(field14("type")),
                     [{ labels: "suburb", value: 0.15 }],
                     0.05
                   ),
@@ -14866,7 +14924,7 @@ var streetsBase = bindOfficialMapTheme(
                       [
                         11,
                         expr14.match(
-                          expr14.get(field14("class")),
+                          expr14.get(field14("type")),
                           [{ labels: "suburb", value: 12 }],
                           11.5
                         )
@@ -14874,7 +14932,7 @@ var streetsBase = bindOfficialMapTheme(
                       [
                         15,
                         expr14.match(
-                          expr14.get(field14("class")),
+                          expr14.get(field14("type")),
                           [{ labels: "suburb", value: 16 }],
                           15
                         )