@a2f0/skyline 0.2.26 → 0.2.28

package/docs/skyline-geography.md

@@ -133,7 +133,10 @@ Tower's part were added on September 29, 2026, from the same request, and the Sh
 Chicago Riverwalk's tower and corner parts the same day, from
 [a fifth](https://api.openstreetmap.org/api/0.6/map?bbox=-87.6250,41.8860,-87.6050,41.8980),
 and Three Illinois Center's outline and the Swissôtel's tower part the same day, from the
-fourth.
+fourth. On 2026-10-17, the Sheraton east wing and round end were retrieved from
+[relation 17432075](https://api.openstreetmap.org/api/0.6/relation/17432075/full.json)
+and [way 1269924304](https://api.openstreetmap.org/api/0.6/way/1269924304/full.json);
+its combined ground coverage names the tower and wing ways separately.
 It includes the selected building outlines and parts. The streets come from a separate
 extract retrieved on September 30, 2026 through the
 [Overpass API](https://overpass-api.de/api/interpreter?data=%5Bout%3Ajson%5D%3Bway%5B%22highway%22%5D%2841.8765%2C-87.6310%2C41.8916%2C-87.6158%29%3Bout%20meta%20geom%3B),
@@ -200,7 +203,7 @@ of its tower. The cyan ground outlines show that distinction.
 | Two Illinois Center | [236770799](https://www.openstreetmap.org/way/236770799) | Outline, with the floor pitch from the photograph; not in the original layout |
 | River Plaza | [285867424](https://www.openstreetmap.org/way/285867424) | 68796725, 68796733, 285867425; not in the original layout |
 | Hyatt Regency West Tower | [235920252](https://www.openstreetmap.org/way/235920252) | The tower's part of the hotel's outline, 235920251; not in the original layout |
-| Sheraton Grand | [592122464](https://www.openstreetmap.org/way/592122464) | The tower's part of the complex's outline, 188171430, and the corner's round tower, 1269924307; not in the original layout |
+| Sheraton Grand | [592122464](https://www.openstreetmap.org/way/592122464) | The tower's part of the complex's outline, 188171430, the corner 1269924307, east wing 1269924305 and round end 1269924304; not in the original layout |
 | Three Illinois Center | [95486958](https://www.openstreetmap.org/way/95486958) | Outline; not in the original layout |
 | Swissôtel | [641288601](https://www.openstreetmap.org/way/641288601) | The tower's part of the hotel's outline, 95486966; not in the original layout |
 
@@ -461,7 +464,9 @@ Intermediate parts have less certainty than the overall height:
   the drawing paints a lit crown. Its levels stand on the Skyscraper Center's datum, with
   Emporis's floor-to-floor, roof and crown heights over its top floor: the arms' roof at
   94.76 m, the corner's two floors higher at 100.1 m, and 12.2 m drums of maroon fins on the
-  three round ends, the corner's to the published 112.3 m. The Skyscraper Center's tip, 50 cm
+  original three round ends, the corner's to the published 112.3 m. The 2026-10-17
+  pass restores the lower east wing at an estimated 84.08 m and its round end at
+  86.75 m, provisionally sharing the crown assembly pending finer measurements. The Skyscraper Center's tip, 50 cm
   higher, names no feature the photographs resolve, so the model stops at the drum's top; see
   the [Sheraton Grand reference audit](sheraton-grand-reference.md).
 - Three Illinois Center stands between 340 on the Park and The Buckingham from the drawing's

package/lib/models/colour-palette.d.ts

@@ -9,8 +9,9 @@ export declare const daylightColours: {
 export declare const nightColours: {
     readonly ambient: 10596296;
     readonly fill: 9281469;
-    readonly window: 16764817;
-    readonly windowWhite: 16772558;
+    readonly window: 16761213;
+    readonly windowWhite: 16772570;
+    readonly windowCool: 14478079;
 };
 export declare const timeOfDayColours: readonly [{
     readonly elevation: -18;

package/lib/models/colour-palette.js

@@ -290,8 +290,9 @@ export const measuredColours = {
 // above the horizon, each the median of a clear box of the same panorama (scripts/sample-colours.ts,
 // the day study's sky), and the sun's warm white, chosen.
 export const daylightColours = { sky: 0x9ebbdb, horizon: 0xc4d1e1, sun: 0xfff4e6 };
-// Art-directed night illumination: quiet cool facades and a mix of warm office lamps.
-export const nightColours = { ambient: 0xa1afc8, fill: 0x8d9fbd, window: 0xffcf91, windowWhite: 0xffedce };
+// Illustrated warm, neutral and cool white fixtures; not calibrated Kelvin values.
+// DOE's white-tuning overview informs the range; see docs/viewer.md (time of day).
+export const nightColours = { ambient: 0xa1afc8, fill: 0x8d9fbd, window: 0xffc17d, windowWhite: 0xffedda, windowCool: 0xdceaff };
 // Illustrated clear-sky time previews. Solar elevation chooses the stops; these are
 // artistic colours, separate from the photograph-calibrated daytime palette above.
 export const timeOfDayColours = [

package/lib/models/colour-reflections.js

@@ -22,6 +22,7 @@ export function glassReflection(material, geometry, mask, windows = new Float32A
         skylineWindowsSuppressed: { value: 0 },
         skylineWindowWarm: { value: new THREE.Color(nightColours.window) },
         skylineWindowWhite: { value: new THREE.Color(nightColours.windowWhite) },
+        skylineWindowCool: { value: new THREE.Color(nightColours.windowCool) },
     };
     const compile = (shader, renderer) => {
         originalCompile.call(material, shader, renderer);
@@ -44,7 +45,8 @@ uniform float skylineDarkness;
 uniform float skylineActivity;
 uniform float skylineWindowsSuppressed;
 uniform vec3 skylineWindowWarm;
-uniform vec3 skylineWindowWhite;`).replace("#include <opaque_fragment>", `
+uniform vec3 skylineWindowWhite;
+uniform vec3 skylineWindowCool;`).replace("#include <opaque_fragment>", `
 if (vSkylineGlass > 0.0 && skylineReflecting > 0.0) {
   vec3 eye = vec3(0.0);
   eye.z = 1.0;
@@ -59,7 +61,10 @@ if (vSkylineWindow.z > 0.0 && skylineDarkness > 0.0) {
   float occupied = 1.0 - smoothstep(skylineActivity - 0.05, skylineActivity + 0.05, vSkylineWindow.x);
   float dusk = smoothstep(0.12 + 0.35 * vSkylineWindow.x, 0.45 + 0.35 * vSkylineWindow.x, skylineDarkness);
   float light = vSkylineWindow.z > 1.5 ? skylineDarkness : occupied * dusk * (1.0 - skylineWindowsSuppressed);
-  vec3 lamp = mix(skylineWindowWarm, skylineWindowWhite, vSkylineWindow.w);
+  float tint = vSkylineWindow.w;
+  vec3 lamp = tint < 0.5
+    ? mix(skylineWindowWarm, skylineWindowWhite, tint * 2.0)
+    : mix(skylineWindowWhite, skylineWindowCool, (tint - 0.5) * 2.0);
   outgoingLight += lamp * vSkylineWindow.y * light;
 }
 #include <opaque_fragment>`);
@@ -74,7 +79,7 @@ if (vSkylineWindow.z > 0.0 && skylineDarkness > 0.0) {
             geometry.setAttribute("skylineGlass", attribute);
             geometry.setAttribute("skylineWindow", windowAttribute);
             material.onBeforeCompile = compile;
-            material.customProgramCacheKey = () => `${key}:skyline-facade-v2`;
+            material.customProgramCacheKey = () => `${key}:skyline-facade-v3`;
         }
         else {
             material.onBeforeCompile = originalCompile;
@@ -99,7 +104,7 @@ if (vSkylineWindow.z > 0.0 && skylineDarkness > 0.0) {
             uniforms.skylineDarkness.value = lighting?.darkness ?? 0;
             uniforms.skylineWindowsSuppressed.value = celebration ? 1 : 0;
             uniforms.skylineActivity.value = lighting?.activity ?? 0;
-            for (const [uniform, hex] of [[uniforms.skylineWindowWarm, nightColours.window], [uniforms.skylineWindowWhite, nightColours.windowWhite]]) {
+            for (const [uniform, hex] of [[uniforms.skylineWindowWarm, nightColours.window], [uniforms.skylineWindowWhite, nightColours.windowWhite], [uniforms.skylineWindowCool, nightColours.windowCool]]) {
                 uniform.value.setHex(hex);
                 if (!coloured) {
                     const { r, g, b } = uniform.value, grey = r * 0.2126 + g * 0.7152 + b * 0.0722;

package/lib/models/night-windows.js

@@ -29,6 +29,11 @@ const architectural = new Set(["lamp", "crown lights", "band lights", "sign lett
 export function nightWindowMask(geometry, buildingId, materialOf) {
     const positions = geometry.getAttribute("position"), normals = geometry.getAttribute("normal");
     const mask = new Float32Array(positions.count * 4);
+    // A dominant fixture family per building, with smaller tenant-floor and room
+    // differences. Independent seeds keep colour from tracking occupancy/brightness.
+    // These are illustrated white-light mixes, not surveyed fixture temperatures.
+    const buildingTint = hash(`${buildingId}:fixture`);
+    const architecturalTint = 0.15 + 0.65 * hash(`${buildingId}:architectural-fixture`);
     const samePoint = (a, b) => positions.getX(a) === positions.getX(b) && positions.getY(a) === positions.getY(b) && positions.getZ(a) === positions.getZ(b);
     for (let first = 0; first < positions.count;) {
         const name = materialOf(first), crown = architectural.has(name);
@@ -61,6 +66,9 @@ export function nightWindowMask(geometry, buildingId, materialOf) {
         const floor = Math.round(y / count / 3.4), across = Math.floor(x / count / 7), depth = Math.floor(z / count / 7);
         const room = hash(`${buildingId}:${floor}:${across}:${depth}`);
         const brightness = hash(`${buildingId}:${floor}:${across}:${depth}:brightness`);
+        const tint = crown ? architecturalTint : 0.65 * buildingTint
+            + 0.2 * hash(`${buildingId}:${floor}:fixture`)
+            + 0.15 * hash(`${buildingId}:${floor}:${across}:${depth}:fixture`);
         for (let vertex = first; vertex < end; vertex += 1) {
             if (materialOf(vertex) !== name)
                 continue;
@@ -68,7 +76,7 @@ export function nightWindowMask(geometry, buildingId, materialOf) {
             mask[vertex * 4] = rank;
             mask[vertex * 4 + 1] = crown ? 0.3 : 0.25 + brightness * 0.45;
             mask[vertex * 4 + 2] = crown ? 2 : 1;
-            mask[vertex * 4 + 3] = brightness;
+            mask[vertex * 4 + 3] = tint;
         }
         first = end;
     }

package/lib/models/sheraton-grand-geographic.d.ts

@@ -5,6 +5,8 @@ export declare const sheratonLevels: Readonly<{
     topFloor: 97;
     corner: 100.1;
     arms: number;
+    wing: number;
+    wingEnd: number;
     drum: 12.2;
     top: 112.3;
 }>;

package/lib/models/sheraton-grand-geographic.js

@@ -2,8 +2,9 @@ import * as THREE from "../vendor/three-r186.js";
 import { createBuilder, polygonOf } from "./building-kit.js";
 import { chainSkin, chainsOf, orient, paintedSlab, planOf, turnsAt } from "./facade-grid.js";
 // The Sheraton Grand Chicago Riverwalk, 301 East North Water Street (Solomon Cordwell Buenz,
-// 1992): the geographic layout's model, on the mapped tower 592122464 and its corner part
-// 1269924307. The original layout has no model of it. The drawing's `buckingham-east` group,
+// 1992): the geographic layout's model, on mapped tower 592122464, corner part
+// 1269924307, and east-wing parts 1269924305/1269924304. The original layout has no
+// model of it. The drawing's `buckingham-east` group,
 // right of The Buckingham, is its corner: a lit crown over a tower of windows.
 //
 // A cream precast tower on an L, its arms ending in round towers, of punched windows at the
@@ -17,17 +18,21 @@ export const sheratonLevels = Object.freeze({
     topFloor: 97, // the Skyscraper Center's occupied height, the corner's top floor
     corner: 100.1, // the corner's roof, a floor-to-roof of 3.1 m over it as Emporis gives it
     arms: 100.1 - 2 * 2.67, // the arms' roof, two floors lower, at the mapped arms' 32 levels
+    wing: 100.1 - 6 * 2.67, // 28-level east wing, relative to the 34-level corner's datum
+    wingEnd: 100.1 - 5 * 2.67, // the mapped 29-level round end, a floor above its wing
     drum: 12.2, // the drums' height, Emporis's architectural height over its main roof
     top: 112.3, // the corner drum's top, the Skyscraper Center's architectural height
 });
 const h = sheratonLevels;
 // The round ends the drums stand on, circles fitted to the mapped parts' arcs within 11 cm:
 // the corner, part 1269924307, and the east and north arms' ends, parts 1269924306 and
-// 1269924308. Centres are east and north metres from Crain's centre.
+// 1269924308, plus the east wing's end, 1269924304 (within 1.7 cm).
+// Centres are east and north metres from Crain's centre; map precision is not survey accuracy.
 export const sheratonDrums = Object.freeze([
     { centre: [407.44, 465.95], radius: 7.97, base: h.corner },
     { centre: [439.52, 462.06], radius: 7.37, base: h.arms },
     { centre: [409.75, 498.32], radius: 7.39, base: h.arms },
+    { centre: [482.703, 457.389], radius: 7.391, base: h.wingEnd },
 ]);
 // The skins' colours: the window tones, the precast, and the drums' cream and maroon fins,
 // which no window shares.
@@ -69,6 +74,8 @@ export function createSheratonGrandGeographicBuilding(record, projectPlan, offse
         return [centre[0] + radius * Math.cos(angle), -centre[1] + radius * Math.sin(angle)];
     }));
     const cornerPlan = orient(polygonOf(projectPlan(record.parts[1].coordinates)));
+    const wing = orient(polygonOf(projectPlan(record.parts[2].coordinates)));
+    const wingEnd = orient(polygonOf(projectPlan(record.parts[3].coordinates)));
     // A closed solid of walls and slabs on an outline, painted by its runs.
     const solid = (target, outline, lo, hi, paint) => {
         planOf(outline).forEach((run, k) => {
@@ -82,13 +89,21 @@ export function createSheratonGrandGeographicBuilding(record, projectPlan, offse
     // over it.
     solid(shell, tower, 0, h.arms, () => core);
     solid(shell, cornerPlan, h.arms, h.corner, () => core);
+    solid(shell, wing, 0, h.wing, () => core);
+    solid(shell, wingEnd, h.wing, h.wingEnd, () => core);
     // Each drum: cream, a maroon fin every other facet, on its round end.
     for (const { centre, radius, base } of sheratonDrums)
         solid(drums, circle(centre, radius), base, base + h.drum, (k) => (k % 2 ? fin : drumFace));
     // The skins, one box to a chain of runs turning less than 30°, so the round ends carry one:
     // a window 1.4 m wide in each 2.4 m bay, set out from the chain's middle, on every floor.
-    const skin = (outline, base, top, seed) => {
+    const towerRows = rowsFor(0.25, h.arms);
+    const skin = (outline, base, top, seed, sharedWith) => {
         const plan = planOf(outline), heights = rowsFor(base, top);
+        const same = (a, b) => Math.hypot(a[0] - b[0], a[1] - b[1]) < 1e-6;
+        const shared = plan.map((run) => sharedWith?.some((a, index) => {
+            const b = sharedWith[(index + 1) % sharedWith.length];
+            return same(run.at(0), b) && same(run.at(run.length), a);
+        }) ?? false);
         chainsOf(plan, 30 * Math.PI / 180).forEach((chain, index) => {
             const first = chain.runs[0], last = chain.runs.at(-1);
             const s0 = turnsAt(plan, first)[0] > 0 ? 0.09 : 0.02, s1 = chain.length - (turnsAt(plan, last)[1] > 0 ? 0.09 : 0.02);
@@ -96,14 +111,36 @@ export function createSheratonGrandGeographicBuilding(record, projectPlan, offse
             const centres = Array.from({ length: 2 * count + 1 }, (_, k) => chain.length / 2 + (k - count) * 2.4);
             const cuts = centres.flatMap((c) => [c - 0.7, c + 0.7]).filter((s) => s > s0 + 0.01 && s < s1 - 0.01);
             const columns = [s0, ...cuts, s1];
-            chainSkin(kit, wall, plan, chain, 0, chain.runs.length - 1, s0, s1, columns, heights, 0.02, 0.07, (bay, r) => {
-                const middle = (columns[bay - 1] + columns[bay]) / 2;
-                return r % 2 === 1 && centres.some((c) => Math.abs(middle - c) < 0.7) ? paneColor(r, bay, seed * 16 + index) : precast;
-            }, precast);
+            // The two mapped parts meet along the old east drum's arc. Below the
+            // wing roof it is an internal wall: retain closed cores, but do not put
+            // overlapping facade skins on that shared boundary. Keep bay positions
+            // tied to the original chain when trimming the visible segments.
+            for (let k0 = 0; k0 < chain.runs.length;) {
+                if (shared[chain.runs[k0]]) {
+                    k0 += 1;
+                    continue;
+                }
+                let k1 = k0;
+                while (k1 + 1 < chain.runs.length && !shared[chain.runs[k1 + 1]])
+                    k1 += 1;
+                const from = k0 === 0 ? s0 : chain.starts[k0] + 0.09;
+                const to = k1 === chain.runs.length - 1 ? s1 : chain.starts[k1] + plan[chain.runs[k1]].length - 0.09;
+                chainSkin(kit, wall, plan, chain, k0, k1, from, to, columns, heights, 0.02, 0.07, (bay, r) => {
+                    const middle = (columns[bay - 1] + columns[bay]) / 2;
+                    // Keep the original tower's floor seed through the split at the
+                    // wing roof, rather than restarting its window pattern above it.
+                    const row = seed === 0 ? towerRows.findIndex((y) => Math.abs(y - heights[r]) < 1e-5) : r;
+                    return r % 2 === 1 && centres.some((c) => Math.abs(middle - c) < 0.7) ? paneColor(row, bay, seed * 16 + index) : precast;
+                }, precast);
+                k0 = k1 + 1;
+            }
         });
     };
-    skin(tower, 0.25, h.arms, 0);
+    skin(tower, 0.25, h.wing, 0, wing);
+    skin(tower, h.wing, h.arms, 0);
     skin(cornerPlan, h.arms, h.corner, 1);
+    skin(wing, 0.25, h.wing, 2, tower);
+    skin(wingEnd, h.wing, h.wingEnd, 3);
     const model = kit.finish({ height: h.top, outlines: [shell, drums], opacity: 0.16 });
     model.building.position.set(offset[0], 0, offset[1]);
     model.building.userData["geography"] = record;

package/lib/models/skyline-geography-data.d.ts

@@ -29,6 +29,7 @@ export interface GeoBuilding {
         version: number;
         coordinates: [number, number][];
     };
+    groundFootprintWays?: number[];
     parts: GeoPart[];
 }
 export interface GeoStreet {

package/lib/models/skyline-geography-data.js

@@ -8,7 +8,8 @@
 // Ascher Buildings and the Chicago Athletic Association 2026-09-29, and those of Two Illinois
 // Center and River Plaza, with River Plaza's parts, the Hyatt Regency West Tower's part, the
 // Sheraton Grand's tower and corner parts, Three Illinois Center's outline, and the Swissôtel's
-// tower part, the same day.
+// tower part, the same day. Sheraton Grand's east-wing parts were added from
+// the OSM API on 2026-10-17; their roof heights are estimates on the tower datum.
 // © OpenStreetMap contributors, ODbL 1.0.
 // Coordinates are [longitude, latitude] in WGS84. See docs/skyline-geography.md.
 export const geographicBuildings = [
@@ -43,7 +44,7 @@ export const geographicBuildings = [
     { "id": "building-office-west-of-aon", "name": "Two Illinois Center", "shortName": "Two Illinois Center", "height": 114.3, "tipHeight": 114.3, "heightSource": "https://www.skyscrapercenter.com/chicago/two-illinois-center/11095", "note": "Detailed Two Illinois Center: the mapped outline; a dark curtain wall of 32 storeys, mullions on a 5 ft module with glass over a spandrel on every floor at the photograph's 3.55 m pitch, and the top two floors' mechanical band, to a flat roof at the Skyscraper Center's 114.3 m. From the photograph's camera its lit floors fill the lower part of the gap between Two Prudential Plaza and Aon Center, in front of River Plaza.", "footprint": { "way": 236770799, "version": 3, "coordinates": [[-87.6235661, 41.8871124], [-87.6235636, 41.8871174], [-87.6235524, 41.8871216], [-87.6225645, 41.8871339], [-87.622551, 41.8871289], [-87.6225466, 41.8871186], [-87.622541, 41.8867998], [-87.6225469, 41.8867912], [-87.6225543, 41.8867879], [-87.6225638, 41.8867865], [-87.6228061, 41.8867819], [-87.6231721, 41.8867773], [-87.6235523, 41.886775], [-87.623557, 41.8867781], [-87.6235613, 41.8867836]] }, "parts": [{ "way": 236770799, "version": 3, "coordinates": [[-87.6235661, 41.8871124], [-87.6235636, 41.8871174], [-87.6235524, 41.8871216], [-87.6225645, 41.8871339], [-87.622551, 41.8871289], [-87.6225466, 41.8871186], [-87.622541, 41.8867998], [-87.6225469, 41.8867912], [-87.6225543, 41.8867879], [-87.6225638, 41.8867865], [-87.6228061, 41.8867819], [-87.6231721, 41.8867773], [-87.6235523, 41.886775], [-87.623557, 41.8867781], [-87.6235613, 41.8867836]], "bottom": 0, "top": 114.3 }] },
     { "id": "building-river-plaza", "name": "River Plaza", "shortName": "River Plaza", "height": 159.7, "tipHeight": 159.7, "heightSource": "https://www.skyscrapercenter.com/chicago/river-plaza/3383", "note": "Detailed River Plaza: the mapped outline and its parts; a white concrete slab of 56 storeys with notched corners, a grid of exposed frame and punched windows over the podium on the river side, to a flat roof at OpenStreetMap's 156 m, under the box on it to the Skyscraper Center's 159.7 m, its architectural height and tip; OpenStreetMap's 166 m for the box stands over the published tip. From the photograph's camera its top fills the gap between Two Prudential Plaza and Aon Center behind Two Illinois Center, the only mapped building on that sightline tall enough to reach the drawn top.", "footprint": { "way": 285867424, "version": 6, "coordinates": [[-87.6260818, 41.8900013], [-87.6261095, 41.8899782], [-87.6261086, 41.8899259], [-87.6261285, 41.8899127], [-87.6261269, 41.8898753], [-87.6261044, 41.8898588], [-87.6261035, 41.8898229], [-87.626103, 41.8898052], [-87.6260771, 41.8897865], [-87.6259425, 41.8896905], [-87.6257902, 41.8895791], [-87.6257288, 41.8895898], [-87.6255231, 41.8896255], [-87.6255256, 41.8897934], [-87.6254949, 41.8897941], [-87.6254648, 41.889817], [-87.6254664, 41.8898714], [-87.6254461, 41.8898877], [-87.6254474, 41.8899257], [-87.6254684, 41.8899384], [-87.6254701, 41.8899906], [-87.6255035, 41.8900132], [-87.625675, 41.8900085], [-87.6256968, 41.8899927], [-87.6258816, 41.8899874], [-87.6259031, 41.8900027]] }, "parts": [{ "way": 68796725, "version": 10, "coordinates": [[-87.6254648, 41.889817], [-87.6254664, 41.8898714], [-87.6254461, 41.8898877], [-87.6254474, 41.8899257], [-87.6254684, 41.8899384], [-87.6254701, 41.8899906], [-87.6255035, 41.8900132], [-87.625675, 41.8900085], [-87.6256968, 41.8899927], [-87.6258816, 41.8899874], [-87.6259031, 41.8900027], [-87.6260818, 41.8900013], [-87.6261095, 41.8899782], [-87.6261086, 41.8899259], [-87.6261285, 41.8899127], [-87.6261269, 41.8898753], [-87.6261044, 41.8898588], [-87.6261035, 41.8898229], [-87.626103, 41.8898052], [-87.6260771, 41.8897865], [-87.6258989, 41.8897905], [-87.6258799, 41.8898052], [-87.6256906, 41.8898092], [-87.6256664, 41.8897938], [-87.6255256, 41.8897934], [-87.6254949, 41.8897941]], "bottom": 0, "top": 156 }, { "way": 68796733, "version": 5, "coordinates": [[-87.6260771, 41.8897865], [-87.6259425, 41.8896905], [-87.6257902, 41.8895791], [-87.6257288, 41.8895898], [-87.6255231, 41.8896255], [-87.6255256, 41.8897934], [-87.6256664, 41.8897938], [-87.6256906, 41.8898092], [-87.6258799, 41.8898052], [-87.6258989, 41.8897905]], "bottom": 0, "top": 8 }, { "way": 285867425, "version": 1, "coordinates": [[-87.6258543, 41.8899579], [-87.6257153, 41.8899611], [-87.6257111, 41.8898629], [-87.6258501, 41.8898597]], "bottom": 156, "top": 159.7 }] },
     { "id": "building-hyatt-regency-west-tower", "name": "Hyatt Regency Chicago West Tower", "shortName": "Hyatt West Tower", "height": 111.3, "tipHeight": 111.3, "heightSource": "https://www.skyscrapercenter.com/building/hyatt-regency-chicago-west-tower/13132", "note": "Detailed Hyatt Regency Chicago West Tower: its mapped part of the hotel's outline; a brick slab of 33 storeys, narrow window slots continuous from the lobby to the top two floors on a 3.5 m module between solid corners, and a plain band over them to a flat roof at the Skyscraper Center's 111.3 m. From the photograph's camera it stands between Aon Center and the Blue Cross and Blue Shield Tower, where the drawing's Blue Cross group paints a dark brown sliver.", "footprint": { "way": 235920252, "version": 4, "coordinates": [[-87.6227574, 41.887587], [-87.6228537, 41.887584], [-87.6228521, 41.8874603], [-87.6228518, 41.8874165], [-87.6225427, 41.8874231], [-87.6225408, 41.8875106], [-87.6225253, 41.8875109], [-87.6225266, 41.8875277], [-87.6225277, 41.8875513], [-87.622528, 41.8875746], [-87.6225382, 41.8878947], [-87.62255, 41.8878954], [-87.6225496, 41.8879846], [-87.6228658, 41.8879789], [-87.6228643, 41.8879388], [-87.6228611, 41.8878099], [-87.6227664, 41.8878103]] }, "parts": [{ "way": 235920252, "version": 4, "coordinates": [[-87.6227574, 41.887587], [-87.6228537, 41.887584], [-87.6228521, 41.8874603], [-87.6228518, 41.8874165], [-87.6225427, 41.8874231], [-87.6225408, 41.8875106], [-87.6225253, 41.8875109], [-87.6225266, 41.8875277], [-87.6225277, 41.8875513], [-87.622528, 41.8875746], [-87.6225382, 41.8878947], [-87.62255, 41.8878954], [-87.6225496, 41.8879846], [-87.6228658, 41.8879789], [-87.6228643, 41.8879388], [-87.6228611, 41.8878099], [-87.6227664, 41.8878103]], "bottom": 0, "top": 111.3 }] },
-    { "id": "building-buckingham-east", "name": "Sheraton Grand Chicago Riverwalk", "shortName": "Sheraton Grand", "height": 112.3, "tipHeight": 112.3, "heightSource": "https://www.skyscrapercenter.com/building/sheraton-chicago-hotel-towers/10020", "note": "Detailed Sheraton Grand Chicago Riverwalk: the mapped tower and its corner part; a cream precast tower on an L of punched windows at Emporis's 2.67 m floor-to-floor, its arms to 94.76 m, the corner's round tower two floors higher to 100.1 m, and a drum of cream and maroon fins on each round end, the corner's to the Skyscraper Center's 112.3 m. Heights stand on the Skyscraper Center's datum: its top floor at 97 m, a floor-to-roof of 3.1 m and 12.2 m drums as Emporis gives them; the published height nearest the drawing's reading, over Emporis's 330.56 ft. The Skyscraper Center's 112.8 m tip, 50 cm over the drum, is not modelled. The drawing's buckingham-east group is its corner's lit drum over its tower.", "footprint": { "way": 592122464, "version": 5, "coordinates": [[-87.6199499, 41.8891119], [-87.6199176, 41.8893381], [-87.6199306, 41.8893589], [-87.6199502, 41.8893716], [-87.6199845, 41.8893878], [-87.6200276, 41.8893957], [-87.6200732, 41.8893915], [-87.6201147, 41.8893744], [-87.6201372, 41.8893482], [-87.6201463, 41.8893162], [-87.6201584, 41.8892447], [-87.6201841, 41.889063], [-87.6201875, 41.8890302], [-87.6201812, 41.8889946], [-87.6201588, 41.8889641], [-87.620121, 41.8889384], [-87.6200743, 41.8889276], [-87.6196505, 41.8888958], [-87.6196025, 41.8889162], [-87.6195726, 41.8889427], [-87.6195591, 41.8889735], [-87.6195627, 41.8890068], [-87.6195846, 41.8890373], [-87.6196228, 41.8890638], [-87.6198263, 41.8890777], [-87.6198225, 41.889104]] }, "parts": [{ "way": 592122464, "version": 5, "coordinates": [[-87.6199499, 41.8891119], [-87.6199176, 41.8893381], [-87.6199306, 41.8893589], [-87.6199502, 41.8893716], [-87.6199845, 41.8893878], [-87.6200276, 41.8893957], [-87.6200732, 41.8893915], [-87.6201147, 41.8893744], [-87.6201372, 41.8893482], [-87.6201463, 41.8893162], [-87.6201584, 41.8892447], [-87.6201841, 41.889063], [-87.6201875, 41.8890302], [-87.6201812, 41.8889946], [-87.6201588, 41.8889641], [-87.620121, 41.8889384], [-87.6200743, 41.8889276], [-87.6196505, 41.8888958], [-87.6196025, 41.8889162], [-87.6195726, 41.8889427], [-87.6195591, 41.8889735], [-87.6195627, 41.8890068], [-87.6195846, 41.8890373], [-87.6196228, 41.8890638], [-87.6198263, 41.8890777], [-87.6198225, 41.889104]], "bottom": 0, "top": 94.76 }, { "way": 1269924307, "version": 1, "coordinates": [[-87.6199691, 41.8890378], [-87.6199677, 41.889013], [-87.6199719, 41.8889952], [-87.6199903, 41.8889744], [-87.6200135, 41.88896], [-87.6200416, 41.8889517], [-87.6200717, 41.8889503], [-87.6201037, 41.8889568], [-87.6201308, 41.8889711], [-87.6201498, 41.8889914], [-87.6201583, 41.8890152], [-87.6201555, 41.8890398], [-87.6201415, 41.8890622], [-87.6201241, 41.8890776], [-87.6200882, 41.8890904], [-87.6200552, 41.8890928], [-87.6200258, 41.8890875], [-87.6200001, 41.8890757], [-87.6199805, 41.8890586]], "bottom": 94.76, "top": 100.1 }] },
+    { "id": "building-buckingham-east", "name": "Sheraton Grand Chicago Riverwalk", "shortName": "Sheraton Grand", "height": 112.3, "tipHeight": 112.3, "heightSource": "https://www.skyscrapercenter.com/building/sheraton-chicago-hotel-towers/10020", "note": "Detailed Sheraton Grand Chicago Riverwalk: the mapped tower and its corner part; a cream precast tower on an L of punched windows at Emporis's 2.67 m floor-to-floor, its arms to 94.76 m, the corner's round tower two floors higher to 100.1 m, and a drum of cream and maroon fins on each round end, the corner's to the Skyscraper Center's 112.3 m. Heights stand on the Skyscraper Center's datum: its top floor at 97 m, a floor-to-roof of 3.1 m and 12.2 m drums as Emporis gives them; the published height nearest the drawing's reading, over Emporis's 330.56 ft. The Skyscraper Center's 112.8 m tip, 50 cm over the drum, is not modelled. The drawing's buckingham-east group is its corner's lit drum over its tower. The mapped east wing and its round end continue the hotel to the east, with estimated roofs at 84.08 m and 86.75 m on the same height datum and a fourth crown. Photographs from before 2013 establish the wing; exact roof and crown dimensions remain inferred.", "footprint": { "way": 592122464, "version": 5, "coordinates": [[-87.6199499, 41.8891119], [-87.6199176, 41.8893381], [-87.6199306, 41.8893589], [-87.6199502, 41.8893716], [-87.6199845, 41.8893878], [-87.6200276, 41.8893957], [-87.6200732, 41.8893915], [-87.6201147, 41.8893744], [-87.6201372, 41.8893482], [-87.6201463, 41.8893162], [-87.6201584, 41.8892447], [-87.6201841, 41.889063], [-87.6201875, 41.8890302], [-87.6201812, 41.8889946], [-87.6201588, 41.8889641], [-87.620121, 41.8889384], [-87.6200743, 41.8889276], [-87.6196505, 41.8888958], [-87.6196025, 41.8889162], [-87.6195726, 41.8889427], [-87.6195591, 41.8889735], [-87.6195627, 41.8890068], [-87.6195846, 41.8890373], [-87.6196228, 41.8890638], [-87.6198263, 41.8890777], [-87.6198225, 41.889104]] }, "parts": [{ "way": 592122464, "version": 5, "coordinates": [[-87.6199499, 41.8891119], [-87.6199176, 41.8893381], [-87.6199306, 41.8893589], [-87.6199502, 41.8893716], [-87.6199845, 41.8893878], [-87.6200276, 41.8893957], [-87.6200732, 41.8893915], [-87.6201147, 41.8893744], [-87.6201372, 41.8893482], [-87.6201463, 41.8893162], [-87.6201584, 41.8892447], [-87.6201841, 41.889063], [-87.6201875, 41.8890302], [-87.6201812, 41.8889946], [-87.6201588, 41.8889641], [-87.620121, 41.8889384], [-87.6200743, 41.8889276], [-87.6196505, 41.8888958], [-87.6196025, 41.8889162], [-87.6195726, 41.8889427], [-87.6195591, 41.8889735], [-87.6195627, 41.8890068], [-87.6195846, 41.8890373], [-87.6196228, 41.8890638], [-87.6198263, 41.8890777], [-87.6198225, 41.889104]], "bottom": 0, "top": 94.76 }, { "way": 1269924307, "version": 1, "coordinates": [[-87.6199691, 41.8890378], [-87.6199677, 41.889013], [-87.6199719, 41.8889952], [-87.6199903, 41.8889744], [-87.6200135, 41.88896], [-87.6200416, 41.8889517], [-87.6200717, 41.8889503], [-87.6201037, 41.8889568], [-87.6201308, 41.8889711], [-87.6201498, 41.8889914], [-87.6201583, 41.8890152], [-87.6201555, 41.8890398], [-87.6201415, 41.8890622], [-87.6201241, 41.8890776], [-87.6200882, 41.8890904], [-87.6200552, 41.8890928], [-87.6200258, 41.8890875], [-87.6200001, 41.8890757], [-87.6199805, 41.8890586]], "bottom": 94.76, "top": 100.1 }, { "way": 1269924305, "version": 1, "coordinates": [[-87.6191033, 41.8890226], [-87.6190622, 41.8889954], [-87.6190428, 41.8889627], [-87.6190431, 41.8889236], [-87.6190607, 41.8888928], [-87.619091, 41.8888724], [-87.6191278, 41.8888566], [-87.6193634, 41.8888743], [-87.6196505, 41.8888958], [-87.6196025, 41.8889162], [-87.6195726, 41.8889427], [-87.6195591, 41.8889735], [-87.6195627, 41.8890068], [-87.6195846, 41.8890373], [-87.6196228, 41.8890638]], "bottom": 0, "top": 84.08, "estimatedHeight": true }, { "way": 1269924304, "version": 1, "coordinates": [[-87.619112, 41.8888866], [-87.61909, 41.8888996], [-87.6190746, 41.888917], [-87.6190672, 41.8889372], [-87.6190685, 41.8889581], [-87.6190786, 41.8889777], [-87.6190963, 41.8889939], [-87.6191199, 41.8890052], [-87.6191471, 41.8890105], [-87.6191778, 41.8890088], [-87.6192059, 41.8889994], [-87.619228, 41.8889835], [-87.6192416, 41.8889629], [-87.6192449, 41.8889401], [-87.6192376, 41.8889179], [-87.6192207, 41.8888988], [-87.6191959, 41.8888851], [-87.6191665, 41.8888785], [-87.6191384, 41.8888793]], "bottom": 84.08, "top": 86.75, "estimatedHeight": true }], "groundFootprintWays": [592122464, 1269924305] },
     { "id": "building-three-illinois-center", "name": "Three Illinois Center", "shortName": "Three Illinois Center", "height": 106.7, "tipHeight": 106.7, "heightSource": "https://www.skyscrapercenter.com/building/three-illinois-center/13913", "note": "Detailed Three Illinois Center: the mapped outline; a dark bronze curtain wall of 30 storeys, mullions on a 5 ft module and glass over a spandrel on each floor at the published 11.5 ft slab to slab over a 5.06 m lobby, and the top two floors' windowless mechanical penthouse, glazed about 2019 but kept as the 2013 photograph shows it, under a flat roof at the Skyscraper Center's and Emporis's 350 ft. Its east end fills the gap between 340 on the Park and The Buckingham, where the drawing's buckingham-west group paints an office tower whose top stands about 140 layer units higher.", "footprint": { "way": 95486958, "version": 12, "coordinates": [[-87.6204966, 41.8869542], [-87.6202534, 41.8869566], [-87.6200384, 41.8869571], [-87.6200396, 41.887005], [-87.6200455, 41.8873733], [-87.620058, 41.8876286], [-87.6205101, 41.8876189], [-87.6205054, 41.8873683]] }, "parts": [{ "way": 95486958, "version": 12, "coordinates": [[-87.6204966, 41.8869542], [-87.6202534, 41.8869566], [-87.6200384, 41.8869571], [-87.6200396, 41.887005], [-87.6200455, 41.8873733], [-87.620058, 41.8876286], [-87.6205101, 41.8876189], [-87.6205054, 41.8873683]], "bottom": 0, "top": 106.7 }] },
     { "id": "building-swissotel", "name": "Swissôtel Chicago", "shortName": "Swissôtel", "height": 139.3, "tipHeight": 139.3, "heightSource": "https://www.skyscrapercenter.com/building/swissotel-chicago/4362", "note": "Detailed Swissôtel Chicago: the hotel's mapped tower part, a triangle; a flush grid of reflective glass, thin mullions about 1.5 m apart and a transom at each of OpenStreetMap's 45 levels, under a flat roof at the Skyscraper Center's 139.3 m. It stands behind Three Illinois Center and The Buckingham from the drawing's camera, and fills the seam where their corners meet. The hotel's outline, 95486966, adds a small block on the tower's north-east face, and its podium, 95486953, carries no height; neither is modelled.", "footprint": { "way": 641288601, "version": 3, "coordinates": [[-87.6194102, 41.8874254], [-87.619534, 41.8875706], [-87.619676, 41.8873866], [-87.6198184, 41.8871906], [-87.6192311, 41.8871971], [-87.619375, 41.8873843]] }, "parts": [{ "way": 641288601, "version": 3, "coordinates": [[-87.6194102, 41.8874254], [-87.619534, 41.8875706], [-87.619676, 41.8873866], [-87.6198184, 41.8871906], [-87.6192311, 41.8871971], [-87.619375, 41.8873843]], "bottom": 0, "top": 139.3 }] },
 ];

package/lib/models/skyline-geography.d.ts

@@ -10,6 +10,13 @@ export declare function footprintMetrics(coordinates: [number, number][]): {
     size: Vec2;
     area: number;
 };
+export declare function groundFootprints(record: GeoBuilding): GeoBuilding["footprint"][];
+export declare function buildingGroundBounds(record: GeoBuilding): {
+    min: Vec2;
+    max: Vec2;
+    center: Vec2;
+    size: Vec2;
+};
 export declare function createGeographicBuilding(record: GeoBuilding, offset?: [number, number]): BuildingModel;
 export declare function streetWidth(street: GeoStreet): number;
 export declare function createGeographicRoads(bounds: {

package/lib/models/skyline-geography.js

@@ -56,6 +56,23 @@ export function footprintMetrics(coordinates) {
     }, 0)) / 2;
     return { min, max, center: min.map((n, i) => (n + max[i]) / 2), size: min.map((n, i) => max[i] - n), area };
 }
+// Some complexes have separately mapped wings beyond the primary way. Keep
+// their source ways intact, and opt in only disjoint ground parts of this model.
+export function groundFootprints(record) {
+    if (!record.groundFootprintWays)
+        return [record.footprint];
+    return record.groundFootprintWays.map((way) => {
+        const part = record.parts.find((entry) => entry.way === way && entry.bottom === 0);
+        if (!part)
+            throw new Error(`Missing ground footprint ${way} for ${record.id}`);
+        return part;
+    });
+}
+export function buildingGroundBounds(record) {
+    // Only extrema are meaningful for concatenated rings, not a polygon's area.
+    const { min, max, center, size } = footprintMetrics(groundFootprints(record).flatMap((part) => part.coordinates));
+    return { min, max, center, size };
+}
 function plan(coordinates) {
     const points = coordinates.map((p) => { const [east, north] = projectGround(p); return [east, -north]; });
     const area = points.reduce((sum, a, i) => {
@@ -313,8 +330,20 @@ export function createGeographicGround(offset = [0, 0]) {
     group.add(streets);
     const outlines = [];
     for (const record of geographicBuildings) {
-        const points = record.footprint.coordinates.map((p) => { const [x, y] = projectGround(p); return [x, 0.1, -y]; });
-        points.forEach((p, i) => outlines.push(p, points[(i + 1) % points.length]));
+        const edges = new Map();
+        for (const footprint of groundFootprints(record)) {
+            const points = footprint.coordinates.map((p) => { const [x, y] = projectGround(p); return [x, 0.1, -y]; });
+            points.forEach((p, i) => {
+                const q = points[(i + 1) % points.length];
+                const key = [p.join(","), q.join(",")].sort().join(";");
+                const prior = edges.get(key);
+                edges.set(key, { points: [p, q], count: (prior?.count ?? 0) + 1 });
+            });
+        }
+        // Shared mapped boundaries are inside the complex, not its ground outline.
+        for (const edge of edges.values())
+            if (edge.count === 1)
+                outlines.push(...edge.points);
     }
     const footprints = lines(outlines, 0xc9c9c9);
     group.add(footprints);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a2f0/skyline",
-  "version": "0.2.26",
+  "version": "0.2.28",
   "description": "Interactive Chicago skyline viewer and reusable Three.js building models",
   "license": "UNLICENSED",
   "repository": {

package/site/building-detail.js

@@ -2,7 +2,7 @@ import * as THREE from "./vendor/three-r186.js";
 import { createBuildingStudy } from "./study-viewer.js";
 import { skylineAzimuth } from "./skyline-comparison.js";
 import { geographicBuildings } from "./models/skyline-geography-data.js";
-import { createGeographicBuilding, footprintMetrics, geographicOrigin } from "./models/skyline-geography.js";
+import { createGeographicBuilding, buildingGroundBounds, groundFootprints, geographicOrigin } from "./models/skyline-geography.js";
 import { createTimeLighting } from "./time-of-day.js";
 import { createDaylight, createSkylineColour } from "./models/colour-materials.js";
 // One mapped building of the 3D skyline, alone on its own platform, as the building study
@@ -19,7 +19,7 @@ export function showBuildingDetail({ root, id, frame, signal, colour = false, on
     return undefined;
 }
 function showBuilding(record, root, frame, signal, initiallyColoured, onColourChange) {
-    const footprint = footprintMetrics(record.footprint.coordinates);
+    const footprint = buildingGroundBounds(record);
     // Centred on its mapped outline: ground coordinates are east and north, the scene's x and -z.
     const model = createGeographicBuilding(record, [-footprint.center[0], footprint.center[1]]);
     // The page names the building before the 3D view starts, so a failed start leaves it named.
@@ -35,8 +35,11 @@ function showBuilding(record, root, frame, signal, initiallyColoured, onColourCh
     const source = link(document, record.heightSource, record.heightFromDrawing ? `${number(record.height)}, measured on the drawing` : `${number(record.height)} architectural${osm}`);
     heights.replaceChildren(source, ...record.tipHeight !== record.height ? [` · tip ${number(record.tipHeight)}`] : []);
     root.querySelector("#building-note").textContent = record.note;
-    const way = link(document, `https://www.openstreetmap.org/way/${record.footprint.way}`, `OpenStreetMap way ${record.footprint.way}`);
-    root.querySelector("#building-facts").replaceChildren(`Mapped outline ${footprint.size[0].toFixed(1)} × ${footprint.size[1].toFixed(1)} m, from `, way, `. Model: ${model.triangleCount.toLocaleString("en-US")} triangles.`);
+    const ways = groundFootprints(record).flatMap((part, index) => [
+        ...index ? [" and "] : [],
+        link(document, `https://www.openstreetmap.org/way/${part.way}`, `OpenStreetMap way ${part.way}`),
+    ]);
+    root.querySelector("#building-facts").replaceChildren(`Mapped outline ${footprint.size[0].toFixed(1)} × ${footprint.size[1].toFixed(1)} m, from `, ...ways, `. Model: ${model.triangleCount.toLocaleString("en-US")} triangles.`);
     const min = new THREE.Vector3(Infinity, Infinity, Infinity), max = new THREE.Vector3(-Infinity, -Infinity, -Infinity);
     model.building.updateMatrixWorld(true);
     model.building.traverse((child) => {

package/site/models/colour-palette.js

@@ -290,8 +290,9 @@ export const measuredColours = {
 // above the horizon, each the median of a clear box of the same panorama (scripts/sample-colours.ts,
 // the day study's sky), and the sun's warm white, chosen.
 export const daylightColours = { sky: 0x9ebbdb, horizon: 0xc4d1e1, sun: 0xfff4e6 };
-// Art-directed night illumination: quiet cool facades and a mix of warm office lamps.
-export const nightColours = { ambient: 0xa1afc8, fill: 0x8d9fbd, window: 0xffcf91, windowWhite: 0xffedce };
+// Illustrated warm, neutral and cool white fixtures; not calibrated Kelvin values.
+// DOE's white-tuning overview informs the range; see docs/viewer.md (time of day).
+export const nightColours = { ambient: 0xa1afc8, fill: 0x8d9fbd, window: 0xffc17d, windowWhite: 0xffedda, windowCool: 0xdceaff };
 // Illustrated clear-sky time previews. Solar elevation chooses the stops; these are
 // artistic colours, separate from the photograph-calibrated daytime palette above.
 export const timeOfDayColours = [

package/site/models/colour-reflections.js

@@ -22,6 +22,7 @@ export function glassReflection(material, geometry, mask, windows = new Float32A
         skylineWindowsSuppressed: { value: 0 },
         skylineWindowWarm: { value: new THREE.Color(nightColours.window) },
         skylineWindowWhite: { value: new THREE.Color(nightColours.windowWhite) },
+        skylineWindowCool: { value: new THREE.Color(nightColours.windowCool) },
     };
     const compile = (shader, renderer) => {
         originalCompile.call(material, shader, renderer);
@@ -44,7 +45,8 @@ uniform float skylineDarkness;
 uniform float skylineActivity;
 uniform float skylineWindowsSuppressed;
 uniform vec3 skylineWindowWarm;
-uniform vec3 skylineWindowWhite;`).replace("#include <opaque_fragment>", `
+uniform vec3 skylineWindowWhite;
+uniform vec3 skylineWindowCool;`).replace("#include <opaque_fragment>", `
 if (vSkylineGlass > 0.0 && skylineReflecting > 0.0) {
   vec3 eye = vec3(0.0);
   eye.z = 1.0;
@@ -59,7 +61,10 @@ if (vSkylineWindow.z > 0.0 && skylineDarkness > 0.0) {
   float occupied = 1.0 - smoothstep(skylineActivity - 0.05, skylineActivity + 0.05, vSkylineWindow.x);
   float dusk = smoothstep(0.12 + 0.35 * vSkylineWindow.x, 0.45 + 0.35 * vSkylineWindow.x, skylineDarkness);
   float light = vSkylineWindow.z > 1.5 ? skylineDarkness : occupied * dusk * (1.0 - skylineWindowsSuppressed);
-  vec3 lamp = mix(skylineWindowWarm, skylineWindowWhite, vSkylineWindow.w);
+  float tint = vSkylineWindow.w;
+  vec3 lamp = tint < 0.5
+    ? mix(skylineWindowWarm, skylineWindowWhite, tint * 2.0)
+    : mix(skylineWindowWhite, skylineWindowCool, (tint - 0.5) * 2.0);
   outgoingLight += lamp * vSkylineWindow.y * light;
 }
 #include <opaque_fragment>`);
@@ -74,7 +79,7 @@ if (vSkylineWindow.z > 0.0 && skylineDarkness > 0.0) {
             geometry.setAttribute("skylineGlass", attribute);
             geometry.setAttribute("skylineWindow", windowAttribute);
             material.onBeforeCompile = compile;
-            material.customProgramCacheKey = () => `${key}:skyline-facade-v2`;
+            material.customProgramCacheKey = () => `${key}:skyline-facade-v3`;
         }
         else {
             material.onBeforeCompile = originalCompile;
@@ -99,7 +104,7 @@ if (vSkylineWindow.z > 0.0 && skylineDarkness > 0.0) {
             uniforms.skylineDarkness.value = lighting?.darkness ?? 0;
             uniforms.skylineWindowsSuppressed.value = celebration ? 1 : 0;
             uniforms.skylineActivity.value = lighting?.activity ?? 0;
-            for (const [uniform, hex] of [[uniforms.skylineWindowWarm, nightColours.window], [uniforms.skylineWindowWhite, nightColours.windowWhite]]) {
+            for (const [uniform, hex] of [[uniforms.skylineWindowWarm, nightColours.window], [uniforms.skylineWindowWhite, nightColours.windowWhite], [uniforms.skylineWindowCool, nightColours.windowCool]]) {
                 uniform.value.setHex(hex);
                 if (!coloured) {
                     const { r, g, b } = uniform.value, grey = r * 0.2126 + g * 0.7152 + b * 0.0722;

package/site/models/night-windows.js

@@ -29,6 +29,11 @@ const architectural = new Set(["lamp", "crown lights", "band lights", "sign lett
 export function nightWindowMask(geometry, buildingId, materialOf) {
     const positions = geometry.getAttribute("position"), normals = geometry.getAttribute("normal");
     const mask = new Float32Array(positions.count * 4);
+    // A dominant fixture family per building, with smaller tenant-floor and room
+    // differences. Independent seeds keep colour from tracking occupancy/brightness.
+    // These are illustrated white-light mixes, not surveyed fixture temperatures.
+    const buildingTint = hash(`${buildingId}:fixture`);
+    const architecturalTint = 0.15 + 0.65 * hash(`${buildingId}:architectural-fixture`);
     const samePoint = (a, b) => positions.getX(a) === positions.getX(b) && positions.getY(a) === positions.getY(b) && positions.getZ(a) === positions.getZ(b);
     for (let first = 0; first < positions.count;) {
         const name = materialOf(first), crown = architectural.has(name);
@@ -61,6 +66,9 @@ export function nightWindowMask(geometry, buildingId, materialOf) {
         const floor = Math.round(y / count / 3.4), across = Math.floor(x / count / 7), depth = Math.floor(z / count / 7);
         const room = hash(`${buildingId}:${floor}:${across}:${depth}`);
         const brightness = hash(`${buildingId}:${floor}:${across}:${depth}:brightness`);
+        const tint = crown ? architecturalTint : 0.65 * buildingTint
+            + 0.2 * hash(`${buildingId}:${floor}:fixture`)
+            + 0.15 * hash(`${buildingId}:${floor}:${across}:${depth}:fixture`);
         for (let vertex = first; vertex < end; vertex += 1) {
             if (materialOf(vertex) !== name)
                 continue;
@@ -68,7 +76,7 @@ export function nightWindowMask(geometry, buildingId, materialOf) {
             mask[vertex * 4] = rank;
             mask[vertex * 4 + 1] = crown ? 0.3 : 0.25 + brightness * 0.45;
             mask[vertex * 4 + 2] = crown ? 2 : 1;
-            mask[vertex * 4 + 3] = brightness;
+            mask[vertex * 4 + 3] = tint;
         }
         first = end;
     }

package/site/models/sheraton-grand-geographic.js

@@ -2,8 +2,9 @@ import * as THREE from "../vendor/three-r186.js";
 import { createBuilder, polygonOf } from "./building-kit.js";
 import { chainSkin, chainsOf, orient, paintedSlab, planOf, turnsAt } from "./facade-grid.js";
 // The Sheraton Grand Chicago Riverwalk, 301 East North Water Street (Solomon Cordwell Buenz,
-// 1992): the geographic layout's model, on the mapped tower 592122464 and its corner part
-// 1269924307. The original layout has no model of it. The drawing's `buckingham-east` group,
+// 1992): the geographic layout's model, on mapped tower 592122464, corner part
+// 1269924307, and east-wing parts 1269924305/1269924304. The original layout has no
+// model of it. The drawing's `buckingham-east` group,
 // right of The Buckingham, is its corner: a lit crown over a tower of windows.
 //
 // A cream precast tower on an L, its arms ending in round towers, of punched windows at the
@@ -17,17 +18,21 @@ export const sheratonLevels = Object.freeze({
     topFloor: 97, // the Skyscraper Center's occupied height, the corner's top floor
     corner: 100.1, // the corner's roof, a floor-to-roof of 3.1 m over it as Emporis gives it
     arms: 100.1 - 2 * 2.67, // the arms' roof, two floors lower, at the mapped arms' 32 levels
+    wing: 100.1 - 6 * 2.67, // 28-level east wing, relative to the 34-level corner's datum
+    wingEnd: 100.1 - 5 * 2.67, // the mapped 29-level round end, a floor above its wing
     drum: 12.2, // the drums' height, Emporis's architectural height over its main roof
     top: 112.3, // the corner drum's top, the Skyscraper Center's architectural height
 });
 const h = sheratonLevels;
 // The round ends the drums stand on, circles fitted to the mapped parts' arcs within 11 cm:
 // the corner, part 1269924307, and the east and north arms' ends, parts 1269924306 and
-// 1269924308. Centres are east and north metres from Crain's centre.
+// 1269924308, plus the east wing's end, 1269924304 (within 1.7 cm).
+// Centres are east and north metres from Crain's centre; map precision is not survey accuracy.
 export const sheratonDrums = Object.freeze([
     { centre: [407.44, 465.95], radius: 7.97, base: h.corner },
     { centre: [439.52, 462.06], radius: 7.37, base: h.arms },
     { centre: [409.75, 498.32], radius: 7.39, base: h.arms },
+    { centre: [482.703, 457.389], radius: 7.391, base: h.wingEnd },
 ]);
 // The skins' colours: the window tones, the precast, and the drums' cream and maroon fins,
 // which no window shares.
@@ -69,6 +74,8 @@ export function createSheratonGrandGeographicBuilding(record, projectPlan, offse
         return [centre[0] + radius * Math.cos(angle), -centre[1] + radius * Math.sin(angle)];
     }));
     const cornerPlan = orient(polygonOf(projectPlan(record.parts[1].coordinates)));
+    const wing = orient(polygonOf(projectPlan(record.parts[2].coordinates)));
+    const wingEnd = orient(polygonOf(projectPlan(record.parts[3].coordinates)));
     // A closed solid of walls and slabs on an outline, painted by its runs.
     const solid = (target, outline, lo, hi, paint) => {
         planOf(outline).forEach((run, k) => {
@@ -82,13 +89,21 @@ export function createSheratonGrandGeographicBuilding(record, projectPlan, offse
     // over it.
     solid(shell, tower, 0, h.arms, () => core);
     solid(shell, cornerPlan, h.arms, h.corner, () => core);
+    solid(shell, wing, 0, h.wing, () => core);
+    solid(shell, wingEnd, h.wing, h.wingEnd, () => core);
     // Each drum: cream, a maroon fin every other facet, on its round end.
     for (const { centre, radius, base } of sheratonDrums)
         solid(drums, circle(centre, radius), base, base + h.drum, (k) => (k % 2 ? fin : drumFace));
     // The skins, one box to a chain of runs turning less than 30°, so the round ends carry one:
     // a window 1.4 m wide in each 2.4 m bay, set out from the chain's middle, on every floor.
-    const skin = (outline, base, top, seed) => {
+    const towerRows = rowsFor(0.25, h.arms);
+    const skin = (outline, base, top, seed, sharedWith) => {
         const plan = planOf(outline), heights = rowsFor(base, top);
+        const same = (a, b) => Math.hypot(a[0] - b[0], a[1] - b[1]) < 1e-6;
+        const shared = plan.map((run) => sharedWith?.some((a, index) => {
+            const b = sharedWith[(index + 1) % sharedWith.length];
+            return same(run.at(0), b) && same(run.at(run.length), a);
+        }) ?? false);
         chainsOf(plan, 30 * Math.PI / 180).forEach((chain, index) => {
             const first = chain.runs[0], last = chain.runs.at(-1);
             const s0 = turnsAt(plan, first)[0] > 0 ? 0.09 : 0.02, s1 = chain.length - (turnsAt(plan, last)[1] > 0 ? 0.09 : 0.02);
@@ -96,14 +111,36 @@ export function createSheratonGrandGeographicBuilding(record, projectPlan, offse
             const centres = Array.from({ length: 2 * count + 1 }, (_, k) => chain.length / 2 + (k - count) * 2.4);
             const cuts = centres.flatMap((c) => [c - 0.7, c + 0.7]).filter((s) => s > s0 + 0.01 && s < s1 - 0.01);
             const columns = [s0, ...cuts, s1];
-            chainSkin(kit, wall, plan, chain, 0, chain.runs.length - 1, s0, s1, columns, heights, 0.02, 0.07, (bay, r) => {
-                const middle = (columns[bay - 1] + columns[bay]) / 2;
-                return r % 2 === 1 && centres.some((c) => Math.abs(middle - c) < 0.7) ? paneColor(r, bay, seed * 16 + index) : precast;
-            }, precast);
+            // The two mapped parts meet along the old east drum's arc. Below the
+            // wing roof it is an internal wall: retain closed cores, but do not put
+            // overlapping facade skins on that shared boundary. Keep bay positions
+            // tied to the original chain when trimming the visible segments.
+            for (let k0 = 0; k0 < chain.runs.length;) {
+                if (shared[chain.runs[k0]]) {
+                    k0 += 1;
+                    continue;
+                }
+                let k1 = k0;
+                while (k1 + 1 < chain.runs.length && !shared[chain.runs[k1 + 1]])
+                    k1 += 1;
+                const from = k0 === 0 ? s0 : chain.starts[k0] + 0.09;
+                const to = k1 === chain.runs.length - 1 ? s1 : chain.starts[k1] + plan[chain.runs[k1]].length - 0.09;
+                chainSkin(kit, wall, plan, chain, k0, k1, from, to, columns, heights, 0.02, 0.07, (bay, r) => {
+                    const middle = (columns[bay - 1] + columns[bay]) / 2;
+                    // Keep the original tower's floor seed through the split at the
+                    // wing roof, rather than restarting its window pattern above it.
+                    const row = seed === 0 ? towerRows.findIndex((y) => Math.abs(y - heights[r]) < 1e-5) : r;
+                    return r % 2 === 1 && centres.some((c) => Math.abs(middle - c) < 0.7) ? paneColor(row, bay, seed * 16 + index) : precast;
+                }, precast);
+                k0 = k1 + 1;
+            }
         });
     };
-    skin(tower, 0.25, h.arms, 0);
+    skin(tower, 0.25, h.wing, 0, wing);
+    skin(tower, h.wing, h.arms, 0);
     skin(cornerPlan, h.arms, h.corner, 1);
+    skin(wing, 0.25, h.wing, 2, tower);
+    skin(wingEnd, h.wing, h.wingEnd, 3);
     const model = kit.finish({ height: h.top, outlines: [shell, drums], opacity: 0.16 });
     model.building.position.set(offset[0], 0, offset[1]);
     model.building.userData["geography"] = record;

package/site/models/skyline-geography-data.js

@@ -8,7 +8,8 @@
 // Ascher Buildings and the Chicago Athletic Association 2026-09-29, and those of Two Illinois
 // Center and River Plaza, with River Plaza's parts, the Hyatt Regency West Tower's part, the
 // Sheraton Grand's tower and corner parts, Three Illinois Center's outline, and the Swissôtel's
-// tower part, the same day.
+// tower part, the same day. Sheraton Grand's east-wing parts were added from
+// the OSM API on 2026-10-17; their roof heights are estimates on the tower datum.
 // © OpenStreetMap contributors, ODbL 1.0.
 // Coordinates are [longitude, latitude] in WGS84. See docs/skyline-geography.md.
 export const geographicBuildings = [
@@ -43,7 +44,7 @@ export const geographicBuildings = [
     { "id": "building-office-west-of-aon", "name": "Two Illinois Center", "shortName": "Two Illinois Center", "height": 114.3, "tipHeight": 114.3, "heightSource": "https://www.skyscrapercenter.com/chicago/two-illinois-center/11095", "note": "Detailed Two Illinois Center: the mapped outline; a dark curtain wall of 32 storeys, mullions on a 5 ft module with glass over a spandrel on every floor at the photograph's 3.55 m pitch, and the top two floors' mechanical band, to a flat roof at the Skyscraper Center's 114.3 m. From the photograph's camera its lit floors fill the lower part of the gap between Two Prudential Plaza and Aon Center, in front of River Plaza.", "footprint": { "way": 236770799, "version": 3, "coordinates": [[-87.6235661, 41.8871124], [-87.6235636, 41.8871174], [-87.6235524, 41.8871216], [-87.6225645, 41.8871339], [-87.622551, 41.8871289], [-87.6225466, 41.8871186], [-87.622541, 41.8867998], [-87.6225469, 41.8867912], [-87.6225543, 41.8867879], [-87.6225638, 41.8867865], [-87.6228061, 41.8867819], [-87.6231721, 41.8867773], [-87.6235523, 41.886775], [-87.623557, 41.8867781], [-87.6235613, 41.8867836]] }, "parts": [{ "way": 236770799, "version": 3, "coordinates": [[-87.6235661, 41.8871124], [-87.6235636, 41.8871174], [-87.6235524, 41.8871216], [-87.6225645, 41.8871339], [-87.622551, 41.8871289], [-87.6225466, 41.8871186], [-87.622541, 41.8867998], [-87.6225469, 41.8867912], [-87.6225543, 41.8867879], [-87.6225638, 41.8867865], [-87.6228061, 41.8867819], [-87.6231721, 41.8867773], [-87.6235523, 41.886775], [-87.623557, 41.8867781], [-87.6235613, 41.8867836]], "bottom": 0, "top": 114.3 }] },
     { "id": "building-river-plaza", "name": "River Plaza", "shortName": "River Plaza", "height": 159.7, "tipHeight": 159.7, "heightSource": "https://www.skyscrapercenter.com/chicago/river-plaza/3383", "note": "Detailed River Plaza: the mapped outline and its parts; a white concrete slab of 56 storeys with notched corners, a grid of exposed frame and punched windows over the podium on the river side, to a flat roof at OpenStreetMap's 156 m, under the box on it to the Skyscraper Center's 159.7 m, its architectural height and tip; OpenStreetMap's 166 m for the box stands over the published tip. From the photograph's camera its top fills the gap between Two Prudential Plaza and Aon Center behind Two Illinois Center, the only mapped building on that sightline tall enough to reach the drawn top.", "footprint": { "way": 285867424, "version": 6, "coordinates": [[-87.6260818, 41.8900013], [-87.6261095, 41.8899782], [-87.6261086, 41.8899259], [-87.6261285, 41.8899127], [-87.6261269, 41.8898753], [-87.6261044, 41.8898588], [-87.6261035, 41.8898229], [-87.626103, 41.8898052], [-87.6260771, 41.8897865], [-87.6259425, 41.8896905], [-87.6257902, 41.8895791], [-87.6257288, 41.8895898], [-87.6255231, 41.8896255], [-87.6255256, 41.8897934], [-87.6254949, 41.8897941], [-87.6254648, 41.889817], [-87.6254664, 41.8898714], [-87.6254461, 41.8898877], [-87.6254474, 41.8899257], [-87.6254684, 41.8899384], [-87.6254701, 41.8899906], [-87.6255035, 41.8900132], [-87.625675, 41.8900085], [-87.6256968, 41.8899927], [-87.6258816, 41.8899874], [-87.6259031, 41.8900027]] }, "parts": [{ "way": 68796725, "version": 10, "coordinates": [[-87.6254648, 41.889817], [-87.6254664, 41.8898714], [-87.6254461, 41.8898877], [-87.6254474, 41.8899257], [-87.6254684, 41.8899384], [-87.6254701, 41.8899906], [-87.6255035, 41.8900132], [-87.625675, 41.8900085], [-87.6256968, 41.8899927], [-87.6258816, 41.8899874], [-87.6259031, 41.8900027], [-87.6260818, 41.8900013], [-87.6261095, 41.8899782], [-87.6261086, 41.8899259], [-87.6261285, 41.8899127], [-87.6261269, 41.8898753], [-87.6261044, 41.8898588], [-87.6261035, 41.8898229], [-87.626103, 41.8898052], [-87.6260771, 41.8897865], [-87.6258989, 41.8897905], [-87.6258799, 41.8898052], [-87.6256906, 41.8898092], [-87.6256664, 41.8897938], [-87.6255256, 41.8897934], [-87.6254949, 41.8897941]], "bottom": 0, "top": 156 }, { "way": 68796733, "version": 5, "coordinates": [[-87.6260771, 41.8897865], [-87.6259425, 41.8896905], [-87.6257902, 41.8895791], [-87.6257288, 41.8895898], [-87.6255231, 41.8896255], [-87.6255256, 41.8897934], [-87.6256664, 41.8897938], [-87.6256906, 41.8898092], [-87.6258799, 41.8898052], [-87.6258989, 41.8897905]], "bottom": 0, "top": 8 }, { "way": 285867425, "version": 1, "coordinates": [[-87.6258543, 41.8899579], [-87.6257153, 41.8899611], [-87.6257111, 41.8898629], [-87.6258501, 41.8898597]], "bottom": 156, "top": 159.7 }] },
     { "id": "building-hyatt-regency-west-tower", "name": "Hyatt Regency Chicago West Tower", "shortName": "Hyatt West Tower", "height": 111.3, "tipHeight": 111.3, "heightSource": "https://www.skyscrapercenter.com/building/hyatt-regency-chicago-west-tower/13132", "note": "Detailed Hyatt Regency Chicago West Tower: its mapped part of the hotel's outline; a brick slab of 33 storeys, narrow window slots continuous from the lobby to the top two floors on a 3.5 m module between solid corners, and a plain band over them to a flat roof at the Skyscraper Center's 111.3 m. From the photograph's camera it stands between Aon Center and the Blue Cross and Blue Shield Tower, where the drawing's Blue Cross group paints a dark brown sliver.", "footprint": { "way": 235920252, "version": 4, "coordinates": [[-87.6227574, 41.887587], [-87.6228537, 41.887584], [-87.6228521, 41.8874603], [-87.6228518, 41.8874165], [-87.6225427, 41.8874231], [-87.6225408, 41.8875106], [-87.6225253, 41.8875109], [-87.6225266, 41.8875277], [-87.6225277, 41.8875513], [-87.622528, 41.8875746], [-87.6225382, 41.8878947], [-87.62255, 41.8878954], [-87.6225496, 41.8879846], [-87.6228658, 41.8879789], [-87.6228643, 41.8879388], [-87.6228611, 41.8878099], [-87.6227664, 41.8878103]] }, "parts": [{ "way": 235920252, "version": 4, "coordinates": [[-87.6227574, 41.887587], [-87.6228537, 41.887584], [-87.6228521, 41.8874603], [-87.6228518, 41.8874165], [-87.6225427, 41.8874231], [-87.6225408, 41.8875106], [-87.6225253, 41.8875109], [-87.6225266, 41.8875277], [-87.6225277, 41.8875513], [-87.622528, 41.8875746], [-87.6225382, 41.8878947], [-87.62255, 41.8878954], [-87.6225496, 41.8879846], [-87.6228658, 41.8879789], [-87.6228643, 41.8879388], [-87.6228611, 41.8878099], [-87.6227664, 41.8878103]], "bottom": 0, "top": 111.3 }] },
-    { "id": "building-buckingham-east", "name": "Sheraton Grand Chicago Riverwalk", "shortName": "Sheraton Grand", "height": 112.3, "tipHeight": 112.3, "heightSource": "https://www.skyscrapercenter.com/building/sheraton-chicago-hotel-towers/10020", "note": "Detailed Sheraton Grand Chicago Riverwalk: the mapped tower and its corner part; a cream precast tower on an L of punched windows at Emporis's 2.67 m floor-to-floor, its arms to 94.76 m, the corner's round tower two floors higher to 100.1 m, and a drum of cream and maroon fins on each round end, the corner's to the Skyscraper Center's 112.3 m. Heights stand on the Skyscraper Center's datum: its top floor at 97 m, a floor-to-roof of 3.1 m and 12.2 m drums as Emporis gives them; the published height nearest the drawing's reading, over Emporis's 330.56 ft. The Skyscraper Center's 112.8 m tip, 50 cm over the drum, is not modelled. The drawing's buckingham-east group is its corner's lit drum over its tower.", "footprint": { "way": 592122464, "version": 5, "coordinates": [[-87.6199499, 41.8891119], [-87.6199176, 41.8893381], [-87.6199306, 41.8893589], [-87.6199502, 41.8893716], [-87.6199845, 41.8893878], [-87.6200276, 41.8893957], [-87.6200732, 41.8893915], [-87.6201147, 41.8893744], [-87.6201372, 41.8893482], [-87.6201463, 41.8893162], [-87.6201584, 41.8892447], [-87.6201841, 41.889063], [-87.6201875, 41.8890302], [-87.6201812, 41.8889946], [-87.6201588, 41.8889641], [-87.620121, 41.8889384], [-87.6200743, 41.8889276], [-87.6196505, 41.8888958], [-87.6196025, 41.8889162], [-87.6195726, 41.8889427], [-87.6195591, 41.8889735], [-87.6195627, 41.8890068], [-87.6195846, 41.8890373], [-87.6196228, 41.8890638], [-87.6198263, 41.8890777], [-87.6198225, 41.889104]] }, "parts": [{ "way": 592122464, "version": 5, "coordinates": [[-87.6199499, 41.8891119], [-87.6199176, 41.8893381], [-87.6199306, 41.8893589], [-87.6199502, 41.8893716], [-87.6199845, 41.8893878], [-87.6200276, 41.8893957], [-87.6200732, 41.8893915], [-87.6201147, 41.8893744], [-87.6201372, 41.8893482], [-87.6201463, 41.8893162], [-87.6201584, 41.8892447], [-87.6201841, 41.889063], [-87.6201875, 41.8890302], [-87.6201812, 41.8889946], [-87.6201588, 41.8889641], [-87.620121, 41.8889384], [-87.6200743, 41.8889276], [-87.6196505, 41.8888958], [-87.6196025, 41.8889162], [-87.6195726, 41.8889427], [-87.6195591, 41.8889735], [-87.6195627, 41.8890068], [-87.6195846, 41.8890373], [-87.6196228, 41.8890638], [-87.6198263, 41.8890777], [-87.6198225, 41.889104]], "bottom": 0, "top": 94.76 }, { "way": 1269924307, "version": 1, "coordinates": [[-87.6199691, 41.8890378], [-87.6199677, 41.889013], [-87.6199719, 41.8889952], [-87.6199903, 41.8889744], [-87.6200135, 41.88896], [-87.6200416, 41.8889517], [-87.6200717, 41.8889503], [-87.6201037, 41.8889568], [-87.6201308, 41.8889711], [-87.6201498, 41.8889914], [-87.6201583, 41.8890152], [-87.6201555, 41.8890398], [-87.6201415, 41.8890622], [-87.6201241, 41.8890776], [-87.6200882, 41.8890904], [-87.6200552, 41.8890928], [-87.6200258, 41.8890875], [-87.6200001, 41.8890757], [-87.6199805, 41.8890586]], "bottom": 94.76, "top": 100.1 }] },
+    { "id": "building-buckingham-east", "name": "Sheraton Grand Chicago Riverwalk", "shortName": "Sheraton Grand", "height": 112.3, "tipHeight": 112.3, "heightSource": "https://www.skyscrapercenter.com/building/sheraton-chicago-hotel-towers/10020", "note": "Detailed Sheraton Grand Chicago Riverwalk: the mapped tower and its corner part; a cream precast tower on an L of punched windows at Emporis's 2.67 m floor-to-floor, its arms to 94.76 m, the corner's round tower two floors higher to 100.1 m, and a drum of cream and maroon fins on each round end, the corner's to the Skyscraper Center's 112.3 m. Heights stand on the Skyscraper Center's datum: its top floor at 97 m, a floor-to-roof of 3.1 m and 12.2 m drums as Emporis gives them; the published height nearest the drawing's reading, over Emporis's 330.56 ft. The Skyscraper Center's 112.8 m tip, 50 cm over the drum, is not modelled. The drawing's buckingham-east group is its corner's lit drum over its tower. The mapped east wing and its round end continue the hotel to the east, with estimated roofs at 84.08 m and 86.75 m on the same height datum and a fourth crown. Photographs from before 2013 establish the wing; exact roof and crown dimensions remain inferred.", "footprint": { "way": 592122464, "version": 5, "coordinates": [[-87.6199499, 41.8891119], [-87.6199176, 41.8893381], [-87.6199306, 41.8893589], [-87.6199502, 41.8893716], [-87.6199845, 41.8893878], [-87.6200276, 41.8893957], [-87.6200732, 41.8893915], [-87.6201147, 41.8893744], [-87.6201372, 41.8893482], [-87.6201463, 41.8893162], [-87.6201584, 41.8892447], [-87.6201841, 41.889063], [-87.6201875, 41.8890302], [-87.6201812, 41.8889946], [-87.6201588, 41.8889641], [-87.620121, 41.8889384], [-87.6200743, 41.8889276], [-87.6196505, 41.8888958], [-87.6196025, 41.8889162], [-87.6195726, 41.8889427], [-87.6195591, 41.8889735], [-87.6195627, 41.8890068], [-87.6195846, 41.8890373], [-87.6196228, 41.8890638], [-87.6198263, 41.8890777], [-87.6198225, 41.889104]] }, "parts": [{ "way": 592122464, "version": 5, "coordinates": [[-87.6199499, 41.8891119], [-87.6199176, 41.8893381], [-87.6199306, 41.8893589], [-87.6199502, 41.8893716], [-87.6199845, 41.8893878], [-87.6200276, 41.8893957], [-87.6200732, 41.8893915], [-87.6201147, 41.8893744], [-87.6201372, 41.8893482], [-87.6201463, 41.8893162], [-87.6201584, 41.8892447], [-87.6201841, 41.889063], [-87.6201875, 41.8890302], [-87.6201812, 41.8889946], [-87.6201588, 41.8889641], [-87.620121, 41.8889384], [-87.6200743, 41.8889276], [-87.6196505, 41.8888958], [-87.6196025, 41.8889162], [-87.6195726, 41.8889427], [-87.6195591, 41.8889735], [-87.6195627, 41.8890068], [-87.6195846, 41.8890373], [-87.6196228, 41.8890638], [-87.6198263, 41.8890777], [-87.6198225, 41.889104]], "bottom": 0, "top": 94.76 }, { "way": 1269924307, "version": 1, "coordinates": [[-87.6199691, 41.8890378], [-87.6199677, 41.889013], [-87.6199719, 41.8889952], [-87.6199903, 41.8889744], [-87.6200135, 41.88896], [-87.6200416, 41.8889517], [-87.6200717, 41.8889503], [-87.6201037, 41.8889568], [-87.6201308, 41.8889711], [-87.6201498, 41.8889914], [-87.6201583, 41.8890152], [-87.6201555, 41.8890398], [-87.6201415, 41.8890622], [-87.6201241, 41.8890776], [-87.6200882, 41.8890904], [-87.6200552, 41.8890928], [-87.6200258, 41.8890875], [-87.6200001, 41.8890757], [-87.6199805, 41.8890586]], "bottom": 94.76, "top": 100.1 }, { "way": 1269924305, "version": 1, "coordinates": [[-87.6191033, 41.8890226], [-87.6190622, 41.8889954], [-87.6190428, 41.8889627], [-87.6190431, 41.8889236], [-87.6190607, 41.8888928], [-87.619091, 41.8888724], [-87.6191278, 41.8888566], [-87.6193634, 41.8888743], [-87.6196505, 41.8888958], [-87.6196025, 41.8889162], [-87.6195726, 41.8889427], [-87.6195591, 41.8889735], [-87.6195627, 41.8890068], [-87.6195846, 41.8890373], [-87.6196228, 41.8890638]], "bottom": 0, "top": 84.08, "estimatedHeight": true }, { "way": 1269924304, "version": 1, "coordinates": [[-87.619112, 41.8888866], [-87.61909, 41.8888996], [-87.6190746, 41.888917], [-87.6190672, 41.8889372], [-87.6190685, 41.8889581], [-87.6190786, 41.8889777], [-87.6190963, 41.8889939], [-87.6191199, 41.8890052], [-87.6191471, 41.8890105], [-87.6191778, 41.8890088], [-87.6192059, 41.8889994], [-87.619228, 41.8889835], [-87.6192416, 41.8889629], [-87.6192449, 41.8889401], [-87.6192376, 41.8889179], [-87.6192207, 41.8888988], [-87.6191959, 41.8888851], [-87.6191665, 41.8888785], [-87.6191384, 41.8888793]], "bottom": 84.08, "top": 86.75, "estimatedHeight": true }], "groundFootprintWays": [592122464, 1269924305] },
     { "id": "building-three-illinois-center", "name": "Three Illinois Center", "shortName": "Three Illinois Center", "height": 106.7, "tipHeight": 106.7, "heightSource": "https://www.skyscrapercenter.com/building/three-illinois-center/13913", "note": "Detailed Three Illinois Center: the mapped outline; a dark bronze curtain wall of 30 storeys, mullions on a 5 ft module and glass over a spandrel on each floor at the published 11.5 ft slab to slab over a 5.06 m lobby, and the top two floors' windowless mechanical penthouse, glazed about 2019 but kept as the 2013 photograph shows it, under a flat roof at the Skyscraper Center's and Emporis's 350 ft. Its east end fills the gap between 340 on the Park and The Buckingham, where the drawing's buckingham-west group paints an office tower whose top stands about 140 layer units higher.", "footprint": { "way": 95486958, "version": 12, "coordinates": [[-87.6204966, 41.8869542], [-87.6202534, 41.8869566], [-87.6200384, 41.8869571], [-87.6200396, 41.887005], [-87.6200455, 41.8873733], [-87.620058, 41.8876286], [-87.6205101, 41.8876189], [-87.6205054, 41.8873683]] }, "parts": [{ "way": 95486958, "version": 12, "coordinates": [[-87.6204966, 41.8869542], [-87.6202534, 41.8869566], [-87.6200384, 41.8869571], [-87.6200396, 41.887005], [-87.6200455, 41.8873733], [-87.620058, 41.8876286], [-87.6205101, 41.8876189], [-87.6205054, 41.8873683]], "bottom": 0, "top": 106.7 }] },
     { "id": "building-swissotel", "name": "Swissôtel Chicago", "shortName": "Swissôtel", "height": 139.3, "tipHeight": 139.3, "heightSource": "https://www.skyscrapercenter.com/building/swissotel-chicago/4362", "note": "Detailed Swissôtel Chicago: the hotel's mapped tower part, a triangle; a flush grid of reflective glass, thin mullions about 1.5 m apart and a transom at each of OpenStreetMap's 45 levels, under a flat roof at the Skyscraper Center's 139.3 m. It stands behind Three Illinois Center and The Buckingham from the drawing's camera, and fills the seam where their corners meet. The hotel's outline, 95486966, adds a small block on the tower's north-east face, and its podium, 95486953, carries no height; neither is modelled.", "footprint": { "way": 641288601, "version": 3, "coordinates": [[-87.6194102, 41.8874254], [-87.619534, 41.8875706], [-87.619676, 41.8873866], [-87.6198184, 41.8871906], [-87.6192311, 41.8871971], [-87.619375, 41.8873843]] }, "parts": [{ "way": 641288601, "version": 3, "coordinates": [[-87.6194102, 41.8874254], [-87.619534, 41.8875706], [-87.619676, 41.8873866], [-87.6198184, 41.8871906], [-87.6192311, 41.8871971], [-87.619375, 41.8873843]], "bottom": 0, "top": 139.3 }] },
 ];

package/site/models/skyline-geography.js

@@ -56,6 +56,23 @@ export function footprintMetrics(coordinates) {
     }, 0)) / 2;
     return { min, max, center: min.map((n, i) => (n + max[i]) / 2), size: min.map((n, i) => max[i] - n), area };
 }
+// Some complexes have separately mapped wings beyond the primary way. Keep
+// their source ways intact, and opt in only disjoint ground parts of this model.
+export function groundFootprints(record) {
+    if (!record.groundFootprintWays)
+        return [record.footprint];
+    return record.groundFootprintWays.map((way) => {
+        const part = record.parts.find((entry) => entry.way === way && entry.bottom === 0);
+        if (!part)
+            throw new Error(`Missing ground footprint ${way} for ${record.id}`);
+        return part;
+    });
+}
+export function buildingGroundBounds(record) {
+    // Only extrema are meaningful for concatenated rings, not a polygon's area.
+    const { min, max, center, size } = footprintMetrics(groundFootprints(record).flatMap((part) => part.coordinates));
+    return { min, max, center, size };
+}
 function plan(coordinates) {
     const points = coordinates.map((p) => { const [east, north] = projectGround(p); return [east, -north]; });
     const area = points.reduce((sum, a, i) => {
@@ -313,8 +330,20 @@ export function createGeographicGround(offset = [0, 0]) {
     group.add(streets);
     const outlines = [];
     for (const record of geographicBuildings) {
-        const points = record.footprint.coordinates.map((p) => { const [x, y] = projectGround(p); return [x, 0.1, -y]; });
-        points.forEach((p, i) => outlines.push(p, points[(i + 1) % points.length]));
+        const edges = new Map();
+        for (const footprint of groundFootprints(record)) {
+            const points = footprint.coordinates.map((p) => { const [x, y] = projectGround(p); return [x, 0.1, -y]; });
+            points.forEach((p, i) => {
+                const q = points[(i + 1) % points.length];
+                const key = [p.join(","), q.join(",")].sort().join(";");
+                const prior = edges.get(key);
+                edges.set(key, { points: [p, q], count: (prior?.count ?? 0) + 1 });
+            });
+        }
+        // Shared mapped boundaries are inside the complex, not its ground outline.
+        for (const edge of edges.values())
+            if (edge.count === 1)
+                outlines.push(...edge.points);
     }
     const footprints = lines(outlines, 0xc9c9c9);
     group.add(footprints);

package/site/skyline-3d.html

@@ -15,8 +15,8 @@
       <div class="loading" id="loading" role="status">
         <span class="visually-hidden">Preparing the skyline…</span>
         <!-- skyline-loading:start -->
-        <svg class="skyline-trace" viewBox="0 0 1000 390.01" aria-hidden="true" focusable="false">
-          <defs><path id="skyline-loading-outline" pathLength="1" d="M0 390.01 L24 390.01 L24 326.71 L36.78 320.28 L76.29 320.28 L78.85 321.63 L79.08 320.54 L87.68 320.54 L87.92 316.21 L133.24 316.74 L133.47 317.75 L133.94 317.75 L134.17 316.74 L164.38 316.74 L164.85 317.75 L165.08 321.6 L181.12 321.6 L181.35 329.03 L189.48 329.03 L190.41 330.18 L207.85 330.18 L208.08 328.36 L208.54 328.36 L209.01 331.14 L212.26 338.16 L212.49 334.77 L213.89 334.77 L214.12 344.27 L216.21 344.27 L216.45 348.52 L234.57 348.52 L234.81 318.86 L238.53 318.86 L238.76 308.7 L242.48 308.7 L242.71 280.86 L244.57 280.86 L244.8 273.62 L245.03 272.91 L245.73 272.91 L245.96 272.02 L249.68 272.02 L249.91 273.17 L251.54 273.17 L251.77 272.02 L253.87 272.02 L254.1 273.17 L255.26 272.91 L255.49 272.02 L257.58 272.02 L257.82 272.91 L258.75 272.91 L258.98 280.86 L260.84 280.86 L261.07 318.86 L261.3 316.21 L263.63 316.21 L263.86 318.86 L265.02 318.86 L265.25 316.21 L268.04 316.21 L268.28 333.8 L272.69 333.8 L272.92 321.07 L274.55 321.07 L274.78 314 L288.96 314 L289.19 317.54 L300.58 317.54 L300.81 310.9 L311.51 310.9 L311.74 229.87 L323.13 229.87 L323.36 222.27 L330.8 222.27 L331.03 219.97 L349.39 220.16 L349.62 229.87 L352.41 229.87 L352.64 249.49 L382.16 249.49 L382.39 383.11 L386.81 383.11 L387.04 262.54 L406.57 233.23 L407.26 233.23 L410.05 252.75 L410.52 252.78 L410.75 233.23 L411.21 233.23 L439.11 263.31 L439.34 313.74 L444.22 313.74 L444.45 202.79 L513.71 202.79 L513.95 228.1 L528.36 228.1 L528.59 76.89 L548.34 76.8 L548.58 67.61 L561.59 67.52 L562.29 16 L563.68 16 L564.61 67.52 L571.82 67.61 L572.05 83.08 L572.98 83.08 L573.21 152.98 L579.49 143.92 L580.88 121.96 L582.04 143.91 L595.53 163.38 L598.55 173.04 L598.78 176.62 L600.41 176.62 L600.64 180.12 L602.03 180.12 L602.27 183.62 L603.66 183.62 L603.89 187.12 L605.52 187.12 L605.75 336.98 L606.22 379.83 L608.77 379.83 L609.01 89.53 L622.72 89.53 L622.95 83.96 L641.78 83.96 L642.01 69.64 L642.71 69.64 L642.94 83.96 L661.77 83.96 L662 89.53 L675.25 89.53 L675.48 202.65 L675.71 189.68 L748.46 189.66 L748.69 202.65 L755.43 202.65 L755.66 208.92 L800.75 208.92 L801.22 295.71 L806.33 295.71 L806.56 284.84 L818.42 284.84 L818.65 282.28 L837.48 282.28 L837.71 284.84 L848.17 284.84 L848.4 291.4 L848.87 291.4 L849.1 295.71 L854.91 295.71 L855.14 266.9 L894.19 266.9 L894.42 390.01 L937.42 390.01 L937.65 306.26 L939.51 306.26 L939.74 290.76 L953.69 290.76 L953.92 306.26 L958.57 306.26 L958.8 295.48 L974.14 295.48 L974.37 306.26 L976 306.26 L976 390.01 L1000 390.01" /></defs>
+        <svg class="skyline-trace" viewBox="0 0 1000 379.13" aria-hidden="true" focusable="false">
+          <defs><path id="skyline-loading-outline" pathLength="1" d="M0 379.13 L24 379.13 L24 317.67 L36.32 311.43 L74.67 311.43 L77.22 312.72 L77.46 311.68 L85.82 311.68 L86.06 307.48 L130.22 307.99 L130.45 308.97 L130.91 308.97 L131.15 307.99 L160.43 307.99 L160.9 312.71 L176.7 312.71 L176.93 319.92 L184.6 319.92 L185.53 321.04 L202.27 321.04 L202.5 319.71 L203.2 319.28 L203.66 322.05 L206.68 328.57 L206.92 325.5 L208.31 325.5 L208.54 334.72 L210.63 334.72 L210.87 338.85 L228.3 338.85 L228.53 310.05 L232.25 310.05 L232.48 300.18 L236.2 300.18 L236.43 273.16 L238.29 273.16 L238.53 265.43 L239.46 265.43 L239.69 264.58 L242.94 264.58 L243.17 265.69 L245.03 265.69 L245.27 264.58 L247.13 264.58 L247.36 265.69 L248.52 265.43 L248.75 264.58 L250.84 264.58 L251.08 265.43 L251.77 265.43 L252.24 273.16 L253.87 273.16 L254.1 310.05 L254.56 307.48 L256.65 307.48 L256.89 310.05 L258.05 310.05 L258.28 307.48 L260.84 307.48 L261.07 324.55 L265.25 324.55 L265.49 312.2 L267.11 312.2 L267.35 305.33 L281.29 305.33 L281.52 308.77 L292.45 308.77 L292.68 302.35 L303.14 302.32 L303.37 223.64 L314.29 223.64 L314.53 216.27 L321.96 216.27 L322.2 214.04 L339.86 214.22 L340.09 223.64 L342.88 223.64 L343.12 242.7 L371.7 242.7 L371.94 372.43 L376.35 372.43 L376.58 255.25 L395.41 227.09 L396.11 226.91 L398.9 245.87 L399.36 245.89 L399.59 226.91 L400.06 226.91 L427.02 256.11 L427.25 305.08 L432.13 305.08 L432.37 197.36 L499.54 197.36 L499.77 221.93 L513.71 221.93 L513.95 75.03 L533.24 75.03 L533.47 66.02 L545.79 66.02 L546.72 16 L547.88 16 L548.81 66.02 L555.78 66.02 L556.01 81.13 L556.94 81.13 L557.18 149.08 L563.45 140.02 L563.92 125.57 L564.38 124.48 L564.61 118.88 L565.78 140.14 L579.02 159.17 L581.81 168.47 L582.04 171.95 L583.67 171.95 L583.9 175.35 L585.3 175.35 L585.53 178.75 L586.93 178.75 L587.16 182.14 L588.55 182.14 L588.79 327.64 L589.25 369.24 L591.81 369.24 L592.04 87.39 L605.29 87.39 L605.52 81.98 L623.65 81.98 L623.88 68.08 L624.81 68.08 L625.04 81.98 L643.17 81.98 L643.4 87.39 L656.42 87.39 L656.65 197.22 L656.88 184.61 L727.31 184.61 L727.77 197.22 L734.28 197.22 L734.51 203.31 L777.98 203.31 L778.44 211.51 L778.67 287.57 L783.55 287.57 L783.79 277.02 L795.41 277.02 L795.64 274.53 L813.77 274.53 L814 277.02 L824.23 277.02 L824.46 283.38 L824.93 283.38 L825.16 287.57 L830.74 287.57 L830.97 259.6 L868.85 259.6 L869.09 379.13 L910.69 379.13 L910.92 297.82 L912.78 297.82 L913.01 282.77 L926.73 282.77 L926.96 297.82 L931.38 297.82 L931.61 287.35 L946.48 287.35 L946.71 297.82 L948.34 297.82 L948.57 306.98 L961.13 306.98 L961.36 294.22 L973.91 294.22 L974.37 306.98 L976 306.98 L976 379.13 L1000 379.13" /></defs>
           <use class="skyline-trace-rail" href="#skyline-loading-outline" />
           <use class="skyline-trace-line" href="#skyline-loading-outline" />
           <use class="skyline-trace-tip" href="#skyline-loading-outline" />

package/site/skyline-comparison.js

@@ -1,6 +1,6 @@
 import * as THREE from "./vendor/three-r186.js";
 import { geographicBuildings } from "./models/skyline-geography-data.js";
-import { footprintMetrics, geographicOrigin } from "./models/skyline-geography.js";
+import { buildingGroundBounds, groundFootprints, geographicOrigin } from "./models/skyline-geography.js";
 import { createGeographicSkyline } from "./skyline-scene.js";
 export { createGeographicSkyline, skylineAzimuth } from "./skyline-scene.js";
 // The drawing has no geographic position. Register the two scenes at Crain's
@@ -42,7 +42,7 @@ export function createSkylineComparison(models, anchor) {
                 [point.x, point.z].forEach((n, axis) => { min[axis] = Math.min(min[axis], n); max[axis] = Math.max(max[axis], n); });
             }
         });
-        const footprint = footprintMetrics(record.footprint.coordinates);
+        const footprint = buildingGroundBounds(record);
         const row = document.createElement("tr");
         const name = document.createElement("th");
         name.scope = "row";
@@ -50,6 +50,14 @@ export function createSkylineComparison(models, anchor) {
         link.href = `https://www.openstreetmap.org/way/${record.footprint.way}`;
         link.textContent = record.shortName;
         name.append(link);
+        for (const part of groundFootprints(record)) {
+            if (part.way === record.footprint.way)
+                continue;
+            const extra = document.createElement("a");
+            extra.href = `https://www.openstreetmap.org/way/${part.way}`;
+            extra.textContent = `part ${part.way}`;
+            name.append(" · ", extra);
+        }
         row.append(name);
         const values = [
             `${signed(footprint.center[0])}, ${signed(footprint.center[1])}`,