From f899e7f2dd786fdfcea1d54b406bc5db6a603596 Mon Sep 17 00:00:00 2001
From: Simao Rodrigues
Date: Wed, 31 Jan 2024 12:23:51 +0000
Subject: [PATCH 001/118] Change every mention of LUCF to LULUCF
---
.../app/components/abbr-replace/abbr-replace-data.js | 2 --
.../app/components/about/about-faq/about-faq-data.js | 10 +++-------
.../country-emission-drivers-component.jsx | 2 +-
.../card-pie-chart/card-pie-chart-component.jsx | 4 ++--
.../card-pie-chart/pie-chart-selectors.js | 4 ++--
app/javascript/app/data/constants.js | 6 +++---
app/javascript/app/data/data-explorer-constants.js | 2 +-
.../country/country-header/country-header-selectors.js | 2 +-
.../sectors-agricuture-selectors.js | 2 +-
9 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/app/javascript/app/components/abbr-replace/abbr-replace-data.js b/app/javascript/app/components/abbr-replace/abbr-replace-data.js
index d86a2d15cf..f32fedfaff 100644
--- a/app/javascript/app/components/abbr-replace/abbr-replace-data.js
+++ b/app/javascript/app/components/abbr-replace/abbr-replace-data.js
@@ -4,7 +4,6 @@ export const SUBSCRIPTS = ['CO2', 'CH4', 'N2O', 'NF3', 'SF6'];
export const CONFLICTS = {
BRICS: 'BR',
INDC: 'NDC',
- LULUCF: 'LUCF',
MtCO2e: 'Mt',
UNFCCC: 'UN'
};
@@ -47,7 +46,6 @@ export const ABBREVIATIONS = {
IPCC: 'Intergovernmental Panel on Climate Change',
LTS: 'Long-term Strategy',
LULUCF: 'Land-Use, Land-Use Change and Forestry',
- LUCF: 'Land-use Change and Forestry',
MtCO2e: 'Million metric tonnes of carbon dioxide equivalent',
Mt: 'Million metric tonnes',
N2O: 'Nitrous Oxide',
diff --git a/app/javascript/app/components/about/about-faq/about-faq-data.js b/app/javascript/app/components/about/about-faq/about-faq-data.js
index 8719326738..53915fd137 100644
--- a/app/javascript/app/components/about/about-faq/about-faq-data.js
+++ b/app/javascript/app/components/about/about-faq/about-faq-data.js
@@ -136,10 +136,6 @@ export const sectionsData = [
'Acronym definition': 'Intergovernmental Panel on Climate Change'
},
{ Acronym: 'LTS', 'Acronym definition': 'Long-term Strategy' },
- {
- Acronym: 'LUCF',
- 'Acronym definition': 'Land-use Change and Forestry'
- },
{
Acronym: 'LULUCF',
'Acronym definition': 'Land-use, land-use Change and Forestry'
@@ -204,7 +200,7 @@ export const sectionsData = [
'Climate Watch':
'The Climate Watch dataset is the most comprehensive included on Climate Watch and includes all sectors and gases. In order to emphasize comparability of data across countries, it does not use countries’ official inventories reported to the UNFCCC. It has a 3 year lag.',
'PIK PRIMAP-hist':
- 'The PIK PRIMAP-hist dataset included on Climate Watch combines UNFCCC reported data where available and fills gaps with other sources. It does not include land use change and forestry (LUCF) but covers all other sectors and has a 3 year lag. Additional data to what is shown on Climate Watch is available from PIK.',
+ 'The PIK PRIMAP-hist dataset included on Climate Watch combines UNFCCC reported data where available and fills gaps with other sources. It does not include land use change and forestry (LULUCF) but covers all other sectors and has a 3 year lag. Additional data to what is shown on Climate Watch is available from PIK.',
UNFCCC:
'UNFCCC includes only officially reported data by countries. It has large data gaps for non-Annex I countries. Due to different reporting requirements for Annex I and non-Annex I countries, the data is not internally comparable. It covers all sectors and has 2-3 year lag.',
GCP:
@@ -244,7 +240,7 @@ export const sectionsData = [
'Climate Watch':
'Main IPCC sectors, including energy sub-sectors. Includes:- agriculture
- bunker fuels
- energy
- electricity/heat
- fugitive emissions
- manufacturing/ construction
- other fuel combustion
- transportation
- industrial processes
- land-use change and forestry
- waste
',
'PIK PRIMAP-hist':
- 'Main IPCC sectors excluding LUCF. Includes: - agriculture
- energy
- industrial processes and product use
- other
- waste
Excludes: - land use change and forestry
- bunker fuels
Additional sub-sectors are included in the original source and not reflected on Climate Watch.',
+ 'Main IPCC sectors excluding LULUCF. Includes: - agriculture
- energy
- industrial processes and product use
- other
- waste
Excludes: - land use change and forestry
- bunker fuels
Additional sub-sectors are included in the original source and not reflected on Climate Watch.',
UNFCCC:
'Main IPCC sectors; energy sub-sectors are reported but not included on Climate Watch. For Annex I countries: - agriculture
- energy
- industrial processes and product use
- land use, land-use change, and forestry
- other
- waste
Excludes: - bunker fuels (reported separately)
For non-Annex I countries: - agriculture
- energy
- industrial processes
- land-use change and forestry
- other
- solvent and other product use
- waste
Excludes: - bunker fuels (reported separately)
',
GCP:
@@ -301,7 +297,7 @@ export const sectionsData = [
type: 'html',
title: 'Why do some countries have sectors with negative emissions?',
answer:
- 'The Land-use Change & Forestry (LUCF) sector can be a carbon sink or a source of emissions. Trees and other vegetation take up carbon dioxide from the atmosphere, but they also release emissions when they are cut down, burned or converted to other land uses. Depending on the balance between emissions and carbon sequestration in this sector within a country’s territory, the resulting net emissions could be positive or negative.
This WRI article has more detail on how trees contribute to carbon sequestration.
'
+ 'The Land-use Change & Forestry (LULUCF) sector can be a carbon sink or a source of emissions. Trees and other vegetation take up carbon dioxide from the atmosphere, but they also release emissions when they are cut down, burned or converted to other land uses. Depending on the balance between emissions and carbon sequestration in this sector within a country’s territory, the resulting net emissions could be positive or negative.
This WRI article has more detail on how trees contribute to carbon sequestration.
'
},
{
type: 'html',
diff --git a/app/javascript/app/components/country/country-emission-drivers/country-emission-drivers-component.jsx b/app/javascript/app/components/country/country-emission-drivers/country-emission-drivers-component.jsx
index 76475aa439..ee6d68154d 100644
--- a/app/javascript/app/components/country/country-emission-drivers/country-emission-drivers-component.jsx
+++ b/app/javascript/app/components/country/country-emission-drivers/country-emission-drivers-component.jsx
@@ -43,7 +43,7 @@ function CountryEmissionDrivers(props) {
The following indicators show representative emissions drivers
- from the energy, agriculture and LUCF sectors and their
+ from the energy, agriculture and LULUCF sectors and their
respective ranking compared to other countries.
diff --git a/app/javascript/app/components/sectors-agriculture/drivers-of-emissions/card-pie-chart/card-pie-chart-component.jsx b/app/javascript/app/components/sectors-agriculture/drivers-of-emissions/card-pie-chart/card-pie-chart-component.jsx
index df72f6fbb4..f01d7ad2bc 100644
--- a/app/javascript/app/components/sectors-agriculture/drivers-of-emissions/card-pie-chart/card-pie-chart-component.jsx
+++ b/app/javascript/app/components/sectors-agriculture/drivers-of-emissions/card-pie-chart/card-pie-chart-component.jsx
@@ -83,7 +83,7 @@ class CardPieChart extends PureComponent {
const totalIncludingLUCF = pieChartData && pieChartData.totalIncludingLUCF;
const totalExcludingLUCF = pieChartData && pieChartData.totalExcludingLUCF;
const subtitle = pieChartData
- ? `${location} GHG emissions by sector in ${year} (excluding LUCF). Source: Climate Watch.`
+ ? `${location} GHG emissions by sector in ${year} (excluding LULUCF). Source: Climate Watch.`
: 'Source: Climate Watch.';
const cardTheme = {
@@ -112,7 +112,7 @@ class CardPieChart extends PureComponent {
{agricultureEmissions.includingLUCF.formattedPercentage}
{' '}
- including LUCF ({renderEmissionValue(totalIncludingLUCF)})
+ including LULUCF ({renderEmissionValue(totalIncludingLUCF)})
{this.renderAgricultureLabel()}
diff --git a/app/javascript/app/components/sectors-agriculture/drivers-of-emissions/card-pie-chart/pie-chart-selectors.js b/app/javascript/app/components/sectors-agriculture/drivers-of-emissions/card-pie-chart/pie-chart-selectors.js
index c9bd0a3553..726f969f16 100644
--- a/app/javascript/app/components/sectors-agriculture/drivers-of-emissions/card-pie-chart/pie-chart-selectors.js
+++ b/app/javascript/app/components/sectors-agriculture/drivers-of-emissions/card-pie-chart/pie-chart-selectors.js
@@ -9,8 +9,8 @@ import { format } from 'd3-format';
import getIsoCode from './location-selectors';
const AGRICULTURE_COLOR = '#0677B3';
-const TOTAL_EXCLUDING_LUCF = 'Total excluding LUCF';
-const TOTAL_INCLUDING_LUCF = 'Total including LUCF';
+const TOTAL_EXCLUDING_LUCF = 'Total excluding LULUCF';
+const TOTAL_INCLUDING_LUCF = 'Total including LULUCF';
const INCLUDED_SECTORS = [
'Agriculture',
'Energy',
diff --git a/app/javascript/app/data/constants.js b/app/javascript/app/data/constants.js
index 7b5a5ec425..f71e5c9e55 100644
--- a/app/javascript/app/data/constants.js
+++ b/app/javascript/app/data/constants.js
@@ -97,7 +97,7 @@ export const DATA_SCALE = 1000000;
export const DEFAULT_EMISSIONS_SELECTIONS = {
'Climate Watch': {
gas: 'All GHG',
- sector: 'Total including LUCF',
+ sector: 'Total including LULUCF',
location: 'WORLD'
},
PIK: {
@@ -112,7 +112,7 @@ export const DEFAULT_EMISSIONS_SELECTIONS = {
},
UNFCCC_NAI: {
gas: 'Aggregate GHGs',
- sector: 'Total GHG emissions including LULUCF/LUCF',
+ sector: 'Total GHG emissions including LULUCF',
location: 'TOP'
},
GCP: {
@@ -122,7 +122,7 @@ export const DEFAULT_EMISSIONS_SELECTIONS = {
},
US: {
gas: 'All GHG',
- sector: 'Total including LUCF',
+ sector: 'Total including LULUCF',
location: 'USA'
}
};
diff --git a/app/javascript/app/data/data-explorer-constants.js b/app/javascript/app/data/data-explorer-constants.js
index 0f875d79f7..19ee1daf37 100644
--- a/app/javascript/app/data/data-explorer-constants.js
+++ b/app/javascript/app/data/data-explorer-constants.js
@@ -77,7 +77,7 @@ export const FILTER_DEFAULTS = {
'data-sources': 'Climate Watch',
regions: ALL_SELECTED,
gases: 'All GHG',
- sectors: 'Total including LUCF'
+ sectors: 'Total including LULUCF'
},
'ndc-content': {
categories: 'UNFCCC Process',
diff --git a/app/javascript/app/pages/country/country-header/country-header-selectors.js b/app/javascript/app/pages/country/country-header/country-header-selectors.js
index 6d7dc10b6c..bf4f18fbb4 100644
--- a/app/javascript/app/pages/country/country-header/country-header-selectors.js
+++ b/app/javascript/app/pages/country/country-header/country-header-selectors.js
@@ -52,7 +52,7 @@ export const getEmissionProviderFilters = createSelector(
const allGhgGas = meta.gas.find(g => g.label === 'All GHG');
const source = meta.data_source.find(g => g.name === 'Climate Watch');
const TotalExcludingLucfSector = meta.sector.find(
- g => g.label === 'Total including LUCF'
+ g => g.label === 'Total including LULUCF'
);
return {
gas: allGhgGas && allGhgGas.value,
diff --git a/app/javascript/app/pages/sectors-agriculture/sectors-agricuture-selectors.js b/app/javascript/app/pages/sectors-agriculture/sectors-agricuture-selectors.js
index 69094dd591..16958cd07e 100644
--- a/app/javascript/app/pages/sectors-agriculture/sectors-agricuture-selectors.js
+++ b/app/javascript/app/pages/sectors-agriculture/sectors-agricuture-selectors.js
@@ -7,7 +7,7 @@ const getGhgEmissionsData = state =>
(state.emissions && state.emissions.data) || null;
const AGRICULTURE_SECTOR = 'Agriculture';
-const TOTAL_SECTOR = 'Total excluding LUCF';
+const TOTAL_SECTOR = 'Total excluding LULUCF';
export const getAnchorLinks = createSelector([getSections], sections =>
sections.filter(route => route.anchor).map(route => ({
From c41f59bee62c8e49f1cc0bb4818ea1dcc8ae7e0e Mon Sep 17 00:00:00 2001
From: martintomas
Date: Thu, 1 Feb 2024 14:50:45 +0100
Subject: [PATCH 002/118] fix: INDC importer
---
app/services/import_indc.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/services/import_indc.rb b/app/services/import_indc.rb
index d26f88c7cd..afc6ee26a5 100644
--- a/app/services/import_indc.rb
+++ b/app/services/import_indc.rb
@@ -598,7 +598,7 @@ def import_values_wb
next
end
- next unless r[:responsetext]
+ next if r[:responsetext].blank?
parse_adaptation_actions(r, location)
group_index = values_apply_group_index(r, indicator)
From 0b2980ec30f8e034480a43a6afa97e7f133e3aaa Mon Sep 17 00:00:00 2001
From: martintomas
Date: Thu, 1 Feb 2024 15:10:21 +0100
Subject: [PATCH 003/118] refactoring: Renaming LUCF to LULUCF at BE
---
public/visualizations/per-capita-charts-2019/index.html | 2 +-
.../top-emitters-2018/circle_state_config.htm | 2 +-
.../top-emitters-2018/circle_state_config_german.htm | 2 +-
spec/services/import_historical_emissions_spec.rb | 8 ++++----
.../schemas/api/v1/data/historical_emissions_sectors.json | 2 +-
.../shared_contexts/historical_emissions/sectors.rb | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/public/visualizations/per-capita-charts-2019/index.html b/public/visualizations/per-capita-charts-2019/index.html
index 6924adf072..4d46c35fce 100644
--- a/public/visualizations/per-capita-charts-2019/index.html
+++ b/public/visualizations/per-capita-charts-2019/index.html
@@ -33,7 +33,7 @@
in a story to become invisible it is scrolled out of view. See https://bugs.chromium.org/p/chromium/issues/detail?id=335442 -->