From f7ffca53bb50ea394be83f2b624f63a621687f24 Mon Sep 17 00:00:00 2001 From: William Felker Date: Thu, 4 Aug 2022 22:27:28 +0000 Subject: [PATCH 1/3] Data cleaning --- data/ch4.js | 269 +++++++++++++++++++++++++++++++++++++++++++++++++++- data/n2o.js | 181 ++++------------------------------- data/sf6.js | 185 +++++------------------------------- 3 files changed, 313 insertions(+), 322 deletions(-) diff --git a/data/ch4.js b/data/ch4.js index 8d44822..e7ef234 100644 --- a/data/ch4.js +++ b/data/ch4.js @@ -6,7 +6,274 @@ export const ch4Source = [ api: "https://hge.earth/api/co2/", }, ]; - +export const ch4Yearly = [ + { + id: "1984", + year: "1984", + measurement: "1644.68", + unc: "0.67", + unit: "ppt", + }, + { + id: "1985", + year: "1985", + measurement: "1657.28", + unc: "0.51", + unit: "ppt", + }, + { + id: "1986", + year: "1986", + measurement: "1670.08", + unc: "0.79", + unit: "ppt", + }, + { + id: "1987", + year: "1987", + measurement: "1682.71", + unc: "0.51", + unit: "ppt", + }, + { + id: "1988", + year: "1988", + measurement: "1693.19", + unc: "0.55", + unit: "ppt", + }, + { + id: "1989", + year: "1989", + measurement: "1704.54", + unc: "0.52", + unit: "ppt", + }, + { + id: "1990", + year: "1990", + measurement: "1714.42", + unc: "0.68", + unit: "ppt", + }, + { + id: "1991", + year: "1991", + measurement: "1724.84", + unc: "0.65", + unit: "ppt", + }, + { + id: "1992", + year: "1992", + measurement: "1735.51", + unc: "0.61", + unit: "ppt", + }, + { + id: "1993", + year: "1993", + measurement: "1736.49", + unc: "0.47", + unit: "ppt", + }, + { + id: "1994", + year: "1994", + measurement: "1742.06", + unc: "0.62", + unit: "ppt", + }, + { + id: "1995", + year: "1995", + measurement: "1748.80", + unc: "0.54", + unit: "ppt", + }, + { + id: "1996", + year: "1996", + measurement: "1751.46", + unc: "0.64", + unit: "ppt", + }, + { + id: "1997", + year: "1997", + measurement: "1754.54", + unc: "0.42", + unit: "ppt", + }, + { + id: "1998", + year: "1998", + measurement: "1765.54", + unc: "0.67", + unit: "ppt", + }, + { + id: "1999", + year: "1999", + measurement: "1772.39", + unc: "0.58", + unit: "ppt", + }, + { + id: "2000", + year: "2000", + measurement: "1773.37", + unc: "0.77", + unit: "ppt", + }, + { + id: "2001", + year: "2001", + measurement: "1771.24", + unc: "0.55", + unit: "ppt", + }, + { + id: "2002", + year: "2002", + measurement: "1772.69", + unc: "0.52", + unit: "ppt", + }, + { + id: "2003", + year: "2003", + measurement: "1777.31", + unc: "0.53", + unit: "ppt", + }, + { + id: "2004", + year: "2004", + measurement: "1777.03", + unc: "0.54", + unit: "ppt", + }, + { + id: "2005", + year: "2005", + measurement: "1774.14", + unc: "0.58", + unit: "ppt", + }, + { + id: "2006", + year: "2006", + measurement: "1774.93", + unc: "0.55", + unit: "ppt", + }, + { + id: "2007", + year: "2007", + measurement: "1781.39", + unc: "0.59", + unit: "ppt", + }, + { + id: "2008", + year: "2008", + measurement: "1787.00", + unc: "0.57", + unit: "ppt", + }, + { + id: "2009", + year: "2009", + measurement: "1793.54", + unc: "0.69", + unit: "ppt", + }, + { + id: "2010", + year: "2010", + measurement: "1798.89", + unc: "0.66", + unit: "ppt", + }, + { + id: "2011", + year: "2011", + measurement: "1803.11", + unc: "0.66", + unit: "ppt", + }, + { + id: "2012", + year: "2012", + measurement: "1808.03", + unc: "0.58", + unit: "ppt", + }, + { + id: "2013", + year: "2013", + measurement: "1813.40", + unc: "0.68", + unit: "ppt", + }, + { + id: "2014", + year: "2014", + measurement: "1822.61", + unc: "0.46", + unit: "ppt", + }, + { + id: "2015", + year: "2015", + measurement: "1834.25", + unc: "0.52", + unit: "ppt", + }, + { + id: "2016", + year: "2016", + measurement: "1843.12", + unc: "0.61", + unit: "ppt", + }, + { + id: "2017", + year: "2017", + measurement: "1849.67", + unc: "0.69", + unit: "ppt", + }, + { + id: "2018", + year: "2018", + measurement: "1857.31", + unc: "0.81", + unit: "ppt", + }, + { + id: "2019", + year: "2019", + measurement: "1866.59", + unc: "0.56", + unit: "ppt", + }, + { + id: "2020", + year: "2020", + measurement: "1878.95", + unc: "0.63", + unit: "ppt", + }, + { + id: "2021", + year: "2021", + measurement: "1895.50", + unc: "0.63", + unit: "ppt", + }, +]; export const ch4Monthly = [ { id: "198307", diff --git a/data/n2o.js b/data/n2o.js index acba745..11bd8ae 100644 --- a/data/n2o.js +++ b/data/n2o.js @@ -7,166 +7,27 @@ export const n2oSource = [ }, ]; export const n2oYearly = [ - { - id: "2001", - - year: "2001", - measurement: "0.71", - unc: "0.11", - unit: "ppb", - }, - { - id: "2002", - - year: "2002", - measurement: "0.50", - unc: "0.14", - unit: "ppb", - }, - { - id: "2003", - - year: "2003", - measurement: "0.81", - unc: "0.13", - unit: "ppb", - }, - { - id: "2004", - - year: "2004", - measurement: "0.53", - unc: "0.15", - unit: "ppb", - }, - { - id: "2005", - - year: "2005", - measurement: "0.87", - unc: "0.13", - unit: "ppb", - }, - { - id: "2006", - - year: "2006", - measurement: "0.69", - unc: "0.16", - unit: "ppb", - }, - { - id: "2007", - - year: "2007", - measurement: "0.90", - unc: "0.13", - unit: "ppb", - }, - { - id: "2008", - - year: "2008", - measurement: "0.92", - unc: "0.14", - unit: "ppb", - }, - { - id: "2009", - - year: "2009", - measurement: "0.76", - unc: "0.16", - unit: "ppb", - }, - { - id: "2010", - - year: "2010", - measurement: "1.08", - unc: "0.15", - unit: "ppb", - }, - { - id: "2011", - - year: "2011", - measurement: "0.90", - unc: "0.14", - unit: "ppb", - }, - { - id: "2012", - - year: "2012", - measurement: "0.81", - unc: "0.14", - unit: "ppb", - }, - { - id: "2013", - - year: "2013", - measurement: "1.01", - unc: "0.14", - unit: "ppb", - }, - { - id: "2014", - - year: "2014", - measurement: "1.24", - unc: "0.15", - unit: "ppb", - }, - { - id: "2015", - - year: "2015", - measurement: "0.90", - unc: "0.14", - unit: "ppb", - }, - { - id: "2016", - - year: "2016", - measurement: "0.66", - unc: "0.14", - unit: "ppb", - }, - { - id: "2017", - - year: "2017", - measurement: "1.02", - unc: "0.15", - unit: "ppb", - }, - { - id: "2018", - - year: "2018", - measurement: "1.16", - unc: "0.16", - unit: "ppb", - }, - { - id: "2019", - - year: "2019", - measurement: "0.91", - unc: "0.15", - unit: "ppb", - }, - { - id: "2020", - - year: "2020", - measurement: "1.36", - unc: "0.13", - unit: "ppb", - }, + { id: "2001", year: "2001", measurement: "316.36", unc: "0.14", unit: "ppb" }, + { id: "2002", year: "2002", measurement: "316.94", unc: "0.13", unit: "ppb" }, + { id: "2003", year: "2003", measurement: "317.62", unc: "0.13", unit: "ppb" }, + { id: "2004", year: "2004", measurement: "318.26", unc: "0.12", unit: "ppb" }, + { id: "2005", year: "2005", measurement: "318.91", unc: "0.13", unit: "ppb" }, + { id: "2006", year: "2006", measurement: "319.82", unc: "0.11", unit: "ppb" }, + { id: "2007", year: "2007", measurement: "320.44", unc: "0.14", unit: "ppb" }, + { id: "2008", year: "2008", measurement: "321.50", unc: "0.14", unit: "ppb" }, + { id: "2009", year: "2009", measurement: "322.27", unc: "0.12", unit: "ppb" }, + { id: "2010", year: "2010", measurement: "323.19", unc: "0.12", unit: "ppb" }, + { id: "2011", year: "2011", measurement: "324.21", unc: "0.12", unit: "ppb" }, + { id: "2012", year: "2012", measurement: "325.05", unc: "0.10", unit: "ppb" }, + { id: "2013", year: "2013", measurement: "325.94", unc: "0.11", unit: "ppb" }, + { id: "2014", year: "2014", measurement: "327.09", unc: "0.12", unit: "ppb" }, + { id: "2015", year: "2015", measurement: "328.17", unc: "0.11", unit: "ppb" }, + { id: "2016", year: "2016", measurement: "328.95", unc: "0.12", unit: "ppb" }, + { id: "2017", year: "2017", measurement: "329.74", unc: "0.14", unit: "ppb" }, + { id: "2018", year: "2018", measurement: "330.90", unc: "0.15", unit: "ppb" }, + { id: "2019", year: "2019", measurement: "331.88", unc: "0.13", unit: "ppb" }, + { id: "2020", year: "2020", measurement: "333.03", unc: "0.14", unit: "ppb" }, + { id: "2021", year: "2021", measurement: "334.31", unc: "0.14", unit: "ppb" }, ]; export const n2oMonthly = [ diff --git a/data/sf6.js b/data/sf6.js index 491a44d..d8248bd 100644 --- a/data/sf6.js +++ b/data/sf6.js @@ -7,167 +7,30 @@ export const sf6Source = [ }, ]; export const sf6Yearly = [ - { - id: "1998", - year: "1998", - measurement: "0.20", - unc: "0.004", - unit: "ppt", - }, - { - id: "1999", - year: "1999", - measurement: "0.17", - unc: "0.004", - unit: "ppt", - }, - { - id: "2000", - year: "2000", - measurement: "0.20", - unc: "0.005", - unit: "ppt", - }, - { - id: "2001", - year: "2001", - measurement: "0.19", - unc: "0.004", - unit: "ppt", - }, - { - id: "2002", - year: "2002", - measurement: "0.22", - unc: "0.003", - unit: "ppt", - }, - { - id: "2003", - year: "2003", - measurement: "0.25", - unc: "0.004", - unit: "ppt", - }, - { - id: "2004", - year: "2004", - measurement: "0.21", - unc: "0.003", - unit: "ppt", - }, - { - id: "2005", - year: "2005", - measurement: "0.23", - unc: "0.003", - unit: "ppt", - }, - { - id: "2006", - year: "2006", - measurement: "0.25", - unc: "0.003", - unit: "ppt", - }, - { - id: "2007", - year: "2007", - measurement: "0.28", - unc: "0.003", - unit: "ppt", - }, - { - id: "2008", - year: "2008", - measurement: "0.29", - unc: "0.003", - unit: "ppt", - }, - { - id: "2009", - year: "2009", - measurement: "0.29", - unc: "0.003", - unit: "ppt", - }, - { - id: "2010", - year: "2010", - measurement: "0.27", - unc: "0.004", - unit: "ppt", - }, - { - id: "2011", - year: "2011", - measurement: "0.28", - unc: "0.004", - unit: "ppt", - }, - { - id: "2012", - year: "2012", - measurement: "0.31", - unc: "0.003", - unit: "ppt", - }, - { - id: "2013", - year: "2013", - measurement: "0.32", - unc: "0.004", - unit: "ppt", - }, - { - id: "2014", - year: "2014", - measurement: "0.34", - unc: "0.004", - unit: "ppt", - }, - { - id: "2015", - year: "2015", - measurement: "0.32", - unc: "0.004", - unit: "ppt", - }, - { - id: "2016", - year: "2016", - measurement: "0.34", - unc: "0.004", - unit: "ppt", - }, - { - id: "2017", - year: "2017", - measurement: "0.35", - unc: "0.005", - unit: "ppt", - }, - { - id: "2018", - year: "2018", - measurement: "0.35", - unc: "0.003", - unit: "ppt", - }, - { - id: "2019", - year: "2019", - measurement: "0.33", - unc: "0.003", - unit: "ppt", - }, - { - id: "2020", - year: "2020", - measurement: "0.34", - unc: "0.004", - unit: "ppt", - }, + { id: "1998", year: "1998", measurement: "4.21", unc: "0.004", unit: "ppt" }, + { id: "1999", year: "1999", measurement: "4.38", unc: "0.003", unit: "ppt" }, + { id: "2000", year: "2000", measurement: "4.58", unc: "0.003", unit: "ppt" }, + { id: "2001", year: "2001", measurement: "4.78", unc: "0.004", unit: "ppt" }, + { id: "2002", year: "2002", measurement: "4.98", unc: "0.002", unit: "ppt" }, + { id: "2003", year: "2003", measurement: "5.23", unc: "0.002", unit: "ppt" }, + { id: "2004", year: "2004", measurement: "5.45", unc: "0.002", unit: "ppt" }, + { id: "2005", year: "2005", measurement: "5.67", unc: "0.002", unit: "ppt" }, + { id: "2006", year: "2006", measurement: "5.91", unc: "0.003", unit: "ppt" }, + { id: "2007", year: "2007", measurement: "6.18", unc: "0.003", unit: "ppt" }, + { id: "2008", year: "2008", measurement: "6.46", unc: "0.003", unit: "ppt" }, + { id: "2009", year: "2009", measurement: "6.75", unc: "0.003", unit: "ppt" }, + { id: "2010", year: "2010", measurement: "7.04", unc: "0.004", unit: "ppt" }, + { id: "2011", year: "2011", measurement: "7.30", unc: "0.004", unit: "ppt" }, + { id: "2012", year: "2012", measurement: "7.60", unc: "0.003", unit: "ppt" }, + { id: "2013", year: "2013", measurement: "7.91", unc: "0.004", unit: "ppt" }, + { id: "2014", year: "2014", measurement: "8.25", unc: "0.004", unit: "ppt" }, + { id: "2015", year: "2015", measurement: "8.58", unc: "0.004", unit: "ppt" }, + { id: "2016", year: "2016", measurement: "8.91", unc: "0.004", unit: "ppt" }, + { id: "2017", year: "2017", measurement: "9.26", unc: "0.004", unit: "ppt" }, + { id: "2018", year: "2018", measurement: "9.60", unc: "0.006", unit: "ppt" }, + { id: "2019", year: "2019", measurement: "9.94", unc: "0.005", unit: "ppt" }, + { id: "2020", year: "2020", measurement: "10.27", unc: "0.005", unit: "ppt" }, + { id: "2021", year: "2021", measurement: "10.63", unc: "0.005", unit: "ppt" }, ]; export const sf6Monthly = [ From 32d0b14b55c85495cd41b49684c8ba82b98b07c5 Mon Sep 17 00:00:00 2001 From: William Felker Date: Thu, 4 Aug 2022 22:27:39 +0000 Subject: [PATCH 2/3] style ref bugs --- pages/api/ch4/[id].js | 8 +++-- pages/api/ch4/yearly.js | 5 ++++ pages/api/co2/[id].js | 2 +- pages/ch4/[id].js | 4 +-- pages/ch4/index.js | 6 ++++ pages/ch4/yearly.js | 65 +++++++++++++++++++++++++++++++++++++++++ pages/n2o/yearly.js | 13 ++------- 7 files changed, 87 insertions(+), 16 deletions(-) create mode 100644 pages/api/ch4/yearly.js create mode 100644 pages/ch4/yearly.js diff --git a/pages/api/ch4/[id].js b/pages/api/ch4/[id].js index 35384fb..8c45318 100644 --- a/pages/api/ch4/[id].js +++ b/pages/api/ch4/[id].js @@ -1,11 +1,13 @@ -import { ch4Monthly } from "../../../data/ch4"; +import { ch4Yearly, ch4Monthly } from "../../../data/ch4"; export default function carbonHandler({ query: { id } }, res) { - const filtered = ch4Monthly.filter((c) => c.id === id); + let filtered = ch4Yearly.concat(ch4Monthly); if (filtered.length > 0) { res.status(200).json(filtered[0]); } else { - res.status(404).json({ message: `CH₄ data for: ${id} not found.` }); + res.status(404).json({ message: `Yearly CH₄ data for: ${id} not found.` }); + + // res.status(404).json({ message: id }); } } diff --git a/pages/api/ch4/yearly.js b/pages/api/ch4/yearly.js new file mode 100644 index 0000000..edd0303 --- /dev/null +++ b/pages/api/ch4/yearly.js @@ -0,0 +1,5 @@ +import { ch4Yearly } from "../../../data/ch4"; + +export default function handler(req, res) { + res.status(200).json(ch4Yearly); +} diff --git a/pages/api/co2/[id].js b/pages/api/co2/[id].js index df49aab..ef28677 100644 --- a/pages/api/co2/[id].js +++ b/pages/api/co2/[id].js @@ -6,7 +6,7 @@ export default function carbonHandler({ query: { id } }, res) { if (filtered.length > 0) { res.status(200).json(filtered[0]); } else { - res.status(404).json({ message: `Yearly co2 data for: ${id} not found.` }); + res.status(404).json({ message: `Yearly CO₂ data for: ${id} not found.` }); // res.status(404).json({ message: id }); } diff --git a/pages/ch4/[id].js b/pages/ch4/[id].js index b1e4a97..1ffc157 100644 --- a/pages/ch4/[id].js +++ b/pages/ch4/[id].js @@ -6,7 +6,7 @@ import Layout from "../../components/layout"; import { Button, BreakCrumbButton } from "../../components/button"; import { EmissionsSummary } from "../../components/emissionsPage"; -import co2HeroImage from "../../public/assets/emissions/co2@2x.png"; +import ch4HeroImage from "../../public/assets/emissions/ch4@2x.png"; const fetcher = async (url) => { const res = await fetch(url); @@ -50,7 +50,7 @@ export default function EmissionsCh4() { {/* FIX: @gndclouds Make this a component */}
+
fetch(url).then((res) => res.json()); + +export default function Index() { + const { data, error } = useSWR("/api/ch4/yearly", fetcher); + const { asPath } = useRouter(); + var afterWithout = asPath.substr(1, asPath.lastIndexOf("/")); + const DataRouteURL = afterWithout; + if (error) return
Failed to load
; + if (!data) return LOADING; + + return ( + +
+ +
+
+
+
+
+
+ + +
+ +
+
+
+
+
+
+
+ +
+ + ); +} diff --git a/pages/n2o/yearly.js b/pages/n2o/yearly.js index 0e799c8..4bfdb20 100644 --- a/pages/n2o/yearly.js +++ b/pages/n2o/yearly.js @@ -26,7 +26,7 @@ export default function Index() { description="Nitrous oxide, commonly known as laughing gas, nitrous, or nos, is a chemical compound, an oxide of nitrogen with the formula N ₂O. At room temperature, it is a colourless non-flammable gas, and has a slightly sweet scent and taste. At elevated temperatures, nitrous oxide is a powerful oxidiser similar to molecular oxygen ~ Wikipedia" type="Emissions Data" image={n2oHeroImage} - color="DF775E" + color="bg-[#DF775E]" />
@@ -42,21 +42,14 @@ export default function Index() { />
- - Data set being update please check{" "} - - ticket - {" "} - for progress - - {/* */} + />
From 26129b51fda3bef0157febfab0f941980dad62e7 Mon Sep 17 00:00:00 2001 From: William Felker Date: Fri, 5 Aug 2022 15:02:57 +0000 Subject: [PATCH 3/3] bug fixes --- pages/api/ch4 2/[id].js | 11 +++++++++++ pages/api/ch4 2/index.js | 5 +++++ pages/api/ch4 2/monthly.js | 5 +++++ 3 files changed, 21 insertions(+) create mode 100644 pages/api/ch4 2/[id].js create mode 100644 pages/api/ch4 2/index.js create mode 100644 pages/api/ch4 2/monthly.js diff --git a/pages/api/ch4 2/[id].js b/pages/api/ch4 2/[id].js new file mode 100644 index 0000000..35384fb --- /dev/null +++ b/pages/api/ch4 2/[id].js @@ -0,0 +1,11 @@ +import { ch4Monthly } from "../../../data/ch4"; + +export default function carbonHandler({ query: { id } }, res) { + const filtered = ch4Monthly.filter((c) => c.id === id); + + if (filtered.length > 0) { + res.status(200).json(filtered[0]); + } else { + res.status(404).json({ message: `CH₄ data for: ${id} not found.` }); + } +} diff --git a/pages/api/ch4 2/index.js b/pages/api/ch4 2/index.js new file mode 100644 index 0000000..b2fda0b --- /dev/null +++ b/pages/api/ch4 2/index.js @@ -0,0 +1,5 @@ +import { ch4Monthly } from "../../../data/ch4"; + +export default function handler(req, res) { + res.status(200).json(ch4Monthly); +} diff --git a/pages/api/ch4 2/monthly.js b/pages/api/ch4 2/monthly.js new file mode 100644 index 0000000..b2fda0b --- /dev/null +++ b/pages/api/ch4 2/monthly.js @@ -0,0 +1,5 @@ +import { ch4Monthly } from "../../../data/ch4"; + +export default function handler(req, res) { + res.status(200).json(ch4Monthly); +}