Skip to content

A lot of layout improvements - #3

Merged
brunopacheco1 merged 26 commits into
mainfrom
feat/map-layout
Nov 19, 2026
Merged

brunopacheco1 merged 26 commits into
mainfrom
feat/map-layout

Conversation

@viklund

@viklund viklund commented Nov 19, 2026

Copy link
Copy Markdown
Contributor

🚀 Pull Request Checklist

  • Title:
    Layout imrpovements to make it easier to read.

  • Description:

    • [ ] Provide a clear and concise description of your pull request, including the purpose of the changes and the approach you've taken.
  • Context:

    • [ ] Why are these changes necessary? What problem do they solve? Link any related issues.
  • Changes:

    • [ ] List the major changes you've made, ideally organized by commit or feature.
  • Testing:

    • [ ] Describe how the changes have been tested. Include any relevant details about the testing environment and the test cases.
  • Screenshots (if applicable):

    • [ ] If your changes are visual, include screenshots to help explain your changes.
  • Additional Information:

    • [ ] Add any other information that might be useful for reviewers, such as considerations, discussions, or dependencies.
  • Checklist:

    • [ ] I have checked that my code adheres to the project's style guidelines and that my code is well-commented.
    • [ ] I have performed self-review of my own code and corrected any misspellings.
    • [ ] I have made corresponding changes to the documentation (if applicable).
    • [ ] My changes generate no new warnings or errors.
    • [ ] I have added tests that prove my fix is effective or that my feature works.
    • [ ] New and existing unit tests pass locally with my changes.

viklund and others added 26 commits October 22, 2026 10:44
The Reporting and improvement line (#bf360c) was close in hue and
lightness to the Operations red (#c62828) and hard to tell apart. Use
#e06000, which still has 3.6:1 contrast against white.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
The station rows already split the map into two halves, but nothing on
the page showed it. Add them as zones in map.json and draw them as
shaded bands with their name in a configurable corner. Name the half in
the legend, in each station's spoken name and in its frame subtitle,
labelled as a study aid. check.js verifies that each station sits in
its band, that bands do not overlap, and that line colours keep 3:1
contrast against each fill.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Count, for every pair of routes, the points where they cross, the
stretches where they lie on top of each other and the parallel
stretches at most one grid unit apart. check.js prints the totals per
edition and lists each one with grid coordinates under --layout. The
metrics are informational and never fail the run.

Also list the halves check in the check CLI contract.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Draw CRM-SPM and SLM-SUPPM over the top of the Agreements row instead
of under it, move the outer SPM-SUPPM loop up a row and let it drop
into SUPPM from above (SUPPM's label moves east), and route CONFM-RDM
below the Control row. The space between the rows no longer has blue
or purple lines weaving through the transfers.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
The Assurance line from SLM to ISM went down-left past SLM and doubled
back, sharing its first cell with two transfers. It now leaves SLM
down-right towards ISM.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
CHM's eight transfers now leave it as two shared trunks: one north to a
junction that fans out to CAPM, PM, SACM, ISM, CRM and CSI, one west
along row 21 to ISRM and SPM.

yieldingPath treats a bend where a route joins or leaves a stretch it
shares with another route as a junction rather than a crossing, and on
a shared stretch it does not yield to a crossing that an earlier route
on the same stretch already made yield, so trunks stay unbroken.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
A branch leaving a trunk at a sharp 45 degree corner looked like half a
crossing. Bends are now drawn as curves (radius 36 px, smaller where
the segments are short), so a branch peels off the trunk smoothly. The
hit area, halo and flow markers follow the same curves.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Where a crossing sat close to a bend, the curve used up the room its
gap needed, the gap was dropped and the route was drawn over the other
line (CHM-CRM over the Reporting line). yieldingPath now finds the
crossings first and shrinks each curve, down to a sharp corner, so the
gap always fits.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Put CRM at (12,4) and SLM at (20,4), directly above CAPM, and re-route
their connections: the Agreements row becomes three straight links and
one arc, the Assurance line leaves SLM as a short trunk to CAPM, ISM
and SACM (SACM's label moves north), and the transfers from SLM and
CRM join trunks along row 6 and CHM's north trunk.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
SRM-CSI went up to row 8 and crossed all three branches of the green
fork out of SLM. It now leaves SRM southwards, runs east along row 13
below SACM, CAPM and ISM, and enters CSI from the west.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
ISRM-SPM and ISRM-SLM leave ISRM northwards together and fork at
(8,8): SPM along the diagonal, SLM up into the row-6 trunk. ISRM-CHM,
CONFM-ISRM and ISRM-RDM leave southwards together to (8,18), where CHM
carries on south, CONFM takes the diagonal and RDM turns east along
row 19.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
The trunk from SLM and CRM to SRM crossed the new ISRM-SPM diagonal one
cell before its bend, leaving a stub that looked like half a crossing.
It now turns down at (7,6), crosses the diagonal on a straight stretch
and enters SRM from above.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Where connections run together along a trunk, a click only reached the
one drawn on top. A pointer click on a connection now looks for every
connection drawn along the same stretch at that point (crossing lines
do not count) and, when there is more than one, opens a new view for
all of them at #A-B,C-D: the frame lists each connection's description
and flows with a link to its own view, and the map highlights and
animates each. A keyboard Enter, which has no position, still selects
the focused connection alone.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
CHM-CSI and CRM-CSI ran along row 15 and dropped into CSI from above,
crossing the Reporting line's last diagonal. They now run along row 17,
below the Reporting line, and enter CSI from the south-west: CHM-CSI
turns east right after the junction above CHM, and CRM-CSI comes down
CHM's north trunk (which crosses the Reporting line there anyway) and
joins it. CSI's label moves east.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Draw the grid that stations and route bends sit on, under the lines and
stations, with every fifth line stronger and row and column numbers in
the margins. It is off unless SHOW_GRID in src/map.js is set to true or
the address has ?grid.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
At the map's usual size the half-pixel lines all but disappeared; the
lines are now darker and 1 px (every fifth 1.5 px).

Co-Authored-By: Claude Opus 5.5 <[email protected]>
CONFM-ISRM and CONFM-PM now leave CONFM together straight up to
(12,20). CONFM-ISRM turns up-left there and merges into the ISRM-RDM
line along row 19; CONFM-PM carries on diagonally across row 19 into
PM.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
CONFM-PM now carries straight on up from the fork to (12,18), crossing
the row-19 line on a straight stretch away from where CONFM-ISRM merges
in, then turns along row 18 and diagonally into PM.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Where two connections cross, the one drawn later breaks. Transfers were
always drawn in interfaces.json order. An optional drawFirst list in
map.json now names transfers to draw before the others, so the others
break where they cross them; check.js verifies the ids. Use it to keep
the stem north of CONFM unbroken where it crosses the row-21 trunk and
the row-19 line.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
The layout line now gives the distinct crossing points on the map next
to the per-pair crossing count (a trunk crossing a line is one point),
and splits shared segments into transfer merges, stretches within one
line, and mixed overlaps such as a transfer over a coloured line. With
--layout each shared segment shows its kind.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
CAPM-SRM ran along row 12 all the way to SRM, one row above the
Reporting line, and crossed ISRM's north trunk on its own. It now
leaves row 12 at (12,12), passes under SACM and joins the SACM-SRM line
on row 10 at (10,10), sharing it into SRM.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
The row-19 line crossed CHM's north trunk one cell below the junction,
so the crossing and the fork ran together. The trunk now forks at
(20,17): PM and SACM leave up-left at (19,16), ISM and CSI leave east
along row 17, and the crossing sits two cells below the fork.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
CHM-ISM reached row 17 one cell from the junction, where CRM-CSI
crossed it on its way into row 17. It now leaves ISM diagonally, runs
down column 26 and curves into row 17 at (25,17), sharing it with the
CSI line back to the junction, so CRM-CSI joins row 17 without a
crossing.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
On row 13 the Reporting line ran one row below CAPM-SRM and hid the
boundary between the two halves. It now leaves SRM straight down to
(4,12) and runs along row 14 to CSI, two rows clear of CAPM-SRM, and
the halves meet in a visible line again.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
The arc below the Control row left CONFM and entered RDM diagonally
through their labels. CONFM's label moves west and RDM's east, where no
line runs; the arc keeps its diagonal shoulders like the arcs above the
Agreements row.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Record this session's decisions as clarifications and update the
requirements that contradicted the map: transfers and same-line
connections may now share a stretch (FR-003), a click on a shared
stretch selects every connection there (FR-005, User Story 2), and new
requirements cover the halves (FR-036), the layout metrics (FR-037)
and the grid overlay (FR-038). The data model documents zones and
drawFirst, research R3 and R10 describe curves, junctions and the
multi-selection, the plan lists scripts/layout.js, the quickstart gets
a shared-stretch scenario, and the CHANGELOG summarises the layout.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

@brunopacheco1 brunopacheco1 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the contributions.

@brunopacheco1
brunopacheco1 merged commit bf1705f into main Nov 19, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants