Skip to content

Emissions lineplots #660

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

Draft
cjyetman wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Emissions lineplots #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
979fa7c
fix from #659
cjyetman Dec 4, 2025
5ce4228
display emissions data in line charts
cjyetman Dec 4, 2025
90a9e38
Merge branch 'main' into emissions-lineplots
cjyetman Dec 4, 2025
3c73739
Merge branch 'main' into emissions-lineplots
cjyetman Dec 6, 2025
afb5442
Merge branch 'main' into emissions-lineplots
cjyetman Dec 8, 2025
2303020
Merge branch 'main' into emissions-lineplots
cjyetman Dec 19, 2025
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
13 changes: 9 additions & 4 deletions src/components/MultiLineChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,15 @@ export default function MultiLineChart({
sector = "power",
metric = "capacity",
}: MultiLineChartProps) {
const d3data = useMemo(
() => data.data.filter((d) => d.sector === sector && d.metric === metric),
[data.data, sector, metric],
);
const d3data = useMemo(() => {
let filtered = data.data.filter(
(d) => d.sector === sector && d.metric === metric,
);
if (metric == "emissionsIntensity" || metric == "absoluteEmissions") {
filtered = filtered.map((d) => ({ ...d, technology: d.metric }));
}
return filtered;
}, [data.data, sector, metric]);

const ref = useRef<SVGSVGElement>(null);
const gx = useRef<SVGGElement>(null);
Expand Down
5 changes: 2 additions & 3 deletions src/components/PlotSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, { useCallback, useEffect, useState, useMemo } from "react";
import NormalizedStackedAreaChart from "./NormalizedStackedAreaChart";
import MultiLineChart from "./MultiLineChart";
import VerticalBarChart from "./VerticalBarChart";
import { geographyLabel } from "../utils/geographyUtils";

interface DataPoint {
Expand Down Expand Up @@ -155,7 +154,7 @@ export const PlotSelector: React.FC<PlotSelectorProps> = ({
case "absoluteEmissions":
return (
<div className="flex flex-col items-center">
<VerticalBarChart
<MultiLineChart
key={`${datasetId}-${selectedPlot}-${selectedGeography}`}
data={filteredData}
width={450}
Expand All @@ -167,7 +166,7 @@ export const PlotSelector: React.FC<PlotSelectorProps> = ({
case "emissionsIntensity":
return (
<div className="flex flex-col items-center">
<VerticalBarChart
<MultiLineChart
key={`${datasetId}-${selectedPlot}-${selectedGeography}`}
data={filteredData}
width={450}
Expand Down