@mailwoman/cartographer 4.15.0 → 4.16.1

package/base/buildings.ts

@@ -4,13 +4,38 @@
  * @author Teffen Ellis, et al.
  */
 
-import { type FillExtrusionLayerSpecification, type LayerSpecification } from "@maplibre/maplibre-gl-style-spec"
-import { interpolateTurbo } from "d3-scale-chromatic"
+import {
+	type ExpressionSpecification,
+	type FillExtrusionLayerSpecification,
+	type LayerSpecification,
+} from "@maplibre/maplibre-gl-style-spec"
 import { LayerID } from "../styles/layers.js"
 import { MailwomanBaseTileSetID } from "./theme.js"
 
 const BuildingLayerID = LayerID.bind(null, "buildings")
 
+const POP_START = 12.5 // zoom where buildings start rising
+const POP_END = 13 // zoom where they reach full height (Protomaps fully loaded here)
+const ROOF_GAP = 0.1 // meters: tiny lift so the band clears the roof (kills z-fight)
+const ROOF_CAP = 1 // meters: band thickness
+
+const buildingHeight = (offset = 0): ExpressionSpecification => [
+	"+",
+	["coalesce", ["get", "height"], ["get", "minheight"], 10],
+	offset,
+]
+
+/** Wrap a target-height expression in the zoom-driven pop interpolation. */
+const popHeight = (target: ExpressionSpecification): ExpressionSpecification => [
+	"interpolate",
+	["linear"],
+	["zoom"],
+	POP_START,
+	0,
+	POP_END,
+	target,
+]
+
 /**
  * Layer definitions for building data.
  */
@@ -19,28 +44,35 @@ export const BuildingLayers: LayerSpecification[] = [
 		id: BuildingLayerID("buildings-extruded"),
 
 		paint: {
-			"fill-extrusion-color": [
-				// ---
-				"interpolate",
-				// ["exponential", 0.25],
-				["linear"],
-				[
-					// --
-					"coalesce",
-					["get", "height"],
-					["get", "minheight"],
-					10,
-				],
-				...Array.from({ length: 10 }, (_, i) => {
-					const sizeScalingFactor = 250 - 250 / i
-
-					return [sizeScalingFactor, interpolateTurbo(sizeScalingFactor / 250)] as [number, string]
-				}).flat(),
-			],
+			"fill-extrusion-color": "hsl(276.52deg 10.83% 10.31%)",
 			"fill-extrusion-translate": [0.1, 0.1],
+			"fill-extrusion-opacity": ["interpolate", ["linear"], ["zoom"], 14, 0, 14.5, 1],
 		},
 	}),
 
+	// Roof-edge outline: thin extruded band sitting at the top of each building.
+	{
+		id: "basemap-buildings-roof-outline",
+		type: "fill-extrusion",
+		source: MailwomanBaseTileSetID,
+		"source-layer": "buildings",
+		minzoom: 10,
+		paint: {
+			// "fill-extrusion-color": "hsl(240deg 100% 80%)", // match footprint outline
+			"fill-extrusion-color": "hsl(276.52deg 13% 12.31%)",
+
+			"fill-extrusion-vertical-gradient": false,
+			"fill-extrusion-translate-anchor": "map",
+			"fill-extrusion-opacity": 1,
+			// top of the band = full building height
+			// "fill-extrusion-height": popHeight(buildingHeight()),
+			// // base of the band = full height minus the cap thickness (clamped ≥ 0)
+			// "fill-extrusion-base": popHeight([ "max", [ "-", buildingHeight(), ROOF_CAP ], 0 ]),
+			"fill-extrusion-height": popHeight(["+", buildingHeight(), ROOF_GAP, ROOF_CAP]),
+			"fill-extrusion-base": popHeight(["+", buildingHeight(), ROOF_GAP]),
+		},
+	},
+
 	{
 		id: "basemap-buildings-outline",
 		type: "line",
@@ -89,34 +121,14 @@ function createBuildingFillStyleLayer(fillStyleSpec: BuildingFillStyleSpec): Lay
 		type: "fill-extrusion",
 		source: MailwomanBaseTileSetID,
 		"source-layer": "buildings",
-		minzoom: 12,
+		minzoom: 10,
 		paint: {
 			...fillStyleSpec.paint,
 			"fill-extrusion-vertical-gradient": true,
-
-			"fill-extrusion-height": [
-				"+",
-				[
-					// --
-					"coalesce",
-					["get", "height"],
-					["get", "minheight"],
-					10,
-				],
-				fillStyleSpec.heightOffset || 0,
-			],
+			"fill-extrusion-height": popHeight(buildingHeight(fillStyleSpec.heightOffset)),
+			"fill-extrusion-base": 0,
 			"fill-extrusion-translate-anchor": "map",
-			// "fill-extrusion-opacity": 0.7,
-			"fill-extrusion-opacity": [
-				// We fade out the outline at higher zoom levels
-				"interpolate",
-				["linear"],
-				["zoom"],
-				11,
-				0.6,
-				16,
-				0.95,
-			],
+			"fill-extrusion-opacity": 0.95,
 		},
 	}
 

package/base/composition.test.ts

@@ -0,0 +1,195 @@
+/**
+ * @copyright Sister Software
+ * @license AGPL-3.0
+ * @author Teffen Ellis, et al.
+ */
+
+import { expect, test } from "vitest"
+import { createLightSpec, createSkySpec, StyleSpecificationComposer } from "./composition.js"
+
+//#region createLightSpec
+
+test("createLightSpec: returns the house defaults when called bare", () => {
+	expect(createLightSpec()).toEqual({
+		color: "white",
+		intensity: 0.85,
+		anchor: "viewport",
+		position: [10, 20, -5],
+	})
+})
+
+test("createLightSpec: an override shadows the matching default key", () => {
+	const spec = createLightSpec({ intensity: 0.5 })
+
+	expect(spec.intensity).toBe(0.5)
+	// non-overridden defaults survive
+	expect(spec.color).toBe("white")
+	expect(spec.anchor).toBe("viewport")
+})
+
+test("createLightSpec: overriding position replaces the whole tuple", () => {
+	expect(createLightSpec({ position: [1, 2, 3] }).position).toEqual([1, 2, 3])
+})
+
+//#endregion
+
+//#region createSkySpec
+
+test("createSkySpec: returns the house atmospheric defaults when called bare", () => {
+	expect(createSkySpec()).toEqual({
+		"sky-color": "#000535",
+		"horizon-color": "hsl(54deg 100% 16%)",
+		"fog-color": "hsl(54deg 100% 5%)",
+		"sky-horizon-blend": 0.75,
+		"horizon-fog-blend": 0.75,
+		"fog-ground-blend": 0.1,
+	})
+})
+
+test("createSkySpec: an override shadows only the named key", () => {
+	const spec = createSkySpec({ "sky-color": "#123456" })
+
+	expect(spec["sky-color"]).toBe("#123456")
+	expect(spec["fog-ground-blend"]).toBe(0.1) // untouched default
+})
+
+//#endregion
+
+//#region StyleSpecificationComposer — construction
+
+test("Composer: light/sky default to the house specs when unset", () => {
+	const composer = new StyleSpecificationComposer({ sources: {} })
+
+	expect(composer.light).toEqual(createLightSpec())
+	expect(composer.sky).toEqual(createSkySpec())
+})
+
+test("Composer: partial light/sky options merge over the defaults", () => {
+	const composer = new StyleSpecificationComposer({
+		sources: {},
+		light: { intensity: 0.3 },
+		sky: { "sky-color": "#abcdef" },
+	})
+
+	expect(composer.light.intensity).toBe(0.3)
+	expect(composer.light.color).toBe("white") // default preserved
+	expect(composer.sky["sky-color"]).toBe("#abcdef")
+})
+
+// Terrain + DEM-source tests parked (mobile performance): the `terrain` getter and the terrain DEM
+// source are commented out in `composition.ts`. Re-enable the code and these tests together when DEM
+// is reconsidered. (The hillshade DEM source is still injected.)
+/*
+test("Composer: terrain source defaults to the terrain tileset id", () => {
+	const composer = new StyleSpecificationComposer({ sources: {} })
+
+	expect(composer.terrain.source).toBe("terrain")
+})
+
+test("Composer: a terrain override merges over the default source", () => {
+	const composer = new StyleSpecificationComposer({ sources: {}, terrain: { exaggeration: 1.5 } })
+
+	expect(composer.terrain.source).toBe("terrain") // default kept
+	expect(composer.terrain.exaggeration).toBe(1.5)
+})
+
+test("Composer: injects DEM sources for terrain + hillshade alongside the caller's sources", () => {
+	const userSource = { type: "vector", url: "https://example.test/tiles.json" } as const
+	const composer = new StyleSpecificationComposer({ sources: { mine: userSource } })
+
+	// the caller's source + the runtime-injected DEM sources aren't all in the static source-record type.
+	const sources = composer.sources as Record<string, unknown>
+	expect(sources.mine).toEqual(userSource)
+	expect(sources.terrain).toMatchObject({ type: "raster-dem", encoding: "terrarium" })
+	expect(sources.hillshade).toMatchObject({ type: "raster-dem", encoding: "terrarium" })
+})
+*/
+
+//#endregion
+
+//#region StyleSpecificationComposer — layers
+
+test("Composer.layers: exposes the base layer list as an array", () => {
+	const composer = new StyleSpecificationComposer({ sources: {} })
+
+	expect(Array.isArray(composer.layers)).toBe(true)
+	expect(composer.layers.length).toBeGreaterThan(0)
+})
+
+test("Composer.layers: an inserted layer is present in the composed list", () => {
+	const composer = new StyleSpecificationComposer({ sources: {} })
+	// `insert` requires an anchor (`beforeID`/`afterID`) — anchor against an existing base layer.
+	const anchorID = composer.layers[0]!.id
+
+	const withCustom = new StyleSpecificationComposer({
+		sources: {},
+		layers: [
+			{
+				id: "mw-test-layer",
+				type: "background",
+				paint: { "background-color": "#ff0000" },
+				afterID: anchorID,
+			},
+		],
+	})
+
+	const inserted = withCustom.layers.find((l) => l.id === "mw-test-layer")
+	expect(inserted).toBeDefined()
+	expect(inserted!.type).toBe("background")
+})
+
+test("Composer.layers: an inserted layer sits immediately after its anchor", () => {
+	const composer = new StyleSpecificationComposer({ sources: {} })
+	const anchorID = composer.layers[0]!.id
+
+	const withCustom = new StyleSpecificationComposer({
+		sources: {},
+		layers: [{ id: "mw-anchored-layer", type: "background", paint: {}, afterID: anchorID }],
+	})
+
+	const ids = withCustom.layers.map((l) => l.id)
+	const anchorIdx = ids.indexOf(anchorID)
+	expect(anchorIdx).toBeGreaterThanOrEqual(0)
+	expect(ids[anchorIdx + 1]).toBe("mw-anchored-layer")
+})
+
+//#endregion
+
+//#region StyleSpecificationComposer — serialization
+
+test("Composer.toJSON: emits a v8 style with the self-host glyph + sprite endpoints", () => {
+	const style = new StyleSpecificationComposer({ sources: {} }).toJSON()
+
+	expect(style.version).toBe(8)
+	expect(style.glyphs).toBe("https://public.sister.software/protomaps/fonts/{fontstack}/{range}.pbf")
+	expect(style.sprite).toBe("https://public.sister.software/protomaps/sprites/v4/light")
+})
+
+test("Composer.toJSON: carries the composed light, sky, terrain, sources and layers through", () => {
+	const composer = new StyleSpecificationComposer({ sources: {}, light: { intensity: 0.2 } })
+	const style = composer.toJSON()
+
+	expect(style.light).toEqual(createLightSpec(composer.light))
+	expect(style.sky).toEqual(createSkySpec(composer.sky))
+	expect(style.terrain).toEqual(composer.terrain)
+	expect(style.sources).toBe(composer.sources)
+	expect(style.layers).toEqual(composer.layers)
+})
+
+test("Composer.toJS: is an alias of toJSON", () => {
+	const composer = new StyleSpecificationComposer({ sources: {} })
+
+	expect(composer.toJS()).toEqual(composer.toJSON())
+})
+
+test("Composer: two instances from the shared BaseLayers have independent layer lists", () => {
+	// Regression for the shared-mutable-link bug: LayerSpecificationList now copies its input, so
+	// constructing a second composer no longer rewrites the first's kNext/kPrev links in place.
+	const a = new StyleSpecificationComposer({ sources: {} })
+	const baseCount = a.layers.length
+	const b = new StyleSpecificationComposer({ sources: {} })
+	expect(b.layers.length).toBe(baseCount) // b built a full list, not a corrupted remnant
+	expect(a.layers.length).toBe(baseCount) // a's list wasn't mutated by b's construction
+})
+
+//#endregion

package/base/composition.ts

@@ -13,7 +13,7 @@ import {
 } from "../styles/layers.js"
 import { type TileSetSourceRecord } from "../styles/sources.js"
 import { BaseLayers } from "./layers.js"
-import { createTerrainDEMSource, HillshadeTileSetID, TerrainTileSetID } from "./terrain.js"
+import { createTerrainDEMSource, HillshadeTileSetID } from "./terrain.js"
 
 //#endregion
 
@@ -64,21 +64,21 @@ export class StyleSpecificationComposer {
 	layersList: LayerSpecificationList
 	light: LightSpecification
 	sky: SkySpecification
-	terrain: TerrainSpecification
+	// terrain: TerrainSpecification
 	sources: TileSetSourceRecord
 
 	constructor(spec: StyleSpecificationComposition) {
 		this.light = createLightSpec(spec.light)
 		this.sky = createSkySpec(spec.sky)
 
-		this.terrain = {
-			source: TerrainTileSetID,
-			...spec.terrain,
-		}
+		// this.terrain = {
+		// 	source: TerrainTileSetID,
+		// 	...spec.terrain,
+		// }
 
 		this.sources = {
 			...spec.sources,
-			[TerrainTileSetID]: createTerrainDEMSource(),
+			// [TerrainTileSetID]: createTerrainDEMSource(),
 			[HillshadeTileSetID]: createTerrainDEMSource(),
 		}
 
@@ -103,7 +103,7 @@ export class StyleSpecificationComposer {
 			sprite: "https://public.sister.software/protomaps/sprites/v4/light",
 			light: createLightSpec(this.light),
 			sky: createSkySpec(this.sky),
-			terrain: this.terrain,
+			// terrain: this.terrain,
 			sources: this.sources,
 			layers: this.layers,
 		}

package/base/layers.ts

@@ -6,9 +6,9 @@
 
 import { layers } from "@protomaps/basemaps"
 import { type LayerSpecification } from "maplibre-gl"
-import { BuildingLayers } from "../base/buildings.js"
 import { MailwomanBaseFlavor, MailwomanBaseTileSetID } from "../base/theme.js"
 import { LayerID } from "../styles/layers.js"
+import { BuildingLayers } from "./buildings.js"
 import { HillshadeTileSetID } from "./terrain.js"
 
 export const HillsLayerID = LayerID(HillshadeTileSetID, "hills")
@@ -41,10 +41,12 @@ export const BaseLayers: LayerSpecification[] = [
 		id: HillsLayerID,
 		type: "hillshade",
 		source: HillshadeTileSetID,
+		minzoom: 7,
 		paint: {
 			"hillshade-exaggeration": 0.25,
 			"hillshade-accent-color": "hsl(240deg 100% 95%)",
 			"hillshade-shadow-color": "hsl(240deg 100% 5%)",
+			"hillshade-highlight-color": "hsl(240deg 100% 75%)",
 		},
 	},
 	...BuildingLayers,

package/base/theme.ts

@@ -4,7 +4,7 @@
  * @author Teffen Ellis, et al.
  */
 
-import { type Flavor } from "@protomaps/basemaps"
+import { type Flavor, namedFlavor } from "@protomaps/basemaps"
 import { TileSetSourceID } from "../styles/sources.js"
 
 /**
@@ -14,12 +14,18 @@ import { TileSetSourceID } from "../styles/sources.js"
  */
 export const MailwomanBaseTileSetID = TileSetSourceID("basemap-v4")
 
+const darkFlavor = namedFlavor("dark")
+
+console.log("MailwomanBaseFlavor:", darkFlavor)
+
 /**
  * The Mailwoman theme for Protomaps via MapLibre. Keys follow `@protomaps/basemaps@5.x` which
  * targets the v4 tile schema (`["==","kind","..."]` filters), matching the basemap-v4 PMTiles on
  * R2.
  */
 export const MailwomanBaseFlavor: Flavor = {
+	...darkFlavor,
+
 	//#region Base
 	background: "hsl(0deg 10% 5%)",
 	earth: "hsl(0deg 10% 5%)",
@@ -96,13 +102,7 @@ export const MailwomanBaseFlavor: Flavor = {
 	bridges_highway: "#474747",
 
 	//#endregion
-	//#region Roads
-	roads_label_minor: "hsl(240deg 100% 90%)",
-	roads_label_minor_halo: "#1f1f1f",
-	roads_label_major: "hsl(240deg 100% 90%)",
-	roads_label_major_halo: "#1f1f1f",
 
-	//#endregion
 	ocean_label: "#717784",
 	subplace_label: "hsl(50deg 50% 70%)",
 	subplace_label_halo: "hsl(40deg 100% 10%)",
@@ -115,4 +115,14 @@ export const MailwomanBaseFlavor: Flavor = {
 	country_label: "hsl(240deg 50% 80% / 0.5)",
 	address_label: "hsl(240deg 100% 90%)",
 	address_label_halo: "hsl(240deg 100% 10%)",
+
+	landcover: {
+		grassland: "hsl(120deg 45.75% 1%)",
+		barren: "hsl(0deg 100% 2.84%)",
+		farmland: "hsl(120deg 45.75% 1%)",
+		forest: "hsl(120deg 45.75% 1%)",
+		glacier: "hsl(240deg 100% 10%)",
+		scrub: "hsl(0deg 10% 5%)",
+		urban_area: "hsl(0deg 10% 5%)",
+	},
 }

package/coverage/index.ts

@@ -3,10 +3,11 @@
  * @license AGPL-3.0
  * @author Teffen Ellis, et al.
  *
- *   The "fog of war" address-COVERAGE overlay. An H3 hexbin tileset (built by
- *   `scripts/build-coverage-tiles.ts`) shades each area by how much address-point data we hold:
- *   covered → clear (the basemap shows through), empty → opaque gray fog. Answers "where do we need
- *   more data" at a glance, and reveals the "looks covered until you zoom in, then it goes gray" gaps.
+ *   The "fog of war" address-COVERAGE overlay. An H3 hexbin tileset (built by `mailwoman coverage
+ *   build`) shading "where do we need data" at a glance. Two layers in one tileset: the US rooftop
+ *   fine map (address-point density, street/block detail) and a GLOBAL "work to do" layer — populated
+ *   places (WOF, importance-weighted) we can't geocode yet show as gray-fog holes, and postcode/rooftop
+ *   coverage clears them. Covered → clear (basemap shows through), uncovered civilization → gray fog.
  *
  *   Each cell carries TWO baked fog values in [0,1] (0 = covered, 1 = empty), so the same tiles drive
  *   either reading without a rebuild:
@@ -16,8 +17,8 @@
  *   We expose each as its OWN default-off fill layer (`coverage-opt-fog`, `coverage-honest-fog`) so the
  *   demo's LayerToggleControl gives each its own checkbox — pick the reading you want, no extra UI.
  *
- *   Served as XYZ vector tiles by the tile worker from `nexus-assets/tiles/coverage-us-v4.pmtiles` (same
- *   as `basemap-v4`); the consumer passes its TileJSON URL (`tiles.sister.software/coverage-us-v4.json`)
+ *   Served as XYZ vector tiles by the tile worker from `nexus-assets/tiles/coverage-v5.pmtiles` (same
+ *   as `basemap-v4`); the consumer passes its TileJSON URL (`tiles.sister.software/coverage-v5.json`)
  *   to `createCoverageSource`.
  */
 
@@ -27,7 +28,7 @@ import type {
 } from "@maplibre/maplibre-gl-style-spec"
 import { TileSetSourceID } from "../styles/sources.js"
 
-export const CoverageTileSetID = TileSetSourceID("coverage-us-v4")
+export const CoverageTileSetID = TileSetSourceID("coverage-v5")
 
 /**
  * The single source-layer the coverage PMTiles ships (see `build-coverage-tiles.ts` → tippecanoe `-l`).
@@ -56,7 +57,7 @@ export const CoverageLayerID = {
 
 /**
  * Build the coverage source spec from the tile worker's TileJSON endpoint
- * (`https://tiles.sister.software/coverage-us-v4.json`).
+ * (`https://tiles.sister.software/coverage-v5.json`).
  */
 export function createCoverageSource(url: string): VectorSourceSpecification {
 	return { type: "vector", url }

package/out/base/buildings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildings.d.ts","sourceRoot":"","sources":["../../base/buildings.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAwC,KAAK,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAOhH;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,kBAAkB,EA8D9C,CAAA"}
+{"version":3,"file":"buildings.d.ts","sourceRoot":"","sources":["../../base/buildings.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAGN,KAAK,kBAAkB,EACvB,MAAM,kCAAkC,CAAA;AA4BzC;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,kBAAkB,EAqE9C,CAAA"}

package/out/base/buildings.js

@@ -4,10 +4,28 @@
  * @author Teffen Ellis, et al.
  */
 import {} from "@maplibre/maplibre-gl-style-spec";
-import { interpolateTurbo } from "d3-scale-chromatic";
 import { LayerID } from "../styles/layers.js";
 import { MailwomanBaseTileSetID } from "./theme.js";
 const BuildingLayerID = LayerID.bind(null, "buildings");
+const POP_START = 12.5; // zoom where buildings start rising
+const POP_END = 13; // zoom where they reach full height (Protomaps fully loaded here)
+const ROOF_GAP = 0.1; // meters: tiny lift so the band clears the roof (kills z-fight)
+const ROOF_CAP = 1; // meters: band thickness
+const buildingHeight = (offset = 0) => [
+    "+",
+    ["coalesce", ["get", "height"], ["get", "minheight"], 10],
+    offset,
+];
+/** Wrap a target-height expression in the zoom-driven pop interpolation. */
+const popHeight = (target) => [
+    "interpolate",
+    ["linear"],
+    ["zoom"],
+    POP_START,
+    0,
+    POP_END,
+    target,
+];
 /**
  * Layer definitions for building data.
  */
@@ -15,26 +33,32 @@ export const BuildingLayers = [
     createBuildingFillStyleLayer({
         id: BuildingLayerID("buildings-extruded"),
         paint: {
-            "fill-extrusion-color": [
-                // ---
-                "interpolate",
-                // ["exponential", 0.25],
-                ["linear"],
-                [
-                    // --
-                    "coalesce",
-                    ["get", "height"],
-                    ["get", "minheight"],
-                    10,
-                ],
-                ...Array.from({ length: 10 }, (_, i) => {
-                    const sizeScalingFactor = 250 - 250 / i;
-                    return [sizeScalingFactor, interpolateTurbo(sizeScalingFactor / 250)];
-                }).flat(),
-            ],
+            "fill-extrusion-color": "hsl(276.52deg 10.83% 10.31%)",
             "fill-extrusion-translate": [0.1, 0.1],
+            "fill-extrusion-opacity": ["interpolate", ["linear"], ["zoom"], 14, 0, 14.5, 1],
         },
     }),
+    // Roof-edge outline: thin extruded band sitting at the top of each building.
+    {
+        id: "basemap-buildings-roof-outline",
+        type: "fill-extrusion",
+        source: MailwomanBaseTileSetID,
+        "source-layer": "buildings",
+        minzoom: 10,
+        paint: {
+            // "fill-extrusion-color": "hsl(240deg 100% 80%)", // match footprint outline
+            "fill-extrusion-color": "hsl(276.52deg 13% 12.31%)",
+            "fill-extrusion-vertical-gradient": false,
+            "fill-extrusion-translate-anchor": "map",
+            "fill-extrusion-opacity": 1,
+            // top of the band = full building height
+            // "fill-extrusion-height": popHeight(buildingHeight()),
+            // // base of the band = full height minus the cap thickness (clamped ≥ 0)
+            // "fill-extrusion-base": popHeight([ "max", [ "-", buildingHeight(), ROOF_CAP ], 0 ]),
+            "fill-extrusion-height": popHeight(["+", buildingHeight(), ROOF_GAP, ROOF_CAP]),
+            "fill-extrusion-base": popHeight(["+", buildingHeight(), ROOF_GAP]),
+        },
+    },
     {
         id: "basemap-buildings-outline",
         type: "line",
@@ -75,33 +99,14 @@ function createBuildingFillStyleLayer(fillStyleSpec) {
         type: "fill-extrusion",
         source: MailwomanBaseTileSetID,
         "source-layer": "buildings",
-        minzoom: 12,
+        minzoom: 10,
         paint: {
             ...fillStyleSpec.paint,
             "fill-extrusion-vertical-gradient": true,
-            "fill-extrusion-height": [
-                "+",
-                [
-                    // --
-                    "coalesce",
-                    ["get", "height"],
-                    ["get", "minheight"],
-                    10,
-                ],
-                fillStyleSpec.heightOffset || 0,
-            ],
+            "fill-extrusion-height": popHeight(buildingHeight(fillStyleSpec.heightOffset)),
+            "fill-extrusion-base": 0,
             "fill-extrusion-translate-anchor": "map",
-            // "fill-extrusion-opacity": 0.7,
-            "fill-extrusion-opacity": [
-                // We fade out the outline at higher zoom levels
-                "interpolate",
-                ["linear"],
-                ["zoom"],
-                11,
-                0.6,
-                16,
-                0.95,
-            ],
+            "fill-extrusion-opacity": 0.95,
         },
     };
     return baseStyle;

package/out/base/buildings.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildings.js","sourceRoot":"","sources":["../../base/buildings.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"buildings.js","sourceRoot":"","sources":["../../base/buildings.ts"],"names":[],"mappings":"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"}

package/out/base/composition.d.ts

@@ -23,7 +23,6 @@ export declare class StyleSpecificationComposer {
     layersList: LayerSpecificationList;
     light: LightSpecification;
     sky: SkySpecification;
-    terrain: TerrainSpecification;
     sources: TileSetSourceRecord;
     constructor(spec: StyleSpecificationComposition);
     get layers(): LayerSpecificationListItem[];

package/out/base/composition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"composition.d.ts","sourceRoot":"","sources":["../../base/composition.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAA;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AACjH,OAAO,EACN,sBAAsB,EACtB,KAAK,2BAA2B,EAChC,KAAK,0BAA0B,EAC/B,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAQ/D,wBAAgB,eAAe,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,kBAAkB,CAYtF;AAED,wBAAgB,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,gBAAgB,CAUhF;AAMD,MAAM,WAAW,6BAA6B;IAC7C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAA;IAC5C,MAAM,CAAC,EAAE,2BAA2B,EAAE,CAAA;IACtC,KAAK,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAA;IACnC,GAAG,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAA;CACvC;AAED;;GAEG;AACH,qBAAa,0BAA0B;IACtC,UAAU,EAAE,sBAAsB,CAAA;IAClC,KAAK,EAAE,kBAAkB,CAAA;IACzB,GAAG,EAAE,gBAAgB,CAAA;IACrB,OAAO,EAAE,oBAAoB,CAAA;IAC7B,OAAO,EAAE,mBAAmB,CAAA;gBAEhB,IAAI,EAAE,6BAA6B;IAsB/C,IAAW,MAAM,IAAI,0BAA0B,EAAE,CAEhD;IAED,MAAM,IAAI,kBAAkB;IAkB5B,IAAI,IAAI,kBAAkB;CAG1B"}
+{"version":3,"file":"composition.d.ts","sourceRoot":"","sources":["../../base/composition.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAA;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AACjH,OAAO,EACN,sBAAsB,EACtB,KAAK,2BAA2B,EAChC,KAAK,0BAA0B,EAC/B,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAQ/D,wBAAgB,eAAe,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,kBAAkB,CAYtF;AAED,wBAAgB,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,gBAAgB,CAUhF;AAMD,MAAM,WAAW,6BAA6B;IAC7C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAA;IAC5C,MAAM,CAAC,EAAE,2BAA2B,EAAE,CAAA;IACtC,KAAK,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAA;IACnC,GAAG,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAA;CACvC;AAED;;GAEG;AACH,qBAAa,0BAA0B;IACtC,UAAU,EAAE,sBAAsB,CAAA;IAClC,KAAK,EAAE,kBAAkB,CAAA;IACzB,GAAG,EAAE,gBAAgB,CAAA;IAErB,OAAO,EAAE,mBAAmB,CAAA;gBAEhB,IAAI,EAAE,6BAA6B;IAsB/C,IAAW,MAAM,IAAI,0BAA0B,EAAE,CAEhD;IAED,MAAM,IAAI,kBAAkB;IAkB5B,IAAI,IAAI,kBAAkB;CAG1B"}