Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Prefare polish -- "via" diagram labels need abbreviating #1968

Merged
merged 10 commits into from
Feb 1, 2024
Merged

fix: Prefare polish -- "via" diagram labels need abbreviating #1968

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d4d52b6
Reverse-engineer the scaling we do for simulations to make diagrams s…
hannahpurcell Jan 17, 2024
c386f5a
Added useEffect cleanup
hannahpurcell Jan 17, 2024
49bb57c
add the settimeout back in
hannahpurcell Jan 17, 2024
54446b9
Added a sort of useEffect cleanup
hannahpurcell Jan 18, 2024
b6e4a77
Add new resizeObserver to fix some race conditions
hannahpurcell Jan 19, 2024
b497837
remove old commented code
hannahpurcell Jan 22, 2024
2e228fc
Fix divider and flex pages in Screenplay simulation
hannahpurcell Jan 23, 2024
84295c1
The "via" messages also need frontend abbreviating
hannahpurcell Jan 24, 2024
25cf81d
Merge branch 'prefare-alerts' into hp/prefare-polish-via-abbreviation
hannahpurcell Feb 1, 2024
cfbea84
Whoops, undo a reverted line
hannahpurcell Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions assets/src/components/v2/disruption_diagram/disruption_diagram.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ const abbreviationList: {[string: string]: string} = {
"Government Center": "Gov't Center",
"Hynes Convention Center": "Hynes",
"Massachusetts Avenue": "Mass Ave",
"Tufts Medical Center": "Tufts Medical Ctr"
"Tufts Medical Center": "Tufts Medical Ctr",
"…via Government Center": "…via Gov't Center",
"…via Downtown Crossing": "…via Downtown Xng"
}

type DisruptionDiagramData =
Expand Down Expand Up @@ -709,8 +711,10 @@ const DisruptionDiagram: ComponentType<DisruptionDiagramData> = (props) => {
// First, scale x. Then, check if it needs abbreviating. Then scale y, given the abbreviation
const xScaleFactor = fullWidth / unscaledWidth;

const needsAbbreviating = !doAbbreviate &&
unscaledHeight * xScaleFactor + getEmphasisHeight(xScaleFactor) * simulationTransform > diagramContainerHeight;
// If xScaleFactor is less than 1, let's try abbreviating.
// Or, if the x scaling constrains the height, abbreviate
const needsAbbreviating = !doAbbreviate && (xScaleFactor < 1 ||
unscaledHeight * xScaleFactor + getEmphasisHeight(xScaleFactor) * simulationTransform > diagramContainerHeight);
if (needsAbbreviating) {
setDoAbbreviate(true);
// now scale y, which requires re-running this effect
Expand Down
Loading