-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1693 from weather-gov/mgwalker/1632-hourly-viz
Hourly temperature visualization
- Loading branch information
Showing
8 changed files
with
196 additions
and
3 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
133 changes: 133 additions & 0 deletions
133
web/themes/new_weather_theme/assets/js/charts/hourly-temperature.js
This file contains 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,133 @@ | ||
| /* global Chart ChartDataLabels */ | ||
| (() => { | ||
| const styles = getComputedStyle(document.body); | ||
|
|
||
| const fontMono = styles.getPropertyValue("--font-family-mono"); | ||
| const colors = { | ||
| base: styles.getPropertyValue("--color-base"), | ||
| baseLighter: styles.getPropertyValue("--color-base-lighter"), | ||
| baseLightest: styles.getPropertyValue("--color-base-lightest"), | ||
| primary: styles.getPropertyValue("--color-primary"), | ||
| primaryDark: styles.getPropertyValue("--color-primary-dark"), | ||
| primaryLight: styles.getPropertyValue("--color-primary-light"), | ||
| }; | ||
|
|
||
| Chart.register(ChartDataLabels); | ||
|
|
||
| // These are applied globally to all charts. Unclear if that's okay, or if | ||
| // what we really want is to set them per-chart, but this is what I've got | ||
| // for now. | ||
| Chart.defaults.font = { | ||
| family: fontMono, | ||
| size: 12, | ||
| }; | ||
|
|
||
| const chartContainers = Array.from( | ||
| document.querySelectorAll(".wx-hourly-temp-chart-container"), | ||
| ); | ||
|
|
||
| for (const container of chartContainers) { | ||
| const times = JSON.parse(container.dataset.times); | ||
| const temps = JSON.parse(container.dataset.temps).map((v) => | ||
| Number.parseInt(v, 10), | ||
| ); | ||
| const feelsLike = JSON.parse(container.dataset.feelsLike).map((v) => | ||
| Number.parseInt(v, 10), | ||
| ); | ||
|
|
||
| // We don't need to keep a reference to the chart object. We only need the | ||
| // side-effects of creating it. This is not ideal, but it's how Chart.js | ||
| // works, so it's what we've got. | ||
| // eslint-disable-next-line no-new | ||
| new Chart(container.querySelector("canvas"), { | ||
| type: "line", | ||
| plugins: [ChartDataLabels], | ||
|
|
||
| options: { | ||
| animation: false, | ||
| responsive: true, | ||
| maintainAspectRatio: false, | ||
| interaction: { | ||
| intersect: false, | ||
| mode: "index", | ||
| }, | ||
| plugins: { | ||
| legend: { | ||
| display: false, | ||
| }, | ||
| }, | ||
| scales: { | ||
| x: { | ||
| ticks: { | ||
| autoSkip: true, | ||
| maxRotation: 0, | ||
| color: colors.base, | ||
| }, | ||
| grid: { | ||
| color: times.map((v) => { | ||
| if (v === "12 AM") { | ||
| return "black"; | ||
| } | ||
|
|
||
| const even = Number.parseInt(v, 10) % 2 === 0; | ||
| if (even) { | ||
| return colors.baseLighter; | ||
| } | ||
| return colors.baseLightest; | ||
| }), | ||
| }, | ||
| }, | ||
| y: { | ||
| min: Math.min( | ||
| Math.round(Math.min(...temps) / 10) * 10 - 10, | ||
| Math.round(Math.min(...feelsLike) / 10) * 10 - 10, | ||
| ), | ||
| max: Math.max( | ||
| Math.round(Math.max(...temps) / 10) * 10 + 10, | ||
| Math.round(Math.max(...feelsLike) / 10) * 10 + 10, | ||
| ), | ||
| ticks: { | ||
| autoSkip: true, | ||
| color: colors.base, | ||
| maxTicksLimit: 6, | ||
| callback: (v) => `${v}°`, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
|
|
||
| data: { | ||
| labels: times, | ||
| datasets: [ | ||
| { | ||
| label: "Temperature", | ||
| data: temps, | ||
| datalabels: { | ||
| align: ({ dataIndex }) => | ||
| temps[dataIndex] >= feelsLike[dataIndex] ? "top" : "bottom", | ||
| color: colors.primaryDark, | ||
| }, | ||
| backgroundColor: colors.primaryDark, | ||
| borderColor: colors.primaryDark, | ||
| borderWidth: 1.5, | ||
| }, | ||
| { | ||
| label: "Feels like", | ||
| data: feelsLike, | ||
| datalabels: { | ||
| align: ({ dataIndex }) => | ||
| temps[dataIndex] >= feelsLike[dataIndex] ? "bottom" : "top", | ||
| color: colors.primary, | ||
| display: ({ dataIndex }) => | ||
| temps[dataIndex] !== feelsLike[dataIndex], | ||
| }, | ||
| borderDash: [4], | ||
| backgroundColor: colors.primaryLight, | ||
| borderColor: colors.primaryLight, | ||
| borderWidth: 1.5, | ||
| }, | ||
| ], | ||
| }, | ||
| }); | ||
| } | ||
| })(); |
11 changes: 11 additions & 0 deletions
11
web/themes/new_weather_theme/assets/sass/components/variables.scss
This file contains 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,11 @@ | ||
| @use "uswds-core" as *; | ||
|
|
||
| body { | ||
| --color-base: #{color("base")}; | ||
| --color-base-lighter: #{color("base-lighter")}; | ||
| --color-base-lightest: #{color("base-lightest")}; | ||
| --color-primary: #{color("primary")}; | ||
| --color-primary-dark: #{color("primary-dark")}; | ||
| --color-primary-light: #{color("primary-light")}; | ||
| --font-family-mono: #{font-family("mono")}; | ||
| } |
This file contains 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 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 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
26 changes: 26 additions & 0 deletions
26
web/themes/new_weather_theme/templates/partials/hourly-table.html.twig
This file contains 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