@a2f0/skyline 0.2.30 → 0.2.32

package/docs/skyline-geography.md

@@ -362,7 +362,7 @@ Intermediate parts have less certainty than the overall height:
   geographic camera names; see the
   [building audit](building-labels.md#names-from-the-geographic-camera). A 90 m concrete
   slab stands to the published 121.9 m, with window strips in its narrow ends and punched
-  windows in its long faces. Its floor levels are estimates; see the
+  windows in its long faces. Continuous south office piers and recessed panel joints follow dated photographs; joint dimensions and floor levels remain estimates; see the
   [Millennium Park Plaza reference audit](millennium-park-plaza-reference.md).
 - Willoughby Tower stands at Michigan and Madison, left of Six North Michigan in the
   drawing. Its limestone base fills the mapped L to the setback over the 23rd floor; a

package/lib/models/aon-geographic.js

@@ -4,9 +4,10 @@ import { aonLevels, buildAonTower } from "./aon-tower.js";
 // notched corners, the rooftop enclosure part 284775635, and the published heights. The
 // tower is the shared generator in aon-tower.ts, the same one the original layout's copy
 // uses. Each mapped face carries the source plan's fifteen window bays, distributed
-// over its chord; the mapped notches are deeper, so this spacing is approximate. The antenna stands
-// at the enclosure's centre, reaching the published 362.5 m tip; the map gives no antenna
-// geometry. See docs/aon-reference.md. Units are meters; +x is east, +z is south.
+// uniformly between inset end piers; the mapped notches are deeper, so absolute spacing
+// remains approximate. The antenna stands at the enclosure's centre, reaching the
+// published 362.5 m tip; the map gives no antenna geometry. See docs/aon-reference.md.
+// Units are meters; +x is east, +z is south.
 export const aonGeographicLevels = Object.freeze({
     shaftTop: aonLevels.roof, // OSM shaft part top
     enclosureTop: aonLevels.enclosureTop, // OSM part 284775635
@@ -27,7 +28,7 @@ export function createAonGeographicBuilding(record, projectPlan, offset) {
         cz += (z + z2) * cross;
     });
     const mast = [cx / (3 * twice), cz / (3 * twice)];
-    const model = buildAonTower({ name: record.name, id: record.id, outline: polygonOf(projectPlan(record.footprint.coordinates)), enclosure, mast, base: 0 });
+    const model = buildAonTower({ name: record.name, id: record.id, outline: polygonOf(projectPlan(record.footprint.coordinates)), enclosure, mast, base: 0, uniformPierSpacing: true });
     model.building.position.set(offset[0], 0, offset[1]);
     model.building.userData["geography"] = record;
     model.building.userData["geographicDetail"] = { levels: h, floors: h.floors, source: "docs/aon-reference.md" };

package/lib/models/aon-tower.d.ts

@@ -6,6 +6,7 @@ export interface AonForm {
     enclosure: Vec2[];
     mast: Vec2;
     base: number;
+    uniformPierSpacing?: boolean;
 }
 export declare const aonLevels: Readonly<{
     roof: 340;

package/lib/models/aon-tower.js

@@ -15,7 +15,7 @@ export const aonLevels = Object.freeze({
     head: 3.1,
     enclosureTop: 346.3,
     tip: 362.5,
-    bay: 3.048, // nominal clean-plan module; mapped spacing follows each face's chord
+    bay: 3.048, // nominal clean-plan module
     baysPerFace: 15, // tenant portal's Suite 1300 plan: sixteen piers, fifteen openings
     faceLength: 20,
 });
@@ -60,13 +60,15 @@ export function buildAonTower(form) {
     paintedSlab(kit, shell, outline, 0, false, roofing);
     paintedSlab(kit, shell, outline, y(h.roof), true, roofing);
     // The source plan fixes fifteen openings per face, independent of an OSM trace's
-    // corner depth. Distribute them over each face's chord; mapped spacing remains an
-    // approximation (docs/aon-reference.md, FID-AON-001). End piers stay on their face.
+    // corner depth. In geographic mode distribute pier centres between the inset
+    // ends, so the terminal openings match the others. Absolute mapped spacing
+    // remains approximate (docs/aon-reference.md, FID-AON-002/003).
+    const pierHalf = 0.65, pierPoint = 0.7;
     const faceBays = (run) => {
-        const count = h.baysPerFace, bay = run.length / count;
-        return Array.from({ length: count + 1 }, (_, i) => i * bay);
+        const count = h.baysPerFace, inset = form.uniformPierSpacing ? pierHalf : 0;
+        const bay = (run.length - 2 * inset) / count;
+        return Array.from({ length: count + 1 }, (_, i) => inset + i * bay);
     };
-    const pierHalf = 0.65, pierPoint = 0.7;
     const floors = [];
     for (let level = h.lobbyTop; level + h.pitch <= h.capBottom + 1e-6; level += h.pitch)
         floors.push(level);

package/lib/models/colour-materials.js

@@ -138,7 +138,8 @@ export const colourMaterials = {
     // A warm white precast slab with bronze-tinted glass.
     "building-michigan-plaza-front-tall": {
         shell: ["neutral"],
-        "walls and windows": ["glass", { ...windows(0x727272, 0x484848), 0x666666: "concrete" }],
+        "walls and windows": ["glass", { ...windows(0x727272, 0x484848), 0x666666: "concrete", 0x5e5e5e: "concrete" }],
+        "south concrete panels": ["concrete"],
     },
     // Buff limestone over a granite base.
     "building-willoughby-tower": {
@@ -241,7 +242,7 @@ export const colourMaterials = {
     // White concrete.
     "building-river-plaza": {
         shell: ["concrete"],
-        "concrete and windows": ["glass", { ...windows(0x8a8a8a, 0x505050), 0x9a9a9a: "concrete" }],
+        "concrete and windows": ["glass", { ...windows(0x8a8a8a, 0x505050), 0x9a9a9a: "concrete", 0x424242: "aluminium" }],
         "rooftop box": ["concrete"],
     },
     // Dark orange brick and bronze glass.

package/lib/models/colour-palette.js

@@ -230,6 +230,7 @@ export const measuredColours = {
     },
     "building-river-plaza": {
         concrete: 0xe5dfd3,
+        aluminium: null, // photographed frames; no separately calibrated sunny sample
         glass: null,
         "lit window": null,
         "dim window": null,

package/lib/models/millennium-park-plaza-geographic.js

@@ -24,7 +24,7 @@ const floor = (n) => (n <= 8 ? h.lobby + (n - 2) * h.office : h.lobby + 6 * h.of
 const color = (hex) => new THREE.Color(hex);
 const glassTones = [0x2e2e2e, 0x323232, 0x363636, 0x3a3a3a].map(color);
 const litGlass = color(0x727272), dimGlass = color(0x484848);
-const concrete = color(0x666666), strip = color(0x3e3e3e), lobby = color(0x3a3a3a), core = color(0x262626), roofing = color(0x3e3e3e);
+const concrete = color(0x666666), joint = color(0x5e5e5e), strip = color(0x3e3e3e), lobby = color(0x3a3a3a), core = color(0x262626), roofing = color(0x3e3e3e);
 function paneColor(row, bay, wall) {
     const hash = (Math.imul(row + 23, 0x9e3779b1) ^ Math.imul(bay + 47, 0x85ebca77) ^ Math.imul(wall + 37, 0xc2b2ae3d)) >>> 0;
     const value = hash % 101;
@@ -45,6 +45,7 @@ export function createMillenniumParkPlazaGeographicBuilding(record, projectPlan,
     const kit = createBuilder(record.name, record.id);
     const shell = kit.batch("Millennium Park Plaza · shell", kit.material(0xffffff, { vertexColors: true }));
     const wall = kit.batch("Millennium Park Plaza · walls and windows", kit.material(0xffffff, { vertexColors: true }));
+    const panels = kit.batch("Millennium Park Plaza · south concrete panels", kit.material(0x666666));
     const corners = orient(polygonOf(projectPlan(record.footprint.coordinates)));
     // The slab, its walls the shell's dark core.
     planOf(corners).forEach((run) => {
@@ -56,13 +57,15 @@ export function createMillenniumParkPlazaGeographicBuilding(record, projectPlan,
     // Every wall's skin, one box a chain, held 2 cm clear of its ends. A narrow end carries
     // four window strips, 1.25 m wide and symmetrical about its middle, from the eighth floor,
     // the first of apartments, with the top floor's window standing apart over each; below,
-    // the offices' windows run across it. A long face has a punched window every 3 m between
+    // the office glazing is bounded by outer piers on the south (the north remains
+    // the older full-width approximation). A long face has a window every 3 m between
     // 0.8 m piers. The chamfers are solid.
     const plan = planOf(corners);
     chainsOf(plan).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);
         const end = chain.length > 12 && chain.length < 30, long = chain.length >= 30;
+        const south = end && plan[first].normal(0)[1] > 0.9;
         let columns, isWindow;
         if (end) {
             const middle = chain.length / 2, centres = [-4.1, -1.6, 1.6, 4.1].map((d) => middle + d);
@@ -78,11 +81,15 @@ export function createMillenniumParkPlazaGeographicBuilding(record, projectPlan,
             columns = [0, chain.length];
             isWindow = () => false;
         }
-        chainSkin(kit, wall, plan, chain, 0, chain.runs.length - 1, s0, s1, columns, heights, 0.02, 0.07, (bay, r) => {
+        chainSkin(kit, wall, plan, chain, 0, chain.runs.length - 1, s0, s1, columns, heights, 0.02, south ? 0.04 : 0.07, (bay, r) => {
             const row = rows[r];
             if (row.kind === "lobby")
                 return lobby;
             const office = row.floor < 8;
+            // Dated south views show the outer concrete piers continuing past the
+            // office windows; the earlier model glazed the entire end below floor 8.
+            if (south && (bay === 1 || bay === columns.length - 1 || (!office && !isWindow(bay))))
+                return joint;
             if (end && !office && isWindow(bay)) {
                 if (row.kind === "glass")
                     return paneColor(row.floor, bay, index);
@@ -91,9 +98,25 @@ export function createMillenniumParkPlazaGeographicBuilding(record, projectPlan,
             if (row.kind === "spandrel")
                 return concrete;
             if (end)
-                return office ? paneColor(row.floor, bay, index) : concrete;
+                return office ? paneColor(row.floor, bay, index) : south ? joint : concrete;
             return isWindow(bay) ? paneColor(row.floor, bay, index) : concrete;
         }, concrete);
+        if (south) {
+            // 1980/2005/2008 photographs resolve horizontal joints on the solid end.
+            // Keep the existing estimated floor cadence; 5 cm joint width and 3 cm
+            // relief are schematic, not measured construction dimensions. Closed
+            // panels stand in front of the continuous, closed backing skin.
+            for (let bay = 1; bay < columns.length; bay += 2) {
+                const outer = bay === 1 || bay === columns.length - 1;
+                // End clearances keep panel caps off the backing skin's end-cap planes.
+                const from = Math.max(s0 + 0.01, columns[bay - 1]), to = Math.min(s1 - 0.01, columns[bay]);
+                for (let n = outer ? 2 : 8; n <= 41; n += 1) {
+                    const lo = floor(n) - 0.3 + 0.025;
+                    const hi = n === 41 ? h.top - 0.01 : floor(n + 1) - 0.3 - 0.025;
+                    chainSkin(kit, panels, plan, chain, 0, chain.runs.length - 1, from, to, [from, to], [lo, hi], 0.035, 0.07, () => concrete, concrete);
+                }
+            }
+        }
     });
     const model = kit.finish({ height: h.top, outlines: [shell], opacity: 0.16 });
     model.building.position.set(offset[0], 0, offset[1]);

package/lib/models/river-plaza-geographic.d.ts

@@ -5,12 +5,19 @@ export declare const riverPlazaLevels: Readonly<{
     floors: 56;
     roof: 156;
     box: 159.7;
+    /** @deprecated Historical generic spacing, retained for package consumers; the model now uses counted groups. */
     bay: 1.6;
+    pier: 0.45;
+    sill: 0.35;
+    window: 2.1;
+    transom: 0.6;
+    frame: 0.06;
 }>;
 export declare const riverPlazaPalette: Readonly<{
     glass: number[];
     lit: 9079434;
     dim: 5263440;
     concrete: 10132122;
+    frame: 4342338;
 }>;
 export declare function createRiverPlazaGeographicBuilding(record: GeoBuilding, projectPlan: (coordinates: [number, number][]) => Plan, offset: [number, number]): BuildingModel;

package/lib/models/river-plaza-geographic.js

@@ -17,17 +17,28 @@ export const riverPlazaLevels = Object.freeze({
     floors: 56,
     roof: 156, // the slab's roof, OpenStreetMap's
     box: 159.7, // the rooftop box's top, the published height and tip, the Skyscraper Center's 524 ft
-    bay: 1.6, // the frame's bays, an estimate from photographs
+    /** @deprecated Historical generic spacing, retained for package consumers; the model now uses counted groups. */
+    bay: 1.6,
+    pier: 0.45, // schematic concrete width; group counts come from dated photographs
+    sill: 0.35, // inferred floor datum; photographed opening is about 75% of the pitch
+    window: 2.1,
+    transom: 0.6, // lower light about 30% of the opening; section width is schematic
+    frame: 0.06,
 });
+// Starting at the south-east end, follow the mapped outline counter-clockwise.
+// The long elevations have 3 / recess / 4 / recess / 3 groups; the ends have
+// 2 / chamfer / 1 / chamfer / 2. Each outer corner is glazed as one group.
+// See the 2007/2008/2012 counts in the reference audit; west-end symmetry is inferred.
+const groupsPerChain = [2, 1, 1, 1, 2, 1, 3, 1, 4, 1, 3, 1, 2, 1, 1, 1, 2, 1, 3, 1, 4, 1, 3, 1];
 const h = riverPlazaLevels;
 const pitch = h.roof / h.floors;
 // The skins' colours: the window tones, and the concrete, which no window shares.
-export const riverPlazaPalette = Object.freeze({ glass: [0x2c2c2c, 0x303030, 0x343434, 0x282828], lit: 0x8a8a8a, dim: 0x505050, concrete: 0x9a9a9a });
+export const riverPlazaPalette = Object.freeze({ glass: [0x2c2c2c, 0x303030, 0x343434, 0x282828], lit: 0x8a8a8a, dim: 0x505050, concrete: 0x9a9a9a, frame: 0x424242 });
 const palette = riverPlazaPalette;
 const color = (hex) => new THREE.Color(hex);
 const glassTones = palette.glass.map(color);
 const litGlass = color(palette.lit), dimGlass = color(palette.dim), concrete = color(palette.concrete);
-const core = color(0x6a6a6a), roofing = color(0x8a8a8a);
+const core = color(0x6a6a6a), roofing = color(0x8a8a8a), frame = color(palette.frame);
 function paneColor(row, bay, wall) {
     const hash = (Math.imul(row + 19, 0x9e3779b1) ^ Math.imul(bay + 37, 0x85ebca77) ^ Math.imul(wall + 29, 0xc2b2ae3d)) >>> 0;
     const value = hash % 101;
@@ -55,8 +66,9 @@ export function createRiverPlazaGeographicBuilding(record, projectPlan, offset)
     // The box on the roof, on its mapped part.
     kit.prism(box, planOf(top), [h.roof, h.box]);
     // The slab's skin, one box to a run of a chain, held 2 cm clear of the chain's ends or 9 cm
-    // where the outline turns in: on each floor, a window 1.1 m wide and 1.5 m tall in each
-    // 1.6 m bay of the frame, from the chain's middle out. A run the podium stands against, its
+    // where the outline turns in: taller windows with a narrow lower transom follow
+    // dated photographs. Broad structural groups continue into the glazed
+    // recesses and corners. A run the podium stands against, its
     // two ends on the podium's outline, starts over the podium's roof; a chain whose runs differ
     // is skinned in parts, which meet at their joint.
     const plan = planOf(tower);
@@ -66,11 +78,17 @@ export function createRiverPlazaGeographicBuilding(record, projectPlan, offset)
         return Math.hypot(p[0] - a[0] - t * (b[0] - a[0]), p[1] - a[1] - t * (b[1] - a[1])) < 0.05;
     });
     const covered = (run) => onEdge(run.at(0)) && onEdge(run.at(run.length));
-    chainsOf(plan).forEach((chain, index) => {
+    const chains = chainsOf(plan);
+    if (chains.length !== groupsPerChain.length)
+        throw new Error("River Plaza mapped facade chains changed; recheck photographed groups");
+    chains.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);
-        const count = Math.floor(chain.length / 2 / h.bay);
-        const centres = Array.from({ length: 2 * count }, (_, k) => chain.length / 2 + (k - count + 0.5) * h.bay);
+        const count = groupsPerChain[index];
+        const module = chain.length / count, halfWindow = (module - h.pier) / 2;
+        if (halfWindow <= 0)
+            throw new Error("River Plaza facade group is narrower than its concrete pier");
+        const centres = Array.from({ length: count }, (_, k) => (k + 0.5) * module);
         // The chain's parts, each a span of runs the podium covers alike.
         const parts = [];
         chain.runs.forEach((run, k) => { const part = parts.at(-1); if (part && covered(plan[run]) === covered(plan[chain.runs[part[0]]]))
@@ -82,18 +100,35 @@ export function createRiverPlazaGeographicBuilding(record, projectPlan, offset)
             const from = k0 === 0 ? s0 : chain.starts[k0], to = k1 === chain.runs.length - 1 ? s1 : chain.starts[k1] + plan[chain.runs[k1]].length;
             const heights = [base];
             for (let n = Math.ceil(base / pitch); n < h.floors; n += 1) {
-                const sill = n * pitch + 0.75;
+                const sill = n * pitch + h.sill;
                 if (sill > base + 0.2)
-                    heights.push(sill, sill + 1.5);
+                    heights.push(sill, sill + h.window);
             }
             heights.push(h.roof);
-            const cuts = centres.flatMap((c) => [c - 0.55, c + 0.55]).filter((s) => s > from + 0.01 && s < to - 0.01);
+            const cuts = centres.flatMap((c) => [c - halfWindow, c + halfWindow]).filter((s) => s > from + 0.01 && s < to - 0.01);
             const columns = [from, ...cuts, to];
             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;
-                const glazed = r % 2 === 1 && centres.some((c) => Math.abs(middle - c) < 0.55);
+                const glazed = r % 2 === 1 && centres.some((c) => Math.abs(middle - c) < halfWindow);
                 return glazed ? paneColor(r, bay, index) : concrete;
             }, concrete);
+            // A closed metal bar sits 5 mm clear of each full-height pane. Keeping
+            // the glass quad whole gives its upper and lower lights one night seed.
+            for (const centre of centres) {
+                const left = Math.max(from, centre - halfWindow), right = Math.min(to, centre + halfWindow);
+                if (right - left < 0.01)
+                    continue;
+                const firstRun = chain.runs.findIndex((run, k) => k >= k0 && k <= k1 && chain.starts[k] + plan[run].length > left + 1e-6);
+                if (firstRun < 0)
+                    throw new Error("River Plaza transom falls outside its facade section");
+                let lastRun = firstRun;
+                while (lastRun < k1 && chain.starts[lastRun + 1] < right - 1e-6)
+                    lastRun += 1;
+                for (let row = 1; row + 1 < heights.length; row += 2) {
+                    const lower = heights[row] + h.transom;
+                    chainSkin(kit, wall, plan, chain, firstRun, lastRun, left, right, [left, right], [lower, lower + h.frame], 0.075, 0.09, () => frame, frame);
+                }
+            }
         }
     });
     const model = kit.finish({ height: h.box, outlines: [shell, box], opacity: 0.16 });

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

@@ -25,7 +25,7 @@ export const geographicBuildings = [
     { "id": "building-blue-cross-blue-shield", "name": "Blue Cross and Blue Shield Tower", "shortName": "Blue Cross", "height": 226.7, "tipHeight": 226.7, "heightSource": "https://www.skyscrapercenter.com/building/blue-cross-blue-shield-tower/1160", "note": "Detailed Blue Cross: the mapped outline and parts; a glass curtain wall on the 5 ft module, the central block standing forward of end bays open through at the middle mechanical band, three bands of mechanical floors with their columns, and the emblem screen to the published 226.7 m. The lobby's height is estimated.", "footprint": { "way": 95486960, "version": 16, "coordinates": [[-87.6204645, 41.8846925], [-87.620465, 41.8847182], [-87.6204697, 41.8849849], [-87.6203148, 41.8849886], [-87.6203086, 41.8850315], [-87.6201881, 41.8850329], [-87.6201798, 41.8850759], [-87.6201749, 41.8851015], [-87.6196594, 41.8851062], [-87.6196557, 41.8850788], [-87.6196503, 41.8850388], [-87.6195227, 41.8850407], [-87.6195157, 41.8850011], [-87.6193623, 41.8849997], [-87.6193587, 41.8849047], [-87.6193513, 41.8847032], [-87.6193817, 41.8847037], [-87.6194025, 41.8847041], [-87.6194595, 41.8847032], [-87.6194506, 41.8846598], [-87.6199021, 41.8846549], [-87.6203621, 41.8846501], [-87.6203607, 41.884669], [-87.6203595, 41.8846955]] }, "parts": [{ "way": 284779637, "version": 4, "coordinates": [[-87.6203086, 41.8850315], [-87.6203148, 41.8849886], [-87.6203559, 41.8847194], [-87.6203595, 41.8846955], [-87.6203607, 41.884669], [-87.6203621, 41.8846501], [-87.6202, 41.8846517], [-87.6199021, 41.8846549], [-87.6196193, 41.8846576], [-87.6194506, 41.8846598], [-87.6194595, 41.8847032], [-87.6195157, 41.8850011], [-87.6195227, 41.8850407], [-87.6196503, 41.8850388], [-87.6201881, 41.8850329]], "bottom": 0, "top": 226.7 }, { "way": 284779635, "version": 5, "coordinates": [[-87.6193623, 41.8849997], [-87.6195157, 41.8850011], [-87.6203148, 41.8849886], [-87.6204697, 41.8849849], [-87.620465, 41.8847182], [-87.6204645, 41.8846925], [-87.6203595, 41.8846955], [-87.6194595, 41.8847032], [-87.6194025, 41.8847041], [-87.6193817, 41.8847037], [-87.6193513, 41.8847032], [-87.6193587, 41.8849047]], "bottom": 0, "top": 212 }] },
     { "id": "building-340-on-the-park", "name": "340 on the Park", "shortName": "340 on the Park", "height": 204.9, "tipHeight": 204.9, "heightSource": "https://www.skyscrapercenter.com/building/340-on-the-park/1583", "note": "Detailed 340 on the Park: the mapped outline and parts; glass curtain walls on a straight south face, a diagonal south-east face and a curved north face, with the south face's white concrete frame: piers, a beam every fifth floor, a parapet band over four penthouse floors, cantilevered and recessed balconies, and the winter garden's tall bay. The corner block's roof is measured on photographs at 51.7 m, over the map's 40 m. Floor levels are measured on the drawing; the lobby's height is estimated.", "footprint": { "way": 95486949, "version": 12, "coordinates": [[-87.619168, 41.884674], [-87.6191536, 41.884912], [-87.6191146, 41.8849133], [-87.6190581, 41.8849113], [-87.6188847, 41.8849048], [-87.6187278, 41.8848896], [-87.6186525, 41.8848776], [-87.6185999, 41.8848701], [-87.6184438, 41.8848387], [-87.61849, 41.8848042], [-87.6184907, 41.8847024], [-87.6185294, 41.8847019], [-87.6186088, 41.8847009], [-87.6186482, 41.8847001], [-87.6186465, 41.8846785]] }, "parts": [{ "way": 284789056, "version": 4, "coordinates": [[-87.6191536, 41.884912], [-87.619168, 41.884674], [-87.6186465, 41.8846785], [-87.6186482, 41.8847001], [-87.6186088, 41.8847009], [-87.61849, 41.8848042], [-87.6184438, 41.8848387], [-87.6185999, 41.8848701], [-87.6186525, 41.8848776], [-87.6187278, 41.8848896], [-87.6188847, 41.8849048], [-87.6190581, 41.8849113], [-87.6191146, 41.8849133]], "bottom": 0, "top": 204.9 }, { "way": 284789058, "version": 4, "coordinates": [[-87.6186088, 41.8847009], [-87.6185294, 41.8847019], [-87.6184907, 41.8847024], [-87.61849, 41.8848042]], "bottom": 0, "top": 51.7, "estimatedHeight": true }] },
     { "id": "building-the-buckingham", "name": "The Buckingham", "shortName": "Buckingham", "height": 121.9, "tipHeight": 121.9, "heightSource": "https://www.skyscrapercenter.com/building/buckingham-plaza/10315", "note": "Detailed Buckingham: the mapped outline and rooftop part; a concrete frame of five bays a face, a band at every floor over bronze ribbon windows, the end bays standing forward of the middle three on the south, east and north faces, balconies stacked in the two notched corners, the top floor's tall openings under a cap at the mapped 119 m, and the rooftop enclosure to the published 121.9 m. Floor levels are measured on the drawing; the lobby's height is estimated.", "footprint": { "way": 95486940, "version": 11, "coordinates": [[-87.6181599, 41.8846507], [-87.6181604, 41.8847282], [-87.618162, 41.8847796], [-87.6181638, 41.8849686], [-87.6180927, 41.8849698], [-87.618091, 41.8849586], [-87.6178554, 41.8849597], [-87.6178564, 41.8849736], [-87.6177989, 41.8849746], [-87.6177849, 41.8849748], [-87.6177824, 41.8849587], [-87.6177569, 41.8849571], [-87.6177552, 41.8849011], [-87.617777, 41.8849005], [-87.6177734, 41.8847266], [-87.6177501, 41.8847273], [-87.6177485, 41.884672], [-87.6177809, 41.8846702], [-87.6177797, 41.8846527], [-87.617852, 41.8846523], [-87.617852, 41.8846679], [-87.618083, 41.8846651], [-87.618083, 41.8846511]] }, "parts": [{ "way": 95486940, "version": 11, "coordinates": [[-87.6181599, 41.8846507], [-87.6181604, 41.8847282], [-87.618162, 41.8847796], [-87.6181638, 41.8849686], [-87.6180927, 41.8849698], [-87.618091, 41.8849586], [-87.6178554, 41.8849597], [-87.6178564, 41.8849736], [-87.6177989, 41.8849746], [-87.6177849, 41.8849748], [-87.6177824, 41.8849587], [-87.6177569, 41.8849571], [-87.6177552, 41.8849011], [-87.617777, 41.8849005], [-87.6177734, 41.8847266], [-87.6177501, 41.8847273], [-87.6177485, 41.884672], [-87.6177809, 41.8846702], [-87.6177797, 41.8846527], [-87.617852, 41.8846523], [-87.617852, 41.8846679], [-87.618083, 41.8846651], [-87.618083, 41.8846511]], "bottom": 0, "top": 119 }, { "way": 284790189, "version": 1, "coordinates": [[-87.6180734, 41.8848536], [-87.6178346, 41.8848542], [-87.6178342, 41.8847737], [-87.6180731, 41.8847732]], "bottom": 119, "top": 121.9 }] },
-    { "id": "building-michigan-plaza-front-tall", "name": "Millennium Park Plaza", "shortName": "Millennium Park Plaza", "height": 121.9, "tipHeight": 121.9, "heightSource": "https://www.skyscrapercenter.com/building/millennium-park-plaza/10316", "note": "Detailed Millennium Park Plaza: the mapped outline, named through the geographic camera; a 90 m concrete slab with chamfered south corners, offices on the first seven floors and apartments above, solid narrow ends with four slender window strips, and punched windows between piers on the long faces, to the published 121.9 m. Floor levels are estimated from the published 40 storeys.", "footprint": { "way": 127107026, "version": 7, "coordinates": [[-87.6240359, 41.8856557], [-87.624011, 41.8848485], [-87.6240357, 41.8848351], [-87.624242, 41.8848314], [-87.6242648, 41.8848508], [-87.6242799, 41.8856518]] }, "parts": [{ "way": 127107026, "version": 7, "coordinates": [[-87.6240359, 41.8856557], [-87.624011, 41.8848485], [-87.6240357, 41.8848351], [-87.624242, 41.8848314], [-87.6242648, 41.8848508], [-87.6242799, 41.8856518]], "bottom": 0, "top": 121.9 }] },
+    { "id": "building-michigan-plaza-front-tall", "name": "Millennium Park Plaza", "shortName": "Millennium Park Plaza", "height": 121.9, "tipHeight": 121.9, "heightSource": "https://www.skyscrapercenter.com/building/millennium-park-plaza/10316", "note": "Detailed Millennium Park Plaza: the mapped outline, named through the geographic camera; a 90 m concrete slab with chamfered south corners, offices on the first seven floors and apartments above, solid narrow ends with four slender window strips, and punched windows between piers on the long faces, to the published 121.9 m. South office glazing sits between continuous outer concrete piers; recessed south-panel joints follow the existing estimated floors. Floor levels, window widths and joint relief remain approximations.", "footprint": { "way": 127107026, "version": 7, "coordinates": [[-87.6240359, 41.8856557], [-87.624011, 41.8848485], [-87.6240357, 41.8848351], [-87.624242, 41.8848314], [-87.6242648, 41.8848508], [-87.6242799, 41.8856518]] }, "parts": [{ "way": 127107026, "version": 7, "coordinates": [[-87.6240359, 41.8856557], [-87.624011, 41.8848485], [-87.6240357, 41.8848351], [-87.624242, 41.8848314], [-87.6242648, 41.8848508], [-87.6242799, 41.8856518]], "bottom": 0, "top": 121.9 }] },
     { "id": "building-willoughby-tower", "name": "Willoughby Tower", "shortName": "Willoughby", "height": 133.5, "tipHeight": 133.5, "heightSource": "https://www.skyscrapercenter.com/building/willoughby-tower/9854", "note": "Detailed Willoughby Tower: the mapped L-shaped outline; a limestone Gothic base to the setback over the 23rd floor under a parapet of pinnacles, a shaft at the lot's south-east corner with a shoulder west of it, and a crown of arched windows under pinnacles and gables, its tallest pinnacles at the published 133.5 m. Levels are measured on the drawing; the shaft's plan is read from the drawing and photographs.", "footprint": { "way": 124873939, "version": 10, "coordinates": [[-87.6250765, 41.882002], [-87.6249763, 41.8820043], [-87.6249007, 41.8820051], [-87.624702, 41.8820073], [-87.6246761, 41.8820076], [-87.624674, 41.8819841], [-87.6246656, 41.8818144], [-87.6246642, 41.8817867], [-87.6247865, 41.881785], [-87.6249397, 41.8817829], [-87.624944, 41.8818519], [-87.6250739, 41.8818499]] }, "parts": [{ "way": 124873939, "version": 10, "coordinates": [[-87.6250765, 41.882002], [-87.6249763, 41.8820043], [-87.6249007, 41.8820051], [-87.624702, 41.8820073], [-87.6246761, 41.8820076], [-87.624674, 41.8819841], [-87.6246656, 41.8818144], [-87.6246642, 41.8817867], [-87.6247865, 41.881785], [-87.6249397, 41.8817829], [-87.624944, 41.8818519], [-87.6250739, 41.8818499]], "bottom": 0, "top": 133.5 }] },
     { "id": "building-six-north-michigan", "name": "Six North Michigan", "shortName": "Six North", "height": 86, "tipHeight": 86, "heightSource": "https://chicagology.com/goldenage/goldenage015/", "note": "Detailed Six North Michigan, the Montgomery Ward Building: the mapped outline; a sixteen-storey block under a projecting cornice, and the tower in the middle of its Michigan front, with a band, an arched stage of three tall windows to a face under a cornice, and a panelled top stage under a cap at the published 86 m, where the pyramid came off in 1947. Levels are measured on the drawing; the tower's plan is read from the drawing.", "footprint": { "way": 126982631, "version": 12, "coordinates": [[-87.6246862, 41.8824645], [-87.6246875, 41.8824613], [-87.6246872, 41.8824178], [-87.6246863, 41.8823638], [-87.624686, 41.8823412], [-87.6246848, 41.8822497], [-87.6246844, 41.882217], [-87.6249101, 41.8822147], [-87.6249772, 41.8822141], [-87.6252824, 41.8822112], [-87.6252834, 41.8823395], [-87.6252861, 41.8824613]] }, "parts": [{ "way": 126982631, "version": 12, "coordinates": [[-87.6246862, 41.8824645], [-87.6246875, 41.8824613], [-87.6246872, 41.8824178], [-87.6246863, 41.8823638], [-87.624686, 41.8823412], [-87.6246848, 41.8822497], [-87.6246844, 41.882217], [-87.6249101, 41.8822147], [-87.6249772, 41.8822141], [-87.6252824, 41.8822112], [-87.6252834, 41.8823395], [-87.6252861, 41.8824613]], "bottom": 0, "top": 86 }] },
     { "id": "building-six-north-far-east", "name": "Michigan Boulevard Building", "shortName": "Michigan Boulevard", "height": 82, "tipHeight": 83.3, "heightSource": "https://web.archive.org/web/20070216134331/http://www.emporis.com/en/wm/bu/?id=michiganboulevardbuilding-chicago-il-usa", "note": "Detailed Michigan Boulevard Building: the mapped outline, named through the geographic camera; a terracotta Michigan front of five bays, a single window and four pairs to a floor, over twenty-one storeys, with a belt course over the thirteenth and an attic of panels under the parapet at the published 82 m, its south bay's parapet raised to 83.3 m. The terracotta turns one bay onto the south wall, common brick beyond, blank above 20 North Michigan to the eighteenth floor. Levels are measured on the drawing.", "footprint": { "way": 126982630, "version": 8, "coordinates": [[-87.6246899, 41.8828465], [-87.6250574, 41.8828445], [-87.6250579, 41.8828698], [-87.6252905, 41.8828713], [-87.625293, 41.8831223], [-87.6251914, 41.8831227], [-87.6251166, 41.883123], [-87.6250744, 41.8831231], [-87.6249196, 41.8831237], [-87.6246922, 41.8831245], [-87.6246919, 41.8830972], [-87.6246898, 41.8828903], [-87.6246895, 41.8828674], [-87.6246898, 41.8828566]] }, "parts": [{ "way": 126982630, "version": 8, "coordinates": [[-87.6246899, 41.8828465], [-87.6250574, 41.8828445], [-87.6250579, 41.8828698], [-87.6252905, 41.8828713], [-87.625293, 41.8831223], [-87.6251914, 41.8831227], [-87.6251166, 41.883123], [-87.6250744, 41.8831231], [-87.6249196, 41.8831237], [-87.6246922, 41.8831245], [-87.6246919, 41.8830972], [-87.6246898, 41.8828903], [-87.6246895, 41.8828674], [-87.6246898, 41.8828566]], "bottom": 0, "top": 83.3 }] },

package/lib/models/swissotel-geographic.js

@@ -6,7 +6,7 @@ import { chainSkin, chainsOf, orient, paintedSlab, planOf, turnsAt } from "./fac
 // the photograph's camera it stands behind Three Illinois Center and The Buckingham, and fills
 // the seam where their corners meet.
 //
-// A triangular tower of reflective glass: a flush grid of thin mullions about 1.5 m apart and
+// A triangular tower of reflective glass and opaque bands: thin mullions about 1.5 m apart and
 // paired opaque spandrel / vision panels at each floor, under a flat roof at the published 139.3 m. The
 // floors divide that height by OpenStreetMap's 45 levels. See docs/swissotel-reference.md.
 // Units are meters; +x is east, +z is south.

package/package.json

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

package/site/models/aon-geographic.js

@@ -4,9 +4,10 @@ import { aonLevels, buildAonTower } from "./aon-tower.js";
 // notched corners, the rooftop enclosure part 284775635, and the published heights. The
 // tower is the shared generator in aon-tower.ts, the same one the original layout's copy
 // uses. Each mapped face carries the source plan's fifteen window bays, distributed
-// over its chord; the mapped notches are deeper, so this spacing is approximate. The antenna stands
-// at the enclosure's centre, reaching the published 362.5 m tip; the map gives no antenna
-// geometry. See docs/aon-reference.md. Units are meters; +x is east, +z is south.
+// uniformly between inset end piers; the mapped notches are deeper, so absolute spacing
+// remains approximate. The antenna stands at the enclosure's centre, reaching the
+// published 362.5 m tip; the map gives no antenna geometry. See docs/aon-reference.md.
+// Units are meters; +x is east, +z is south.
 export const aonGeographicLevels = Object.freeze({
     shaftTop: aonLevels.roof, // OSM shaft part top
     enclosureTop: aonLevels.enclosureTop, // OSM part 284775635
@@ -27,7 +28,7 @@ export function createAonGeographicBuilding(record, projectPlan, offset) {
         cz += (z + z2) * cross;
     });
     const mast = [cx / (3 * twice), cz / (3 * twice)];
-    const model = buildAonTower({ name: record.name, id: record.id, outline: polygonOf(projectPlan(record.footprint.coordinates)), enclosure, mast, base: 0 });
+    const model = buildAonTower({ name: record.name, id: record.id, outline: polygonOf(projectPlan(record.footprint.coordinates)), enclosure, mast, base: 0, uniformPierSpacing: true });
     model.building.position.set(offset[0], 0, offset[1]);
     model.building.userData["geography"] = record;
     model.building.userData["geographicDetail"] = { levels: h, floors: h.floors, source: "docs/aon-reference.md" };

package/site/models/aon-tower.js

@@ -15,7 +15,7 @@ export const aonLevels = Object.freeze({
     head: 3.1,
     enclosureTop: 346.3,
     tip: 362.5,
-    bay: 3.048, // nominal clean-plan module; mapped spacing follows each face's chord
+    bay: 3.048, // nominal clean-plan module
     baysPerFace: 15, // tenant portal's Suite 1300 plan: sixteen piers, fifteen openings
     faceLength: 20,
 });
@@ -60,13 +60,15 @@ export function buildAonTower(form) {
     paintedSlab(kit, shell, outline, 0, false, roofing);
     paintedSlab(kit, shell, outline, y(h.roof), true, roofing);
     // The source plan fixes fifteen openings per face, independent of an OSM trace's
-    // corner depth. Distribute them over each face's chord; mapped spacing remains an
-    // approximation (docs/aon-reference.md, FID-AON-001). End piers stay on their face.
+    // corner depth. In geographic mode distribute pier centres between the inset
+    // ends, so the terminal openings match the others. Absolute mapped spacing
+    // remains approximate (docs/aon-reference.md, FID-AON-002/003).
+    const pierHalf = 0.65, pierPoint = 0.7;
     const faceBays = (run) => {
-        const count = h.baysPerFace, bay = run.length / count;
-        return Array.from({ length: count + 1 }, (_, i) => i * bay);
+        const count = h.baysPerFace, inset = form.uniformPierSpacing ? pierHalf : 0;
+        const bay = (run.length - 2 * inset) / count;
+        return Array.from({ length: count + 1 }, (_, i) => inset + i * bay);
     };
-    const pierHalf = 0.65, pierPoint = 0.7;
     const floors = [];
     for (let level = h.lobbyTop; level + h.pitch <= h.capBottom + 1e-6; level += h.pitch)
         floors.push(level);

package/site/models/colour-materials.js

@@ -138,7 +138,8 @@ export const colourMaterials = {
     // A warm white precast slab with bronze-tinted glass.
     "building-michigan-plaza-front-tall": {
         shell: ["neutral"],
-        "walls and windows": ["glass", { ...windows(0x727272, 0x484848), 0x666666: "concrete" }],
+        "walls and windows": ["glass", { ...windows(0x727272, 0x484848), 0x666666: "concrete", 0x5e5e5e: "concrete" }],
+        "south concrete panels": ["concrete"],
     },
     // Buff limestone over a granite base.
     "building-willoughby-tower": {
@@ -241,7 +242,7 @@ export const colourMaterials = {
     // White concrete.
     "building-river-plaza": {
         shell: ["concrete"],
-        "concrete and windows": ["glass", { ...windows(0x8a8a8a, 0x505050), 0x9a9a9a: "concrete" }],
+        "concrete and windows": ["glass", { ...windows(0x8a8a8a, 0x505050), 0x9a9a9a: "concrete", 0x424242: "aluminium" }],
         "rooftop box": ["concrete"],
     },
     // Dark orange brick and bronze glass.

package/site/models/colour-palette.js

@@ -230,6 +230,7 @@ export const measuredColours = {
     },
     "building-river-plaza": {
         concrete: 0xe5dfd3,
+        aluminium: null, // photographed frames; no separately calibrated sunny sample
         glass: null,
         "lit window": null,
         "dim window": null,

package/site/models/millennium-park-plaza-geographic.js

@@ -24,7 +24,7 @@ const floor = (n) => (n <= 8 ? h.lobby + (n - 2) * h.office : h.lobby + 6 * h.of
 const color = (hex) => new THREE.Color(hex);
 const glassTones = [0x2e2e2e, 0x323232, 0x363636, 0x3a3a3a].map(color);
 const litGlass = color(0x727272), dimGlass = color(0x484848);
-const concrete = color(0x666666), strip = color(0x3e3e3e), lobby = color(0x3a3a3a), core = color(0x262626), roofing = color(0x3e3e3e);
+const concrete = color(0x666666), joint = color(0x5e5e5e), strip = color(0x3e3e3e), lobby = color(0x3a3a3a), core = color(0x262626), roofing = color(0x3e3e3e);
 function paneColor(row, bay, wall) {
     const hash = (Math.imul(row + 23, 0x9e3779b1) ^ Math.imul(bay + 47, 0x85ebca77) ^ Math.imul(wall + 37, 0xc2b2ae3d)) >>> 0;
     const value = hash % 101;
@@ -45,6 +45,7 @@ export function createMillenniumParkPlazaGeographicBuilding(record, projectPlan,
     const kit = createBuilder(record.name, record.id);
     const shell = kit.batch("Millennium Park Plaza · shell", kit.material(0xffffff, { vertexColors: true }));
     const wall = kit.batch("Millennium Park Plaza · walls and windows", kit.material(0xffffff, { vertexColors: true }));
+    const panels = kit.batch("Millennium Park Plaza · south concrete panels", kit.material(0x666666));
     const corners = orient(polygonOf(projectPlan(record.footprint.coordinates)));
     // The slab, its walls the shell's dark core.
     planOf(corners).forEach((run) => {
@@ -56,13 +57,15 @@ export function createMillenniumParkPlazaGeographicBuilding(record, projectPlan,
     // Every wall's skin, one box a chain, held 2 cm clear of its ends. A narrow end carries
     // four window strips, 1.25 m wide and symmetrical about its middle, from the eighth floor,
     // the first of apartments, with the top floor's window standing apart over each; below,
-    // the offices' windows run across it. A long face has a punched window every 3 m between
+    // the office glazing is bounded by outer piers on the south (the north remains
+    // the older full-width approximation). A long face has a window every 3 m between
     // 0.8 m piers. The chamfers are solid.
     const plan = planOf(corners);
     chainsOf(plan).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);
         const end = chain.length > 12 && chain.length < 30, long = chain.length >= 30;
+        const south = end && plan[first].normal(0)[1] > 0.9;
         let columns, isWindow;
         if (end) {
             const middle = chain.length / 2, centres = [-4.1, -1.6, 1.6, 4.1].map((d) => middle + d);
@@ -78,11 +81,15 @@ export function createMillenniumParkPlazaGeographicBuilding(record, projectPlan,
             columns = [0, chain.length];
             isWindow = () => false;
         }
-        chainSkin(kit, wall, plan, chain, 0, chain.runs.length - 1, s0, s1, columns, heights, 0.02, 0.07, (bay, r) => {
+        chainSkin(kit, wall, plan, chain, 0, chain.runs.length - 1, s0, s1, columns, heights, 0.02, south ? 0.04 : 0.07, (bay, r) => {
             const row = rows[r];
             if (row.kind === "lobby")
                 return lobby;
             const office = row.floor < 8;
+            // Dated south views show the outer concrete piers continuing past the
+            // office windows; the earlier model glazed the entire end below floor 8.
+            if (south && (bay === 1 || bay === columns.length - 1 || (!office && !isWindow(bay))))
+                return joint;
             if (end && !office && isWindow(bay)) {
                 if (row.kind === "glass")
                     return paneColor(row.floor, bay, index);
@@ -91,9 +98,25 @@ export function createMillenniumParkPlazaGeographicBuilding(record, projectPlan,
             if (row.kind === "spandrel")
                 return concrete;
             if (end)
-                return office ? paneColor(row.floor, bay, index) : concrete;
+                return office ? paneColor(row.floor, bay, index) : south ? joint : concrete;
             return isWindow(bay) ? paneColor(row.floor, bay, index) : concrete;
         }, concrete);
+        if (south) {
+            // 1980/2005/2008 photographs resolve horizontal joints on the solid end.
+            // Keep the existing estimated floor cadence; 5 cm joint width and 3 cm
+            // relief are schematic, not measured construction dimensions. Closed
+            // panels stand in front of the continuous, closed backing skin.
+            for (let bay = 1; bay < columns.length; bay += 2) {
+                const outer = bay === 1 || bay === columns.length - 1;
+                // End clearances keep panel caps off the backing skin's end-cap planes.
+                const from = Math.max(s0 + 0.01, columns[bay - 1]), to = Math.min(s1 - 0.01, columns[bay]);
+                for (let n = outer ? 2 : 8; n <= 41; n += 1) {
+                    const lo = floor(n) - 0.3 + 0.025;
+                    const hi = n === 41 ? h.top - 0.01 : floor(n + 1) - 0.3 - 0.025;
+                    chainSkin(kit, panels, plan, chain, 0, chain.runs.length - 1, from, to, [from, to], [lo, hi], 0.035, 0.07, () => concrete, concrete);
+                }
+            }
+        }
     });
     const model = kit.finish({ height: h.top, outlines: [shell], opacity: 0.16 });
     model.building.position.set(offset[0], 0, offset[1]);

package/site/models/river-plaza-geographic.js

@@ -17,17 +17,28 @@ export const riverPlazaLevels = Object.freeze({
     floors: 56,
     roof: 156, // the slab's roof, OpenStreetMap's
     box: 159.7, // the rooftop box's top, the published height and tip, the Skyscraper Center's 524 ft
-    bay: 1.6, // the frame's bays, an estimate from photographs
+    /** @deprecated Historical generic spacing, retained for package consumers; the model now uses counted groups. */
+    bay: 1.6,
+    pier: 0.45, // schematic concrete width; group counts come from dated photographs
+    sill: 0.35, // inferred floor datum; photographed opening is about 75% of the pitch
+    window: 2.1,
+    transom: 0.6, // lower light about 30% of the opening; section width is schematic
+    frame: 0.06,
 });
+// Starting at the south-east end, follow the mapped outline counter-clockwise.
+// The long elevations have 3 / recess / 4 / recess / 3 groups; the ends have
+// 2 / chamfer / 1 / chamfer / 2. Each outer corner is glazed as one group.
+// See the 2007/2008/2012 counts in the reference audit; west-end symmetry is inferred.
+const groupsPerChain = [2, 1, 1, 1, 2, 1, 3, 1, 4, 1, 3, 1, 2, 1, 1, 1, 2, 1, 3, 1, 4, 1, 3, 1];
 const h = riverPlazaLevels;
 const pitch = h.roof / h.floors;
 // The skins' colours: the window tones, and the concrete, which no window shares.
-export const riverPlazaPalette = Object.freeze({ glass: [0x2c2c2c, 0x303030, 0x343434, 0x282828], lit: 0x8a8a8a, dim: 0x505050, concrete: 0x9a9a9a });
+export const riverPlazaPalette = Object.freeze({ glass: [0x2c2c2c, 0x303030, 0x343434, 0x282828], lit: 0x8a8a8a, dim: 0x505050, concrete: 0x9a9a9a, frame: 0x424242 });
 const palette = riverPlazaPalette;
 const color = (hex) => new THREE.Color(hex);
 const glassTones = palette.glass.map(color);
 const litGlass = color(palette.lit), dimGlass = color(palette.dim), concrete = color(palette.concrete);
-const core = color(0x6a6a6a), roofing = color(0x8a8a8a);
+const core = color(0x6a6a6a), roofing = color(0x8a8a8a), frame = color(palette.frame);
 function paneColor(row, bay, wall) {
     const hash = (Math.imul(row + 19, 0x9e3779b1) ^ Math.imul(bay + 37, 0x85ebca77) ^ Math.imul(wall + 29, 0xc2b2ae3d)) >>> 0;
     const value = hash % 101;
@@ -55,8 +66,9 @@ export function createRiverPlazaGeographicBuilding(record, projectPlan, offset)
     // The box on the roof, on its mapped part.
     kit.prism(box, planOf(top), [h.roof, h.box]);
     // The slab's skin, one box to a run of a chain, held 2 cm clear of the chain's ends or 9 cm
-    // where the outline turns in: on each floor, a window 1.1 m wide and 1.5 m tall in each
-    // 1.6 m bay of the frame, from the chain's middle out. A run the podium stands against, its
+    // where the outline turns in: taller windows with a narrow lower transom follow
+    // dated photographs. Broad structural groups continue into the glazed
+    // recesses and corners. A run the podium stands against, its
     // two ends on the podium's outline, starts over the podium's roof; a chain whose runs differ
     // is skinned in parts, which meet at their joint.
     const plan = planOf(tower);
@@ -66,11 +78,17 @@ export function createRiverPlazaGeographicBuilding(record, projectPlan, offset)
         return Math.hypot(p[0] - a[0] - t * (b[0] - a[0]), p[1] - a[1] - t * (b[1] - a[1])) < 0.05;
     });
     const covered = (run) => onEdge(run.at(0)) && onEdge(run.at(run.length));
-    chainsOf(plan).forEach((chain, index) => {
+    const chains = chainsOf(plan);
+    if (chains.length !== groupsPerChain.length)
+        throw new Error("River Plaza mapped facade chains changed; recheck photographed groups");
+    chains.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);
-        const count = Math.floor(chain.length / 2 / h.bay);
-        const centres = Array.from({ length: 2 * count }, (_, k) => chain.length / 2 + (k - count + 0.5) * h.bay);
+        const count = groupsPerChain[index];
+        const module = chain.length / count, halfWindow = (module - h.pier) / 2;
+        if (halfWindow <= 0)
+            throw new Error("River Plaza facade group is narrower than its concrete pier");
+        const centres = Array.from({ length: count }, (_, k) => (k + 0.5) * module);
         // The chain's parts, each a span of runs the podium covers alike.
         const parts = [];
         chain.runs.forEach((run, k) => { const part = parts.at(-1); if (part && covered(plan[run]) === covered(plan[chain.runs[part[0]]]))
@@ -82,18 +100,35 @@ export function createRiverPlazaGeographicBuilding(record, projectPlan, offset)
             const from = k0 === 0 ? s0 : chain.starts[k0], to = k1 === chain.runs.length - 1 ? s1 : chain.starts[k1] + plan[chain.runs[k1]].length;
             const heights = [base];
             for (let n = Math.ceil(base / pitch); n < h.floors; n += 1) {
-                const sill = n * pitch + 0.75;
+                const sill = n * pitch + h.sill;
                 if (sill > base + 0.2)
-                    heights.push(sill, sill + 1.5);
+                    heights.push(sill, sill + h.window);
             }
             heights.push(h.roof);
-            const cuts = centres.flatMap((c) => [c - 0.55, c + 0.55]).filter((s) => s > from + 0.01 && s < to - 0.01);
+            const cuts = centres.flatMap((c) => [c - halfWindow, c + halfWindow]).filter((s) => s > from + 0.01 && s < to - 0.01);
             const columns = [from, ...cuts, to];
             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;
-                const glazed = r % 2 === 1 && centres.some((c) => Math.abs(middle - c) < 0.55);
+                const glazed = r % 2 === 1 && centres.some((c) => Math.abs(middle - c) < halfWindow);
                 return glazed ? paneColor(r, bay, index) : concrete;
             }, concrete);
+            // A closed metal bar sits 5 mm clear of each full-height pane. Keeping
+            // the glass quad whole gives its upper and lower lights one night seed.
+            for (const centre of centres) {
+                const left = Math.max(from, centre - halfWindow), right = Math.min(to, centre + halfWindow);
+                if (right - left < 0.01)
+                    continue;
+                const firstRun = chain.runs.findIndex((run, k) => k >= k0 && k <= k1 && chain.starts[k] + plan[run].length > left + 1e-6);
+                if (firstRun < 0)
+                    throw new Error("River Plaza transom falls outside its facade section");
+                let lastRun = firstRun;
+                while (lastRun < k1 && chain.starts[lastRun + 1] < right - 1e-6)
+                    lastRun += 1;
+                for (let row = 1; row + 1 < heights.length; row += 2) {
+                    const lower = heights[row] + h.transom;
+                    chainSkin(kit, wall, plan, chain, firstRun, lastRun, left, right, [left, right], [lower, lower + h.frame], 0.075, 0.09, () => frame, frame);
+                }
+            }
         }
     });
     const model = kit.finish({ height: h.box, outlines: [shell, box], opacity: 0.16 });

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

@@ -25,7 +25,7 @@ export const geographicBuildings = [
     { "id": "building-blue-cross-blue-shield", "name": "Blue Cross and Blue Shield Tower", "shortName": "Blue Cross", "height": 226.7, "tipHeight": 226.7, "heightSource": "https://www.skyscrapercenter.com/building/blue-cross-blue-shield-tower/1160", "note": "Detailed Blue Cross: the mapped outline and parts; a glass curtain wall on the 5 ft module, the central block standing forward of end bays open through at the middle mechanical band, three bands of mechanical floors with their columns, and the emblem screen to the published 226.7 m. The lobby's height is estimated.", "footprint": { "way": 95486960, "version": 16, "coordinates": [[-87.6204645, 41.8846925], [-87.620465, 41.8847182], [-87.6204697, 41.8849849], [-87.6203148, 41.8849886], [-87.6203086, 41.8850315], [-87.6201881, 41.8850329], [-87.6201798, 41.8850759], [-87.6201749, 41.8851015], [-87.6196594, 41.8851062], [-87.6196557, 41.8850788], [-87.6196503, 41.8850388], [-87.6195227, 41.8850407], [-87.6195157, 41.8850011], [-87.6193623, 41.8849997], [-87.6193587, 41.8849047], [-87.6193513, 41.8847032], [-87.6193817, 41.8847037], [-87.6194025, 41.8847041], [-87.6194595, 41.8847032], [-87.6194506, 41.8846598], [-87.6199021, 41.8846549], [-87.6203621, 41.8846501], [-87.6203607, 41.884669], [-87.6203595, 41.8846955]] }, "parts": [{ "way": 284779637, "version": 4, "coordinates": [[-87.6203086, 41.8850315], [-87.6203148, 41.8849886], [-87.6203559, 41.8847194], [-87.6203595, 41.8846955], [-87.6203607, 41.884669], [-87.6203621, 41.8846501], [-87.6202, 41.8846517], [-87.6199021, 41.8846549], [-87.6196193, 41.8846576], [-87.6194506, 41.8846598], [-87.6194595, 41.8847032], [-87.6195157, 41.8850011], [-87.6195227, 41.8850407], [-87.6196503, 41.8850388], [-87.6201881, 41.8850329]], "bottom": 0, "top": 226.7 }, { "way": 284779635, "version": 5, "coordinates": [[-87.6193623, 41.8849997], [-87.6195157, 41.8850011], [-87.6203148, 41.8849886], [-87.6204697, 41.8849849], [-87.620465, 41.8847182], [-87.6204645, 41.8846925], [-87.6203595, 41.8846955], [-87.6194595, 41.8847032], [-87.6194025, 41.8847041], [-87.6193817, 41.8847037], [-87.6193513, 41.8847032], [-87.6193587, 41.8849047]], "bottom": 0, "top": 212 }] },
     { "id": "building-340-on-the-park", "name": "340 on the Park", "shortName": "340 on the Park", "height": 204.9, "tipHeight": 204.9, "heightSource": "https://www.skyscrapercenter.com/building/340-on-the-park/1583", "note": "Detailed 340 on the Park: the mapped outline and parts; glass curtain walls on a straight south face, a diagonal south-east face and a curved north face, with the south face's white concrete frame: piers, a beam every fifth floor, a parapet band over four penthouse floors, cantilevered and recessed balconies, and the winter garden's tall bay. The corner block's roof is measured on photographs at 51.7 m, over the map's 40 m. Floor levels are measured on the drawing; the lobby's height is estimated.", "footprint": { "way": 95486949, "version": 12, "coordinates": [[-87.619168, 41.884674], [-87.6191536, 41.884912], [-87.6191146, 41.8849133], [-87.6190581, 41.8849113], [-87.6188847, 41.8849048], [-87.6187278, 41.8848896], [-87.6186525, 41.8848776], [-87.6185999, 41.8848701], [-87.6184438, 41.8848387], [-87.61849, 41.8848042], [-87.6184907, 41.8847024], [-87.6185294, 41.8847019], [-87.6186088, 41.8847009], [-87.6186482, 41.8847001], [-87.6186465, 41.8846785]] }, "parts": [{ "way": 284789056, "version": 4, "coordinates": [[-87.6191536, 41.884912], [-87.619168, 41.884674], [-87.6186465, 41.8846785], [-87.6186482, 41.8847001], [-87.6186088, 41.8847009], [-87.61849, 41.8848042], [-87.6184438, 41.8848387], [-87.6185999, 41.8848701], [-87.6186525, 41.8848776], [-87.6187278, 41.8848896], [-87.6188847, 41.8849048], [-87.6190581, 41.8849113], [-87.6191146, 41.8849133]], "bottom": 0, "top": 204.9 }, { "way": 284789058, "version": 4, "coordinates": [[-87.6186088, 41.8847009], [-87.6185294, 41.8847019], [-87.6184907, 41.8847024], [-87.61849, 41.8848042]], "bottom": 0, "top": 51.7, "estimatedHeight": true }] },
     { "id": "building-the-buckingham", "name": "The Buckingham", "shortName": "Buckingham", "height": 121.9, "tipHeight": 121.9, "heightSource": "https://www.skyscrapercenter.com/building/buckingham-plaza/10315", "note": "Detailed Buckingham: the mapped outline and rooftop part; a concrete frame of five bays a face, a band at every floor over bronze ribbon windows, the end bays standing forward of the middle three on the south, east and north faces, balconies stacked in the two notched corners, the top floor's tall openings under a cap at the mapped 119 m, and the rooftop enclosure to the published 121.9 m. Floor levels are measured on the drawing; the lobby's height is estimated.", "footprint": { "way": 95486940, "version": 11, "coordinates": [[-87.6181599, 41.8846507], [-87.6181604, 41.8847282], [-87.618162, 41.8847796], [-87.6181638, 41.8849686], [-87.6180927, 41.8849698], [-87.618091, 41.8849586], [-87.6178554, 41.8849597], [-87.6178564, 41.8849736], [-87.6177989, 41.8849746], [-87.6177849, 41.8849748], [-87.6177824, 41.8849587], [-87.6177569, 41.8849571], [-87.6177552, 41.8849011], [-87.617777, 41.8849005], [-87.6177734, 41.8847266], [-87.6177501, 41.8847273], [-87.6177485, 41.884672], [-87.6177809, 41.8846702], [-87.6177797, 41.8846527], [-87.617852, 41.8846523], [-87.617852, 41.8846679], [-87.618083, 41.8846651], [-87.618083, 41.8846511]] }, "parts": [{ "way": 95486940, "version": 11, "coordinates": [[-87.6181599, 41.8846507], [-87.6181604, 41.8847282], [-87.618162, 41.8847796], [-87.6181638, 41.8849686], [-87.6180927, 41.8849698], [-87.618091, 41.8849586], [-87.6178554, 41.8849597], [-87.6178564, 41.8849736], [-87.6177989, 41.8849746], [-87.6177849, 41.8849748], [-87.6177824, 41.8849587], [-87.6177569, 41.8849571], [-87.6177552, 41.8849011], [-87.617777, 41.8849005], [-87.6177734, 41.8847266], [-87.6177501, 41.8847273], [-87.6177485, 41.884672], [-87.6177809, 41.8846702], [-87.6177797, 41.8846527], [-87.617852, 41.8846523], [-87.617852, 41.8846679], [-87.618083, 41.8846651], [-87.618083, 41.8846511]], "bottom": 0, "top": 119 }, { "way": 284790189, "version": 1, "coordinates": [[-87.6180734, 41.8848536], [-87.6178346, 41.8848542], [-87.6178342, 41.8847737], [-87.6180731, 41.8847732]], "bottom": 119, "top": 121.9 }] },
-    { "id": "building-michigan-plaza-front-tall", "name": "Millennium Park Plaza", "shortName": "Millennium Park Plaza", "height": 121.9, "tipHeight": 121.9, "heightSource": "https://www.skyscrapercenter.com/building/millennium-park-plaza/10316", "note": "Detailed Millennium Park Plaza: the mapped outline, named through the geographic camera; a 90 m concrete slab with chamfered south corners, offices on the first seven floors and apartments above, solid narrow ends with four slender window strips, and punched windows between piers on the long faces, to the published 121.9 m. Floor levels are estimated from the published 40 storeys.", "footprint": { "way": 127107026, "version": 7, "coordinates": [[-87.6240359, 41.8856557], [-87.624011, 41.8848485], [-87.6240357, 41.8848351], [-87.624242, 41.8848314], [-87.6242648, 41.8848508], [-87.6242799, 41.8856518]] }, "parts": [{ "way": 127107026, "version": 7, "coordinates": [[-87.6240359, 41.8856557], [-87.624011, 41.8848485], [-87.6240357, 41.8848351], [-87.624242, 41.8848314], [-87.6242648, 41.8848508], [-87.6242799, 41.8856518]], "bottom": 0, "top": 121.9 }] },
+    { "id": "building-michigan-plaza-front-tall", "name": "Millennium Park Plaza", "shortName": "Millennium Park Plaza", "height": 121.9, "tipHeight": 121.9, "heightSource": "https://www.skyscrapercenter.com/building/millennium-park-plaza/10316", "note": "Detailed Millennium Park Plaza: the mapped outline, named through the geographic camera; a 90 m concrete slab with chamfered south corners, offices on the first seven floors and apartments above, solid narrow ends with four slender window strips, and punched windows between piers on the long faces, to the published 121.9 m. South office glazing sits between continuous outer concrete piers; recessed south-panel joints follow the existing estimated floors. Floor levels, window widths and joint relief remain approximations.", "footprint": { "way": 127107026, "version": 7, "coordinates": [[-87.6240359, 41.8856557], [-87.624011, 41.8848485], [-87.6240357, 41.8848351], [-87.624242, 41.8848314], [-87.6242648, 41.8848508], [-87.6242799, 41.8856518]] }, "parts": [{ "way": 127107026, "version": 7, "coordinates": [[-87.6240359, 41.8856557], [-87.624011, 41.8848485], [-87.6240357, 41.8848351], [-87.624242, 41.8848314], [-87.6242648, 41.8848508], [-87.6242799, 41.8856518]], "bottom": 0, "top": 121.9 }] },
     { "id": "building-willoughby-tower", "name": "Willoughby Tower", "shortName": "Willoughby", "height": 133.5, "tipHeight": 133.5, "heightSource": "https://www.skyscrapercenter.com/building/willoughby-tower/9854", "note": "Detailed Willoughby Tower: the mapped L-shaped outline; a limestone Gothic base to the setback over the 23rd floor under a parapet of pinnacles, a shaft at the lot's south-east corner with a shoulder west of it, and a crown of arched windows under pinnacles and gables, its tallest pinnacles at the published 133.5 m. Levels are measured on the drawing; the shaft's plan is read from the drawing and photographs.", "footprint": { "way": 124873939, "version": 10, "coordinates": [[-87.6250765, 41.882002], [-87.6249763, 41.8820043], [-87.6249007, 41.8820051], [-87.624702, 41.8820073], [-87.6246761, 41.8820076], [-87.624674, 41.8819841], [-87.6246656, 41.8818144], [-87.6246642, 41.8817867], [-87.6247865, 41.881785], [-87.6249397, 41.8817829], [-87.624944, 41.8818519], [-87.6250739, 41.8818499]] }, "parts": [{ "way": 124873939, "version": 10, "coordinates": [[-87.6250765, 41.882002], [-87.6249763, 41.8820043], [-87.6249007, 41.8820051], [-87.624702, 41.8820073], [-87.6246761, 41.8820076], [-87.624674, 41.8819841], [-87.6246656, 41.8818144], [-87.6246642, 41.8817867], [-87.6247865, 41.881785], [-87.6249397, 41.8817829], [-87.624944, 41.8818519], [-87.6250739, 41.8818499]], "bottom": 0, "top": 133.5 }] },
     { "id": "building-six-north-michigan", "name": "Six North Michigan", "shortName": "Six North", "height": 86, "tipHeight": 86, "heightSource": "https://chicagology.com/goldenage/goldenage015/", "note": "Detailed Six North Michigan, the Montgomery Ward Building: the mapped outline; a sixteen-storey block under a projecting cornice, and the tower in the middle of its Michigan front, with a band, an arched stage of three tall windows to a face under a cornice, and a panelled top stage under a cap at the published 86 m, where the pyramid came off in 1947. Levels are measured on the drawing; the tower's plan is read from the drawing.", "footprint": { "way": 126982631, "version": 12, "coordinates": [[-87.6246862, 41.8824645], [-87.6246875, 41.8824613], [-87.6246872, 41.8824178], [-87.6246863, 41.8823638], [-87.624686, 41.8823412], [-87.6246848, 41.8822497], [-87.6246844, 41.882217], [-87.6249101, 41.8822147], [-87.6249772, 41.8822141], [-87.6252824, 41.8822112], [-87.6252834, 41.8823395], [-87.6252861, 41.8824613]] }, "parts": [{ "way": 126982631, "version": 12, "coordinates": [[-87.6246862, 41.8824645], [-87.6246875, 41.8824613], [-87.6246872, 41.8824178], [-87.6246863, 41.8823638], [-87.624686, 41.8823412], [-87.6246848, 41.8822497], [-87.6246844, 41.882217], [-87.6249101, 41.8822147], [-87.6249772, 41.8822141], [-87.6252824, 41.8822112], [-87.6252834, 41.8823395], [-87.6252861, 41.8824613]], "bottom": 0, "top": 86 }] },
     { "id": "building-six-north-far-east", "name": "Michigan Boulevard Building", "shortName": "Michigan Boulevard", "height": 82, "tipHeight": 83.3, "heightSource": "https://web.archive.org/web/20070216134331/http://www.emporis.com/en/wm/bu/?id=michiganboulevardbuilding-chicago-il-usa", "note": "Detailed Michigan Boulevard Building: the mapped outline, named through the geographic camera; a terracotta Michigan front of five bays, a single window and four pairs to a floor, over twenty-one storeys, with a belt course over the thirteenth and an attic of panels under the parapet at the published 82 m, its south bay's parapet raised to 83.3 m. The terracotta turns one bay onto the south wall, common brick beyond, blank above 20 North Michigan to the eighteenth floor. Levels are measured on the drawing.", "footprint": { "way": 126982630, "version": 8, "coordinates": [[-87.6246899, 41.8828465], [-87.6250574, 41.8828445], [-87.6250579, 41.8828698], [-87.6252905, 41.8828713], [-87.625293, 41.8831223], [-87.6251914, 41.8831227], [-87.6251166, 41.883123], [-87.6250744, 41.8831231], [-87.6249196, 41.8831237], [-87.6246922, 41.8831245], [-87.6246919, 41.8830972], [-87.6246898, 41.8828903], [-87.6246895, 41.8828674], [-87.6246898, 41.8828566]] }, "parts": [{ "way": 126982630, "version": 8, "coordinates": [[-87.6246899, 41.8828465], [-87.6250574, 41.8828445], [-87.6250579, 41.8828698], [-87.6252905, 41.8828713], [-87.625293, 41.8831223], [-87.6251914, 41.8831227], [-87.6251166, 41.883123], [-87.6250744, 41.8831231], [-87.6249196, 41.8831237], [-87.6246922, 41.8831245], [-87.6246919, 41.8830972], [-87.6246898, 41.8828903], [-87.6246895, 41.8828674], [-87.6246898, 41.8828566]], "bottom": 0, "top": 83.3 }] },

package/site/models/swissotel-geographic.js

@@ -6,7 +6,7 @@ import { chainSkin, chainsOf, orient, paintedSlab, planOf, turnsAt } from "./fac
 // the photograph's camera it stands behind Three Illinois Center and The Buckingham, and fills
 // the seam where their corners meet.
 //
-// A triangular tower of reflective glass: a flush grid of thin mullions about 1.5 m apart and
+// A triangular tower of reflective glass and opaque bands: thin mullions about 1.5 m apart and
 // paired opaque spandrel / vision panels at each floor, under a flat roof at the published 139.3 m. The
 // floors divide that height by OpenStreetMap's 45 levels. See docs/swissotel-reference.md.
 // Units are meters; +x is east, +z is south.