Repository navigation
feat(plots): show benchmark plots up to 2050 only #1021
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| import { describe, it, expect } from "vitest"; | ||
| import { | ||
| MAX_PLOT_YEAR, | ||
| capToPlotYears, | ||
| extendsPastPlotYears, | ||
| } from "./plotYears"; | ||
|
|
||
| const rows = (...years: (string | number)[]) => ({ | ||
| data: years.map((year) => ({ year, value: 1 })), | ||
| }); | ||
|
|
||
| describe("capToPlotYears", () => { | ||
| it("keeps 2050 and drops every later year", () => { | ||
| expect(MAX_PLOT_YEAR).toBe(2050); | ||
| const capped = capToPlotYears(rows(2040, 2050, 2051, 2100)); | ||
| expect(capped?.data.map((d) => d.year)).toEqual([2040, 2050]); | ||
| }); | ||
|
|
||
| it("reads string years as numbers", () => { | ||
| const capped = capToPlotYears(rows("2030", "2050", "2060")); | ||
| expect(capped?.data.map((d) => d.year)).toEqual(["2030", "2050"]); | ||
| }); | ||
|
|
||
| it("keeps the other fields of the timeseries", () => { | ||
| const capped = capToPlotYears({ ...rows(2060), datasetId: "x" }); | ||
| expect(capped).toEqual({ data: [], datasetId: "x" }); | ||
| }); | ||
|
|
||
| it("passes null through", () => { | ||
| expect(capToPlotYears(null)).toBeNull(); | ||
| }); | ||
| }); | ||
|
|
||
| describe("extendsPastPlotYears", () => { | ||
| it("is true only when some row is after 2050", () => { | ||
| expect(extendsPastPlotYears(rows(2020, 2050))).toBe(false); | ||
| expect(extendsPastPlotYears(rows(2020, "2055"))).toBe(true); | ||
| expect(extendsPastPlotYears(null)).toBe(false); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /** | ||
| * The last year the benchmark plots show (#1010). Pathways end anywhere from | ||
| * 2030 to 2100, and plots with wildly different x-axes are hard to compare, | ||
| * so every plot stops here. Downloads still carry the full data. | ||
| */ | ||
| export const MAX_PLOT_YEAR = 2050; | ||
|
|
||
| interface YearRow { | ||
| year: string | number; | ||
| } | ||
|
|
||
| /** | ||
| * The timeseries without its rows after {@link MAX_PLOT_YEAR}. Apply it where | ||
| * rows enter the plots, before anything is derived from them, so the shared | ||
| * y-axis, which panels show and the segment badges all agree with what is | ||
| * drawn. | ||
| * | ||
| * `Number()` because the type says string but the JSON carries numbers. | ||
| */ | ||
| export function capToPlotYears<T extends { data: readonly YearRow[] }>( | ||
| timeseries: T | null, | ||
| ): T | null { | ||
| if (!timeseries?.data) return timeseries; | ||
| return { | ||
| ...timeseries, | ||
| data: timeseries.data.filter((d) => Number(d.year) <= MAX_PLOT_YEAR), | ||
| }; | ||
| } | ||
|
|
||
| /** Whether a timeseries has rows the plots leave out. */ | ||
| export function extendsPastPlotYears( | ||
| timeseries: { data: readonly YearRow[] } | null, | ||
| ): boolean { | ||
| return timeseries?.data?.some((d) => Number(d.year) > MAX_PLOT_YEAR) ?? false; | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.