Conflicts: the locale catalogs and package boundaries are three-way merges
(no message changed differently on both sides); zh-Hant is regenerated
from zh-CN. bhoteKoshiEmbeddedMedia.js keeps main's card counter and the
branch's shared YouTube loader (youtubeApi.js), so the media file builds
one script element fewer. The Cockpit briefing's LIVE tab and the orbital
NADIR/RESET button are main's UiButton.
The centred Display/Radio row now applies only inside the phone shell
(720 px and below) on flight and bridge views; satellite and provider
cockpits, narrow short windows (under 390x450) and very short windows
(under 240 px) keep main's right-anchored place, so the row no longer
lands on the desktop rail, orbital zoom, LOOK AHEAD, Reset or the Stories
button. The row sizes to its launchers instead of spanning the width.
The first-visit Stories announcement stays hidden and unread while
Cockpit is open: a Stories tap that Cockpit refuses no longer marks it
seen, so it shows again after Exit.
The unit tests and the Cockpit QA cover the phone boundary, glyph and
side taps, the destination cue, short and narrow windows and the
announcement's return.
The separate layer test built a fake viewer with the old Cesium interface,
which fails on current main. Move it into src/data/infrastructure.test.mjs on
the fake ground renderer and input port, with one table and one parse of
dams.geojsonl for both checks. Compare source_url exactly and check
retrieved_at, and cover the dams attribution and both new records in the
find_infrastructure tests.
Also trim the dataset README section (keep both dams as polygons), drop the
outdated "does not refresh or relicense" sentence, keep provenance out of the
License cell, rename the changelog fragment after the change, and restore the
accent in the test name.
- The Cockpit's orbital view counts a site's own label as its own, not
another layer's card, so clicking it focuses the site again; the test
now sets the overlay hit test the way the world overlay does.
- The ISS Sun position under the station is "Underneath", with its own
translations; "Below" stays the ground under a satellite.
- OpenCC turns 问天后侧 into 問天后側 ("empress"); a correction makes it 後.
- The changelog says a label takes the click from a vehicle drawn under it.