Merge current main and address PR #1152 review

Preserve published contracts and incorporate the reviewed source/i18n corrections.
This commit is contained in:
Adrian Sbardella committed 2026-10-16 19:15:48 -03:00
commit 05ed08f50e
16 files changed
+655 -10

No files matched your search

@@ -0,0 +1,3 @@
- Military aircraft keep their last heading and speed when an adsb.lol row omits
`track` or `gs`, instead of turning north and stopping; a grounded row without
a speed still reads 0 (Aditya, @Rohilalala, #1096).
+2
View File
@@ -0,0 +1,2 @@
- Add Acaray and Yacyretá dam geometries from OpenStreetMap to the existing Dams layer, with source provenance and a corrected OpenStreetMap source label.
(radianx, #1152).
+7
View File
@@ -0,0 +1,7 @@
- Changelog entries are now one file per pull request. A change adds
`changelog.d/<pull request>-<slug>.md` instead of editing the top of
`CHANGELOG.md`, which two pull requests in flight could not share — it was the
most frequent merge conflict in the open queue, and for six of them the only
one. `npm run changelog` splices the directory into `CHANGELOG.md` at release
time and empties it; `npm run changelog:check` reports the batch and changes
nothing. Fragment text is copied through unchanged (daikaginza, #787).
+52
View File
@@ -0,0 +1,52 @@
# Changelog fragments
One file per entry. A pull request adds a file here instead of editing
`CHANGELOG.md`, and a release concatenates them into it.
```
changelog.d/<pull request number>-<slug>.md
```
`723-atc-decision-layer.md`, for example. The slug is lowercase, words separated
by `-`. Two pull requests never pick the same filename, because the pull request
number is already unique — which is the point: new `CHANGELOG.md` entries go at
the top of the file, so two pull requests in flight write into the same few lines
and git has nothing to merge on.
Write the file exactly as the entry should read in `CHANGELOG.md`: a `-` bullet,
wrapped the way the surrounding entries are, crediting yourself and the pull
request.
```markdown
- Report which upstream declined a Street Traffic road load. The layer row now
reads `Overpass rate-limited` instead of a general "Road data temporarily
unavailable" (yourname, #665).
```
The text is spliced in unchanged apart from trailing whitespace, so what you
write here is what ships. Fragments are deliberately outside
`scripts/format-scope.json`, so `npm run format` never reflows one.
At release time:
```
npm run changelog:check # list what would move, change nothing
npm run changelog # move every fragment into CHANGELOG.md
```
The assembler refuses a batch rather than guessing: a filename that is not
`<pull request>-<slug>.md`, or two fragments claiming one pull request number,
stops the run before anything is written and names the files.
If `npm run changelog` fails part-way (a full disk, a killed process), run it
again. The batch is staged in `changelog.d/.assembling/` and only lands when the
assembled file replaces `CHANGELOG.md` in a single rename, so the rerun either
finishes that batch or puts its fragments back first. It never adds an entry
twice or drops one. `npm run changelog:check` names a staged batch, if one is
left over, instead of reporting past it.
A documentation claim that needs a regression test — the way
`src/annotations/drawTool.test.mjs` asserts against `CHANGELOG.md` — should
assert against `docs/CURRENT-STATE.md` or `README.md` instead. A pull request
still edits those directly, so the text is in the file while the change is under
review; a fragment does not reach `CHANGELOG.md` until release.