From 9540a6c311c167ee3e91572a15f4d4affc21cf24 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Tue, 9 Jun 2026 10:41:18 +0200 Subject: [PATCH 01/21] Direct GHG emissions chart first setup --- .../direct_emissions_per_sector.yml | 162 ++++++++++++++++++ config/interface/output_elements/overview.yml | 13 ++ 2 files changed, 175 insertions(+) create mode 100644 config/interface/output_element_series/direct_emissions_per_sector.yml diff --git a/config/interface/output_element_series/direct_emissions_per_sector.yml b/config/interface/output_element_series/direct_emissions_per_sector.yml new file mode 100644 index 0000000000..5b2cdbdb07 --- /dev/null +++ b/config/interface/output_element_series/direct_emissions_per_sector.yml @@ -0,0 +1,162 @@ +--- +# present and future total GHG emissions +- label: energy + color: "#416B86" + order_by: 100 + group: '' + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: direct_emissions_energy_total_ghg_for_direct_emissions_chart + is_1990: + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_energy +- label: industry + color: "#A9A9A9" + order_by: 110 + group: '' + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: direct_emissions_industry_total_ghg_for_direct_emissions_chart + is_1990: + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_industry +- label: transport + color: "#8B0000" + order_by: 120 + group: '' + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: direct_emissions_transport_total_ghg_for_direct_emissions_chart + is_1990: + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_transport +- label: buildings + color: "#ADD8E6" + order_by: 130 + group: '' + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: direct_emissions_buildings_total_ghg_for_direct_emissions_chart + is_1990: + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_buildings +- label: households + color: "#4169E1" + order_by: 140 + group: '' + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: direct_emissions_households_total_ghg_for_direct_emissions_chart + is_1990: + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_households +- label: agriculture + color: "#FFD700" + order_by: 150 + group: '' + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: direct_emissions_agriculture_total_ghg_for_direct_emissions_chart + is_1990: + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_agriculture +- label: other + color: "#E07033" + order_by: 160 + group: '' + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: direct_emissions_other_total_ghg_for_direct_emissions_chart + is_1990: + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_other +- label: lulucf + color: "#C377C3" + order_by: 170 + group: '' + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: direct_emissions_lulucf_total_ghg_for_direct_emissions_chart + is_1990: + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_lulucf +- label: waste + color: "#6D6D6D" + order_by: 180 + group: '' + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: direct_emissions_waste_total_ghg_for_direct_emissions_chart + is_1990: + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_waste +- label: bunkers + color: "#82589F" + order_by: 190 + group: '' + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: direct_emissions_bunkers_total_ghg_for_direct_emissions_chart + is_1990: false + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_bunkers + +# 1990 total GHG emissions +- label: direct_emissions_per_sector_1990 + color: "#696969" + order_by: 200 + group: '' + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: 1990_in_co2_emissions + is_1990: true + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_1990 + +# net total GHG emissions +- label: direct_emissions_total_ghg + color: "#FF0000" + order_by: 300 + group: '' + show_at_first: false + is_target_line: true + target_line_position: '1' + gquery: direct_emissions_total_ghg_present_for_direct_emissions_chart + is_1990: false + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_total_ghg_present +- label: direct_emissions_total_ghg + color: "#FF0000" + order_by: 310 + group: '' + show_at_first: false + is_target_line: true + target_line_position: '2' + gquery: direct_emissions_total_ghg_future_for_direct_emissions_chart + is_1990: false + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_total_ghg_future diff --git a/config/interface/output_elements/overview.yml b/config/interface/output_elements/overview.yml index cfbf56329e..f9edce689a 100644 --- a/config/interface/output_elements/overview.yml +++ b/config/interface/output_elements/overview.yml @@ -173,3 +173,16 @@ requires_merit_order: false dependent_on: output_element_type_name: mekko +- under_construction: false + unit: MT + percentage: false + group: Overview + show_point_label: false + growth_chart: false + key: direct_emissions_per_sector + max_axis_value: + min_axis_value: + hidden: false + requires_merit_order: false + dependent_on: + output_element_type_name: vertical_stacked_bar From 8b1f5ab2feef01ceae1ceae2ae26b58561352f8c Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 11 Jun 2026 10:09:11 +0200 Subject: [PATCH 02/21] 1990 emissions query for energy sector --- .../output_element_series/direct_emissions_per_sector.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/interface/output_element_series/direct_emissions_per_sector.yml b/config/interface/output_element_series/direct_emissions_per_sector.yml index 5b2cdbdb07..efe4d72fab 100644 --- a/config/interface/output_element_series/direct_emissions_per_sector.yml +++ b/config/interface/output_element_series/direct_emissions_per_sector.yml @@ -122,18 +122,18 @@ key: direct_emissions_per_sector_bunkers # 1990 total GHG emissions -- label: direct_emissions_per_sector_1990 - color: "#696969" +- label: energy + color: "#416B86" order_by: 200 group: '' show_at_first: false is_target_line: false target_line_position: '' - gquery: 1990_in_co2_emissions + gquery: direct_emissions_energy_total_ghg_1990_for_direct_emissions_chart is_1990: true dependent_on: output_element_key: direct_emissions_per_sector - key: direct_emissions_per_sector_1990 + key: direct_emissions_per_sector_energy_1990 # net total GHG emissions - label: direct_emissions_total_ghg From b8d3bee891c35ed13170afbff15677c9e073568d Mon Sep 17 00:00:00 2001 From: robindesmit-quintel Date: Thu, 11 Jun 2026 13:26:01 +0200 Subject: [PATCH 03/21] Add labels to the Direct GHG emissions chart. --- .../direct_emissions_per_sector.yml | 108 ++++++++++++++++++ .../output_element_series/en_labels.yml | 2 + .../output_element_series/nl_labels.yml | 2 + .../interface/output_elements/en_overview.yml | 12 +- .../interface/output_elements/nl_overview.yml | 11 ++ 5 files changed, 134 insertions(+), 1 deletion(-) diff --git a/config/interface/output_element_series/direct_emissions_per_sector.yml b/config/interface/output_element_series/direct_emissions_per_sector.yml index efe4d72fab..22ac095809 100644 --- a/config/interface/output_element_series/direct_emissions_per_sector.yml +++ b/config/interface/output_element_series/direct_emissions_per_sector.yml @@ -134,6 +134,114 @@ dependent_on: output_element_key: direct_emissions_per_sector key: direct_emissions_per_sector_energy_1990 +- label: industry + color: "#A9A9A9" + order_by: 210 + group: '' + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: direct_emissions_industry_total_ghg_1990_for_direct_emissions_chart + is_1990: true + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_industry_1990 +- label: transport + color: "#8B0000" + order_by: 220 + group: '' + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: direct_emissions_transport_total_ghg_1990_for_direct_emissions_chart + is_1990: true + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_transport_1990 +- label: buildings + color: "#ADD8E6" + order_by: 230 + group: '' + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: direct_emissions_buildings_total_ghg_1990_for_direct_emissions_chart + is_1990: true + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_buildings_1990 +- label: households + color: "#4169E1" + order_by: 240 + group: '' + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: direct_emissions_households_total_ghg_1990_for_direct_emissions_chart + is_1990: true + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_households_1990 +- label: agriculture + color: "#FFD700" + order_by: 250 + group: '' + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: direct_emissions_agriculture_total_ghg_1990_for_direct_emissions_chart + is_1990: true + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_agriculture_1990 +- label: other + color: "#E07033" + order_by: 260 + group: '' + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: direct_emissions_other_total_ghg_1990_for_direct_emissions_chart + is_1990: true + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_other_1990 +- label: lulucf + color: "#C377C3" + order_by: 270 + group: '' + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: direct_emissions_lulucf_total_ghg_1990_for_direct_emissions_chart + is_1990: true + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_lulucf_1990 +- label: waste + color: "#6D6D6D" + order_by: 280 + group: '' + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: direct_emissions_waste_total_ghg_1990_for_direct_emissions_chart + is_1990: true + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_waste_1990 +- label: bunkers + color: "#82589F" + order_by: 290 + group: '' + show_at_first: false + is_target_line: false + target_line_position: '' + gquery: direct_emissions_bunkers_total_ghg_1990_for_direct_emissions_chart + is_1990: true + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_bunkers_1990 # net total GHG emissions - label: direct_emissions_total_ghg diff --git a/config/locales/interface/output_element_series/en_labels.yml b/config/locales/interface/output_element_series/en_labels.yml index 09376b0c9d..84f64ae623 100644 --- a/config/locales/interface/output_element_series/en_labels.yml +++ b/config/locales/interface/output_element_series/en_labels.yml @@ -463,6 +463,7 @@ en: diff_1990: "diff 1990" diff_2010: "diff 2010" diff_20xx: "diff 20xx" + direct_emissions_total_ghg: "Net GHG emissions" direct_to_grid: "Direct supply to grid" dish_washer: "Dish washer" dispatchable_electricity_production_capacity: "Dispatchable production capacity" @@ -1137,6 +1138,7 @@ en: industry_chp_wood_merit: "Wood pellets CHP (industry)" local_chp_wood_merit: "Biomass CHP (small-scale)" local_chp_gas_merit: "Gas CHP (small-scale)" + lulucf: "LULUCF" waste_chp_merit: "Waste incineration CHP" waste_chp_ccs_merit: "Waste incineration CHP CCS" merit_agriculture: "Agriculture" diff --git a/config/locales/interface/output_element_series/nl_labels.yml b/config/locales/interface/output_element_series/nl_labels.yml index 6beab11f7d..4f4365ed3c 100644 --- a/config/locales/interface/output_element_series/nl_labels.yml +++ b/config/locales/interface/output_element_series/nl_labels.yml @@ -439,6 +439,7 @@ nl: diff_1990: "versch 1990" diff_2010: "versch 2010" diff_20xx: "versch 20xx" + direct_emissions_total_ghg: "Netto broeikasgasemissies" direct_to_grid: "Directe levering aan net" dish_washer: "Vaatwasser" dispatchable_electricity_production_capacity: "Regelbare productiecapaciteit" @@ -1122,6 +1123,7 @@ nl: lpg_cars: "LPG-auto's" lpg_vans: "LPG-bestelbussen" lng_busses: "LNG-bussen" + lulucf: "LULUCF" lv_buildings_appliances: "Apparaten in gebouwen" lv_buildings_cooling: "Koeling in gebouwen" lv_buildings_lighting: "Verlichting in gebouwen" diff --git a/config/locales/interface/output_elements/en_overview.yml b/config/locales/interface/output_elements/en_overview.yml index 608e33dcd4..97eefbb530 100644 --- a/config/locales/interface/output_elements/en_overview.yml +++ b/config/locales/interface/output_elements/en_overview.yml @@ -19,13 +19,23 @@ en: emissions and the non-energetic CO2 emissions from the fertilizer sector. Non-energetic emissions in other sectors and other greenhouse gases (such as methane) are not included.

The start and future year take the same CO2 emission categories as the 1990 emissions into account. Besides non-energetic - CO2 emissions in the fertilizer sector, the non-energetic primary CO2 emissions + CO2 emissions in the fertilizer sector, the non-energetic primary CO2 emissions of final demand of hydrogen and ammonia are accounted for, which are assumed to be zero in 1990. The primary CO2 emissions for these carriers are the emissions that are released during the production of these carriers.

See our documentation for more info on the 1990 emissions and the emissions per sector in the ETM. + direct_emissions_per_sector: + title: Direct total GHG emissions + short_description: '' + description: | + This chart compares GHG emissions in 1990, the present, and the future. + The year 1990 is often used as a reference year in GHG emission targets. +

+ See our documentation for more info on the 1990 emissions and the emissions per sector in the ETM. renewability: title: Renewability of final demand short_description: '' diff --git a/config/locales/interface/output_elements/nl_overview.yml b/config/locales/interface/output_elements/nl_overview.yml index a461276883..5ecbf3b061 100644 --- a/config/locales/interface/output_elements/nl_overview.yml +++ b/config/locales/interface/output_elements/nl_overview.yml @@ -27,6 +27,17 @@ nl: Raadpleeg de documentatie voor meer informatie over de 1990 emissies en de emissies per sector in het ETM. + direct_emissions_per_sector: + direct_emissions_per_sector: + title: Directe totale broeikasgasemissies + short_description: '' + description: | + Deze grafiek vergelijkt de uitstoot van broeikasgassen + in 1990, het heden en de toekomst. Het jaar 1990 wordt vaak als referentiejaar + gebruikt in doelstellingen omtrend broeikasgasemissies.

+ Raadpleeg de documentatie voor meer informatie over de 1990 emissies en de emissies per sector in het ETM. renewability: title: Hernieuwbaarheid van eindgebruik short_description: '' From 5339c406dcd5ad25955f6442d8e99a326dd3ad2b Mon Sep 17 00:00:00 2001 From: robindesmit-quintel Date: Thu, 11 Jun 2026 17:31:04 +0200 Subject: [PATCH 04/21] Include the Direct total GHG emissions and its reduction relative 1990 into the Dashboard. --- .../lib/views/dashboard_item_view.coffee | 4 +++- app/assets/stylesheets/_chart.sass | 2 +- app/models/dashboard_item.rb | 1 + config/interface/dashboard_items.yml | 12 ++++++++++++ config/locales/en_etm.yml | 1 + config/locales/interface/en_dashboard_items.yml | 16 +++++++++++++++- config/locales/interface/nl_dashboard_items.yml | 15 +++++++++++++++ .../interface/output_elements/en_overview.yml | 7 +++---- .../interface/output_elements/nl_overview.yml | 5 ++--- 9 files changed, 53 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/lib/views/dashboard_item_view.coffee b/app/assets/javascripts/lib/views/dashboard_item_view.coffee index 757da3bc92..a245c20c84 100644 --- a/app/assets/javascripts/lib/views/dashboard_item_view.coffee +++ b/app/assets/javascripts/lib/views/dashboard_item_view.coffee @@ -80,7 +80,9 @@ class @DashboardItemView extends Backbone.View Metric.euros_to_string(result) when 'household_energy_cost' I18n.toCurrency(result, { precision: 0, unit: '€' }) - when 'total_primary_energy', 'co2_reduction', 'local_co2_reduction', 'co2_reduction_relative_to_start_year', 'all_ghg_reduction_relative_to_start_year' + when 'direct_emissions_total_ghg' + Metric.autoscale_value(result, @model.gquery.get('unit'), 1) + when 'total_primary_energy', 'co2_reduction', 'local_co2_reduction', 'co2_reduction_relative_to_start_year', 'all_ghg_reduction_relative_to_start_year', 'direct_emissions_total_ghg_relative_to_1990' # show + prefix if needed Metric.ratio_as_percentage(result, true) when 'net_energy_import', 'profitability' diff --git a/app/assets/stylesheets/_chart.sass b/app/assets/stylesheets/_chart.sass index 2d7feff54a..8fd6a20943 100644 --- a/app/assets/stylesheets/_chart.sass +++ b/app/assets/stylesheets/_chart.sass @@ -347,7 +347,7 @@ table div.d3_container svg display: block - &.vertical_stacked_bar, &.waterfall, &.target_bar, &.co2_emissions, &.merit_order, &.cost_capacity_bar, &.category_bar, &.hourly_summarized + &.vertical_stacked_bar, &.waterfall, &.target_bar, &.co2_emissions, &.merit_order, &.cost_capacity_bar, &.category_bar, &.hourly_summarized, &.direct_emissions_per_sector svg shape-rendering: crispEdges text diff --git a/app/models/dashboard_item.rb b/app/models/dashboard_item.rb index bcdc05f587..84f60132b1 100644 --- a/app/models/dashboard_item.rb +++ b/app/models/dashboard_item.rb @@ -13,6 +13,7 @@ class DashboardItem < YModel::Base GROUPS = %w[ energy_use co2 + direct_emissions import costs footprint diff --git a/config/interface/dashboard_items.yml b/config/interface/dashboard_items.yml index 064c1c7b7b..54d7110f72 100644 --- a/config/interface/dashboard_items.yml +++ b/config/interface/dashboard_items.yml @@ -131,3 +131,15 @@ position: disabled: false output_element_key: emissions_overview +- key: direct_emissions_total_ghg_relative_to_1990 + gquery_key: dashboard_reduction_of_direct_ghg_emissions_versus_1990 + group: direct_emissions + position: + disabled: false + output_element_key: direct_emissions_per_sector +- key: direct_emissions_total_ghg + gquery_key: direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers + group: direct_emissions + position: + disabled: false + output_element_key: direct_emissions_per_sector diff --git a/config/locales/en_etm.yml b/config/locales/en_etm.yml index c55d97da97..169ab2a044 100644 --- a/config/locales/en_etm.yml +++ b/config/locales/en_etm.yml @@ -151,6 +151,7 @@ en: dashboard_item_groups: energy_use: "Energy use" co2: "CO2 emissions" + direct_emissions: "Direct emissions" import: "Energy imports" costs: "Costs" footprint: "Biomass" diff --git a/config/locales/interface/en_dashboard_items.yml b/config/locales/interface/en_dashboard_items.yml index fa6a2a3ac9..54d21245d5 100644 --- a/config/locales/interface/en_dashboard_items.yml +++ b/config/locales/interface/en_dashboard_items.yml @@ -115,7 +115,7 @@ en: label: Profitable plants title: Profitability of dispatchable power plants description: | - The percentage on the dashboard shows which percentage of the installed + The percentage on the dashboard shows which percentage of the installed dispatchable power production capacity is economically viable. This table shows (of all plants, not only the dispatchable plants) what plants are profitable or unprofitable in your scenario. For more information about the table, please visit the documentation. @@ -155,3 +155,17 @@ en: as well as other important greenhouse gases, such as methane (CH4) or nitrous oxide (N2O), that should be considered. This graph shows these other emissions on top of the energetic CO2 emissions resulting in an overview of all greenhouse gas emissions.' + direct_emissions_total_ghg_relative_to_1990: + label: Direct GHG relative to 1990 + title: Direct total GHG emissions relative to 1990 + description: 'The year 1990 is used as reference year for the change in greenhouse gas emissions + shown in the dashboard. The chart below shows the total GHG emissions + obtained by the direct emission method. + You can find more information about this method in the documentation.' + direct_emissions_total_ghg: + label: Direct GHG emissions + title: Direct total GHG emissions + description: 'The ETM calculates the total amount of future greenhouse gases that will be emitted. + The chart below shows the total GHG emissions + obtained by the direct emission method. + You can find more information about this method in the documentation.' diff --git a/config/locales/interface/nl_dashboard_items.yml b/config/locales/interface/nl_dashboard_items.yml index 475745f2bd..5013fe8381 100644 --- a/config/locales/interface/nl_dashboard_items.yml +++ b/config/locales/interface/nl_dashboard_items.yml @@ -153,3 +153,18 @@ nl: lachgas (N2O). Het is belangrijk om ook deze emissies in kaart te brengen om een goed overzicht te hebben van de totale emissies van een gebied. Deze grafiek laat deze overige emissies zien bovenop de energetische CO2 emissies. Dit geeft een beeld van de totale broeikasemissies in het gebied." + direct_emissions_total_ghg_relative_to_1990: + label: Broeikasemissies t.o.v. 1990 + title: Directe totale broeikasgasemissies t.o.v. 1990 + description: 'Het jaar 1990 wordt als referentiejaar gebruikt voor de verandering + in broeikasgasemissies, getoond in het dashboard. + De onderstaande grafiek toond de uitstoot van broeikasgassen berekend door gebruik van de directe emissiemethode. + Meer informatie over deze methode kunt u vinden in de documentatie.' + direct_emissions_total_ghg: + label: Directe boeikasemissie + title: Directe totale broeikasgasemissie + description: 'Het ETM berekent de broeikasgasemissies die door energiegebruik worden uitgestoten met behulp van de directe emissiemethode. + De totale hoeveelheid broeikasemissies voor het toekomstige senario is getoond in het dashboard. + De onderstaande grafiek vergelijkt de uitstoot van broeikasgassen + in 1990, het heden en de toekomst. + Meer informatie over de directe emissie methode kunt u vinden in de documentatie.' diff --git a/config/locales/interface/output_elements/en_overview.yml b/config/locales/interface/output_elements/en_overview.yml index 97eefbb530..bf961159ff 100644 --- a/config/locales/interface/output_elements/en_overview.yml +++ b/config/locales/interface/output_elements/en_overview.yml @@ -31,11 +31,10 @@ en: short_description: '' description: | This chart compares GHG emissions in 1990, the present, and the future. - The year 1990 is often used as a reference year in GHG emission targets. + The year 1990 is often used as a reference year in emission targets.

- See our documentation for more info on the 1990 emissions and the emissions per sector in the ETM. + These GHG emissions are obtained through the direct emission method. + You can find more information about this method in the documentation.' renewability: title: Renewability of final demand short_description: '' diff --git a/config/locales/interface/output_elements/nl_overview.yml b/config/locales/interface/output_elements/nl_overview.yml index 5ecbf3b061..b40652550b 100644 --- a/config/locales/interface/output_elements/nl_overview.yml +++ b/config/locales/interface/output_elements/nl_overview.yml @@ -35,9 +35,8 @@ nl: Deze grafiek vergelijkt de uitstoot van broeikasgassen in 1990, het heden en de toekomst. Het jaar 1990 wordt vaak als referentiejaar gebruikt in doelstellingen omtrend broeikasgasemissies.

- Raadpleeg de documentatie voor meer informatie over de 1990 emissies en de emissies per sector in het ETM. + Deze emissies zijn berekend door gebruik van de directe-emissiemethode. + Meer informatie over deze methode kunt u vinden in de documentatie.' renewability: title: Hernieuwbaarheid van eindgebruik short_description: '' From 7ff61356374d3c7a6fedb50652509d04dd49da69 Mon Sep 17 00:00:00 2001 From: louispt1 <81332401+louispt1@users.noreply.github.com> Date: Tue, 16 Jun 2026 10:41:16 +0200 Subject: [PATCH 05/21] Add hide_label option to chart series to suppress duplicate legends (#4728) * Add hide_label option to chart series to suppress duplicate legend entries * Add possibility for target line on 1990 data, add for direct emissions stacked chart * Minor rearrangement --------- Co-authored-by: Kyra de Haan --- .../javascripts/lib/models/chart.coffee | 2 +- app/javascript/charts/Legend.js | 4 +++ app/javascript/charts/StackedBar.js | 13 +++++++--- app/models/output_element_serie.rb | 3 ++- .../direct_emissions_per_sector.yml | 26 +++++++++++++++++-- spec/models/output_element_serie_spec.rb | 7 +++++ 6 files changed, 48 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/lib/models/chart.coffee b/app/assets/javascripts/lib/models/chart.coffee index 9d1a1c4300..291bf1d8d4 100644 --- a/app/assets/javascripts/lib/models/chart.coffee +++ b/app/assets/javascripts/lib/models/chart.coffee @@ -226,7 +226,7 @@ class @Chart extends Backbone.Model target_series: -> @series.select (s) -> s.get('is_target_line') - year_1990_series: -> @series.select (s) -> s.get('is_1990') + year_1990_series: -> @series.select (s) -> s.get('is_1990') && !s.get('is_target_line') format_value: (value) => Metric.autoscale_value(value, @get('unit'), 2) diff --git a/app/javascript/charts/Legend.js b/app/javascript/charts/Legend.js index 963c230135..97d200463b 100644 --- a/app/javascript/charts/Legend.js +++ b/app/javascript/charts/Legend.js @@ -81,6 +81,10 @@ class Legend extends Backbone.View { const clickable = this.options.clickable; for (const series of this.options.items) { + if (series.get('hide_label')) { + continue; + } + this.el.append( new LegendItem({ clickable, diff --git a/app/javascript/charts/StackedBar.js b/app/javascript/charts/StackedBar.js index 4dee6a6f80..180cbc3d56 100644 --- a/app/javascript/charts/StackedBar.js +++ b/app/javascript/charts/StackedBar.js @@ -11,8 +11,11 @@ const stack = d3.stack().offset(d3.stackOffsetDiverging); * Determines the opacity with which a target line should be drawn. */ const targetLineOpacity = (serie) => { + const position = serie.get('target_line_position'); const value = - serie.get('target_line_position') === '1' ? serie.present_value() : serie.future_value(); + position === '0' ? serie.present_value() : + position === '1' ? serie.present_value() : + serie.future_value(); return value === null ? 0 : 1; }; @@ -129,7 +132,8 @@ class StackedBar extends D3Chart { .attr('height', 2) .attr('width', () => this.x.bandwidth() * 1.2) .attr('x', (s) => { - const year = s.get('target_line_position') === '1' ? this.startYear : this.endYear; + const position = s.get('target_line_position'); + const year = position === '0' ? 1990 : position === '1' ? this.startYear : this.endYear; return this.x(year) - this.x.bandwidth() * 0.1; }) .attr('y', 0); @@ -174,8 +178,11 @@ class StackedBar extends D3Chart { .style('opacity', targetLineOpacity) .transition(transition) .attr('y', (d) => { + const position = d.get('target_line_position'); const value = - d.get('target_line_position') === '1' ? d.safe_present_value() : d.safe_future_value(); + position === '0' ? d.safe_present_value() : + position === '1' ? d.safe_present_value() : + d.safe_future_value(); return this.y(value); }); diff --git a/app/models/output_element_serie.rb b/app/models/output_element_serie.rb index e25f350500..20cf106f4e 100644 --- a/app/models/output_element_serie.rb +++ b/app/models/output_element_serie.rb @@ -82,7 +82,8 @@ def json_attributes group_translated: group_translated, # used to display groups in mekkos's & horizontal_stacked_bar is_target_line: is_target_line, target_line_position: target_line_position, - is_1990: is_1990 + is_1990: is_1990, + hide_label: hide_label } end # rubocop:enable Metrics/LineLength diff --git a/config/interface/output_element_series/direct_emissions_per_sector.yml b/config/interface/output_element_series/direct_emissions_per_sector.yml index 22ac095809..d486c46c62 100644 --- a/config/interface/output_element_series/direct_emissions_per_sector.yml +++ b/config/interface/output_element_series/direct_emissions_per_sector.yml @@ -131,6 +131,7 @@ target_line_position: '' gquery: direct_emissions_energy_total_ghg_1990_for_direct_emissions_chart is_1990: true + hide_label: true dependent_on: output_element_key: direct_emissions_per_sector key: direct_emissions_per_sector_energy_1990 @@ -143,6 +144,7 @@ target_line_position: '' gquery: direct_emissions_industry_total_ghg_1990_for_direct_emissions_chart is_1990: true + hide_label: true dependent_on: output_element_key: direct_emissions_per_sector key: direct_emissions_per_sector_industry_1990 @@ -155,6 +157,7 @@ target_line_position: '' gquery: direct_emissions_transport_total_ghg_1990_for_direct_emissions_chart is_1990: true + hide_label: true dependent_on: output_element_key: direct_emissions_per_sector key: direct_emissions_per_sector_transport_1990 @@ -167,6 +170,7 @@ target_line_position: '' gquery: direct_emissions_buildings_total_ghg_1990_for_direct_emissions_chart is_1990: true + hide_label: true dependent_on: output_element_key: direct_emissions_per_sector key: direct_emissions_per_sector_buildings_1990 @@ -179,6 +183,7 @@ target_line_position: '' gquery: direct_emissions_households_total_ghg_1990_for_direct_emissions_chart is_1990: true + hide_label: true dependent_on: output_element_key: direct_emissions_per_sector key: direct_emissions_per_sector_households_1990 @@ -191,6 +196,7 @@ target_line_position: '' gquery: direct_emissions_agriculture_total_ghg_1990_for_direct_emissions_chart is_1990: true + hide_label: true dependent_on: output_element_key: direct_emissions_per_sector key: direct_emissions_per_sector_agriculture_1990 @@ -203,6 +209,7 @@ target_line_position: '' gquery: direct_emissions_other_total_ghg_1990_for_direct_emissions_chart is_1990: true + hide_label: true dependent_on: output_element_key: direct_emissions_per_sector key: direct_emissions_per_sector_other_1990 @@ -215,6 +222,7 @@ target_line_position: '' gquery: direct_emissions_lulucf_total_ghg_1990_for_direct_emissions_chart is_1990: true + hide_label: true dependent_on: output_element_key: direct_emissions_per_sector key: direct_emissions_per_sector_lulucf_1990 @@ -227,6 +235,7 @@ target_line_position: '' gquery: direct_emissions_waste_total_ghg_1990_for_direct_emissions_chart is_1990: true + hide_label: true dependent_on: output_element_key: direct_emissions_per_sector key: direct_emissions_per_sector_waste_1990 @@ -239,17 +248,30 @@ target_line_position: '' gquery: direct_emissions_bunkers_total_ghg_1990_for_direct_emissions_chart is_1990: true + hide_label: true dependent_on: output_element_key: direct_emissions_per_sector key: direct_emissions_per_sector_bunkers_1990 -# net total GHG emissions +# 1990, present and future net total GHG emissions target line - label: direct_emissions_total_ghg color: "#FF0000" order_by: 300 group: '' show_at_first: false is_target_line: true + target_line_position: '0' + gquery: direct_emissions_total_ghg_1990_for_direct_emissions_chart + is_1990: true + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_total_ghg_1990 +- label: direct_emissions_total_ghg + color: "#FF0000" + order_by: 310 + group: '' + show_at_first: false + is_target_line: true target_line_position: '1' gquery: direct_emissions_total_ghg_present_for_direct_emissions_chart is_1990: false @@ -258,7 +280,7 @@ key: direct_emissions_per_sector_total_ghg_present - label: direct_emissions_total_ghg color: "#FF0000" - order_by: 310 + order_by: 320 group: '' show_at_first: false is_target_line: true diff --git a/spec/models/output_element_serie_spec.rb b/spec/models/output_element_serie_spec.rb index ddfa95227f..bee1b2c65f 100644 --- a/spec/models/output_element_serie_spec.rb +++ b/spec/models/output_element_serie_spec.rb @@ -23,6 +23,7 @@ it { is_expected.to respond_to(:is_target_line) } it { is_expected.to respond_to(:target_line_position) } it { is_expected.to respond_to(:is_1990) } + it { is_expected.to respond_to(:hide_label) } # methods it { is_expected.to respond_to(:title_translated) } @@ -30,4 +31,10 @@ it { is_expected.to respond_to(:json_attributes) } it { is_expected.to respond_to(:url_in_etengine) } end + + describe '#json_attributes' do + subject { described_class.new(hide_label: true).json_attributes } + + it { is_expected.to include(hide_label: true) } + end end From 2ea47454a61744e88cf73d2120773b195fc2a7fe Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Tue, 16 Jun 2026 16:50:51 +0200 Subject: [PATCH 06/21] Update chart title and description --- .../interface/output_elements/en_overview.yml | 13 ++++++++----- .../interface/output_elements/nl_overview.yml | 11 +++++++---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/config/locales/interface/output_elements/en_overview.yml b/config/locales/interface/output_elements/en_overview.yml index bf961159ff..5899114aa1 100644 --- a/config/locales/interface/output_elements/en_overview.yml +++ b/config/locales/interface/output_elements/en_overview.yml @@ -27,14 +27,17 @@ en: target="_blank">1990 emissions and the emissions per sector in the ETM. direct_emissions_per_sector: - title: Direct total GHG emissions - short_description: '' + title: Direct total GHG emissions (beta release) + short_description: description: | - This chart compares GHG emissions in 1990, the present, and the future. + This chart compares total GHG emissions in 1990, the present and the future. The year 1990 is often used as a reference year in emission targets.

- These GHG emissions are obtained through the direct emission method. - You can find more information about this method in the documentation.' + Note: the emissions are calculated based on direct emissions. This emissions method + is currently in beta release and is not yet completely availabe for regional (Dutch) + datasets. Read more in the + documentation. renewability: title: Renewability of final demand short_description: '' diff --git a/config/locales/interface/output_elements/nl_overview.yml b/config/locales/interface/output_elements/nl_overview.yml index b40652550b..9f6e51463f 100644 --- a/config/locales/interface/output_elements/nl_overview.yml +++ b/config/locales/interface/output_elements/nl_overview.yml @@ -29,14 +29,17 @@ nl: target="_blank">emissies per sector in het ETM. direct_emissions_per_sector: direct_emissions_per_sector: - title: Directe totale broeikasgasemissies - short_description: '' + title: Directe totale broeikasgasemissies (beta release) + short_description: description: | Deze grafiek vergelijkt de uitstoot van broeikasgassen in 1990, het heden en de toekomst. Het jaar 1990 wordt vaak als referentiejaar gebruikt in doelstellingen omtrend broeikasgasemissies.

- Deze emissies zijn berekend door gebruik van de directe-emissiemethode. - Meer informatie over deze methode kunt u vinden in de documentatie.' + Let op: de emissies zijn berekend op basis van directe emissies. Deze + emissiemethode is momenteel in beta release en is nog niet volledig beschikbaar voor de + regionale (Nederlandse) datasets. Lees hierover meer in de + documentatie. renewability: title: Hernieuwbaarheid van eindgebruik short_description: '' From 8c150ed8435e4c3f0dd65b99675d94e6cd8bc871 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 18 Jun 2026 11:01:21 +0200 Subject: [PATCH 07/21] Reorder dashboard items alphabetically --- config/interface/dashboard_items.yml | 162 +++++++++++++-------------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/config/interface/dashboard_items.yml b/config/interface/dashboard_items.yml index 54d7110f72..b1f588df91 100644 --- a/config/interface/dashboard_items.yml +++ b/config/interface/dashboard_items.yml @@ -1,11 +1,4 @@ --- -- key: total_primary_energy - gquery_key: dashboard_energy_demand_primary_of_final_plus_export_losses - group: energy_use - position: 2 - disabled: false - output_element_key: use_of_primary_energy - dependent_on: '' - key: co2_reduction gquery_key: dashboard_reduction_of_co2_emissions_versus_1990 group: co2 @@ -13,13 +6,26 @@ disabled: false output_element_key: co2_emissions dependent_on: '' -- key: net_energy_import - gquery_key: dashboard_energy_import_netto - group: import - position: 6 +- key: local_co2_reduction + gquery_key: dashboard_reduction_of_local_co2_emissions_versus_1990 + group: co2 + position: disabled: false - output_element_key: + output_element_key: co2_emissions dependent_on: '' +- key: co2_reduction_relative_to_start_year + gquery_key: dashboard_co2_emissions_versus_start_year + group: co2 + position: + disabled: false + output_element_key: co2_emissions + dependent_on: '' +- key: all_ghg_reduction_relative_to_start_year + gquery_key: dashboard_emissions + group: co2 + position: + disabled: false + output_element_key: emissions_overview - key: total_energy_cost gquery_key: dashboard_total_costs group: costs @@ -27,6 +33,60 @@ disabled: false output_element_key: costs_overview dependent_on: +- key: profitability + gquery_key: dashboard_profitability + group: costs + position: + disabled: false + output_element_key: power_plant_economic_performance + dependent_on: has_merit_order +- key: direct_emissions_total_ghg_relative_to_1990 + gquery_key: dashboard_reduction_of_direct_ghg_emissions_versus_1990 + group: direct_emissions + position: + disabled: false + output_element_key: direct_emissions_per_sector +- key: direct_emissions_total_ghg + gquery_key: direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers + group: direct_emissions + position: + disabled: false + output_element_key: direct_emissions_per_sector +- key: total_primary_energy + gquery_key: dashboard_energy_demand_primary_of_final_plus_export_losses + group: energy_use + position: 2 + disabled: false + output_element_key: use_of_primary_energy + dependent_on: '' +- key: biomass_primary_demand + gquery_key: dashboard_biomass_primary_demand + group: footprint + position: + disabled: false + output_element_key: biomass_demand_by_category + dependent_on: '' +- key: biomass_final_demand + gquery_key: dashboard_biomass_final_demand + group: footprint + position: + disabled: false + output_element_key: biomass_demand_by_category + dependent_on: '' +- key: biomass_import_share + gquery_key: dashboard_biomass_import_share + group: footprint + position: 8 + disabled: false + output_element_key: biomass_sankey + dependent_on: '' +- key: net_energy_import + gquery_key: dashboard_energy_import_netto + group: import + position: 6 + disabled: false + output_element_key: + dependent_on: '' - key: renewable_percentage gquery_key: dashboard_renewability group: renewable @@ -34,13 +94,6 @@ disabled: false output_element_key: renewability dependent_on: '' -- key: loss_of_load - gquery_key: dashboard_security_of_supply - group: summary - position: - disabled: false - output_element_key: security_of_supply - dependent_on: '' - key: renewable_electricity_percentage gquery_key: dashboard_share_of_renewable_electricity group: renewable @@ -48,19 +101,19 @@ disabled: false output_element_key: renewable_electricity dependent_on: '' -- key: profitability - gquery_key: dashboard_profitability - group: costs +- key: renewable_percentage_households + gquery_key: dashboard_renewability_households + group: renewable position: disabled: false - output_element_key: power_plant_economic_performance - dependent_on: has_merit_order -- key: local_co2_reduction - gquery_key: dashboard_reduction_of_local_co2_emissions_versus_1990 - group: co2 + output_element_key: renewability + dependent_on: +- key: loss_of_load + gquery_key: dashboard_security_of_supply + group: summary position: disabled: false - output_element_key: co2_emissions + output_element_key: security_of_supply dependent_on: '' - key: power_shortage_hours gquery_key: dashboard_power_shortage_hours @@ -90,56 +143,3 @@ disabled: false output_element_key: use_of_excess_electricity dependent_on: -- key: co2_reduction_relative_to_start_year - gquery_key: dashboard_co2_emissions_versus_start_year - group: co2 - position: - disabled: false - output_element_key: co2_emissions - dependent_on: '' -- key: renewable_percentage_households - gquery_key: dashboard_renewability_households - group: renewable - position: - disabled: false - output_element_key: renewability - dependent_on: -- key: biomass_primary_demand - gquery_key: dashboard_biomass_primary_demand - group: footprint - position: - disabled: false - output_element_key: biomass_demand_by_category - dependent_on: '' -- key: biomass_final_demand - gquery_key: dashboard_biomass_final_demand - group: footprint - position: - disabled: false - output_element_key: biomass_demand_by_category - dependent_on: '' -- key: biomass_import_share - gquery_key: dashboard_biomass_import_share - group: footprint - position: 8 - disabled: false - output_element_key: biomass_sankey - dependent_on: '' -- key: all_ghg_reduction_relative_to_start_year - gquery_key: dashboard_emissions - group: co2 - position: - disabled: false - output_element_key: emissions_overview -- key: direct_emissions_total_ghg_relative_to_1990 - gquery_key: dashboard_reduction_of_direct_ghg_emissions_versus_1990 - group: direct_emissions - position: - disabled: false - output_element_key: direct_emissions_per_sector -- key: direct_emissions_total_ghg - gquery_key: direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers - group: direct_emissions - position: - disabled: false - output_element_key: direct_emissions_per_sector From c1dfb77a8c7ad667c3ed73e8bfcfff9e9cabe475 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 18 Jun 2026 11:22:32 +0200 Subject: [PATCH 08/21] Regroup direct emissions items to existing emissions dashboard category --- app/models/dashboard_item.rb | 3 +- config/interface/dashboard_items.yml | 91 ++++++++++++++++------------ config/locales/en_etm.yml | 3 +- config/locales/nl_etm.yml | 2 +- 4 files changed, 55 insertions(+), 44 deletions(-) diff --git a/app/models/dashboard_item.rb b/app/models/dashboard_item.rb index 84f60132b1..920338fd9d 100644 --- a/app/models/dashboard_item.rb +++ b/app/models/dashboard_item.rb @@ -12,8 +12,7 @@ class DashboardItem < YModel::Base # dashboard views. GROUPS = %w[ energy_use - co2 - direct_emissions + emissions import costs footprint diff --git a/config/interface/dashboard_items.yml b/config/interface/dashboard_items.yml index b1f588df91..d83089546b 100644 --- a/config/interface/dashboard_items.yml +++ b/config/interface/dashboard_items.yml @@ -1,145 +1,158 @@ --- +# emissions - key: co2_reduction gquery_key: dashboard_reduction_of_co2_emissions_versus_1990 - group: co2 - position: 1 + group: emissions + position: 100 disabled: false output_element_key: co2_emissions dependent_on: '' -- key: local_co2_reduction - gquery_key: dashboard_reduction_of_local_co2_emissions_versus_1990 - group: co2 - position: +- key: co2_reduction_relative_to_start_year + gquery_key: dashboard_co2_emissions_versus_start_year + group: emissions + position: 110 disabled: false output_element_key: co2_emissions dependent_on: '' -- key: co2_reduction_relative_to_start_year - gquery_key: dashboard_co2_emissions_versus_start_year - group: co2 - position: +- key: local_co2_reduction + gquery_key: dashboard_reduction_of_local_co2_emissions_versus_1990 + group: emissions + position: 120 disabled: false output_element_key: co2_emissions dependent_on: '' - key: all_ghg_reduction_relative_to_start_year gquery_key: dashboard_emissions - group: co2 - position: + group: emissions + position: 130 disabled: false output_element_key: emissions_overview +- key: direct_emissions_total_ghg_relative_to_1990 + gquery_key: dashboard_reduction_of_direct_ghg_emissions_versus_1990 + group: emissions + position: 140 + disabled: false + output_element_key: direct_emissions_per_sector +- key: direct_emissions_total_ghg + gquery_key: direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers + group: emissions + position: 150 + disabled: false + output_element_key: direct_emissions_per_sector + +# costs - key: total_energy_cost gquery_key: dashboard_total_costs group: costs - position: 4 + position: 200 disabled: false output_element_key: costs_overview dependent_on: - key: profitability gquery_key: dashboard_profitability group: costs - position: + position: 210 disabled: false output_element_key: power_plant_economic_performance dependent_on: has_merit_order -- key: direct_emissions_total_ghg_relative_to_1990 - gquery_key: dashboard_reduction_of_direct_ghg_emissions_versus_1990 - group: direct_emissions - position: - disabled: false - output_element_key: direct_emissions_per_sector -- key: direct_emissions_total_ghg - gquery_key: direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers - group: direct_emissions - position: - disabled: false - output_element_key: direct_emissions_per_sector + +# primary energy - key: total_primary_energy gquery_key: dashboard_energy_demand_primary_of_final_plus_export_losses group: energy_use - position: 2 + position: 300 disabled: false output_element_key: use_of_primary_energy dependent_on: '' + +# biomass - key: biomass_primary_demand gquery_key: dashboard_biomass_primary_demand group: footprint - position: + position: 400 disabled: false output_element_key: biomass_demand_by_category dependent_on: '' - key: biomass_final_demand gquery_key: dashboard_biomass_final_demand group: footprint - position: + position: 410 disabled: false output_element_key: biomass_demand_by_category dependent_on: '' - key: biomass_import_share gquery_key: dashboard_biomass_import_share group: footprint - position: 8 + position: 420 disabled: false output_element_key: biomass_sankey dependent_on: '' + +# import - key: net_energy_import gquery_key: dashboard_energy_import_netto group: import - position: 6 + position: 500 disabled: false output_element_key: dependent_on: '' + +# renewable - key: renewable_percentage gquery_key: dashboard_renewability group: renewable - position: 5 + position: 600 disabled: false output_element_key: renewability dependent_on: '' - key: renewable_electricity_percentage gquery_key: dashboard_share_of_renewable_electricity group: renewable - position: + position: 610 disabled: false output_element_key: renewable_electricity dependent_on: '' - key: renewable_percentage_households gquery_key: dashboard_renewability_households group: renewable - position: + position: 620 disabled: false output_element_key: renewability dependent_on: + +# summary - key: loss_of_load gquery_key: dashboard_security_of_supply group: summary - position: + position: 700 disabled: false output_element_key: security_of_supply dependent_on: '' - key: power_shortage_hours gquery_key: dashboard_power_shortage_hours group: summary - position: 7 + position: 710 disabled: false output_element_key: power_shortage dependent_on: has_merit_order - key: total_number_of_excess_events gquery_key: dashboard_total_number_of_excess_events group: summary - position: + position: 720 disabled: false output_element_key: merit_order_excess_events dependent_on: '' - key: total_curtailment gquery_key: dashboard_total_curtailment group: summary - position: + position: 730 disabled: false output_element_key: use_of_excess_electricity dependent_on: - key: share_of_curtailment gquery_key: dashboard_share_of_curtailment_in_inflexible_production group: summary - position: + position: 740 disabled: false output_element_key: use_of_excess_electricity dependent_on: diff --git a/config/locales/en_etm.yml b/config/locales/en_etm.yml index 169ab2a044..25fead3128 100644 --- a/config/locales/en_etm.yml +++ b/config/locales/en_etm.yml @@ -150,8 +150,7 @@ en: dashboard_item_groups: energy_use: "Energy use" - co2: "CO2 emissions" - direct_emissions: "Direct emissions" + emissions: "Emissions" import: "Energy imports" costs: "Costs" footprint: "Biomass" diff --git a/config/locales/nl_etm.yml b/config/locales/nl_etm.yml index da8f0172fa..11494de09e 100644 --- a/config/locales/nl_etm.yml +++ b/config/locales/nl_etm.yml @@ -150,7 +150,7 @@ nl: dashboard_item_groups: energy_use: "Energiegebruik" - co2: "CO2-uitstoot" + emissions: "Emissies" import: "Energie-import" costs: "Kosten" footprint: "Biomassa" From e7027f66314ec9da67b2b7209206601b54f45dac Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 18 Jun 2026 11:42:38 +0200 Subject: [PATCH 09/21] Labels and descriptions --- .../locales/interface/en_dashboard_items.yml | 36 ++++++++++------ .../locales/interface/nl_dashboard_items.yml | 41 ++++++++++++------- .../interface/output_elements/nl_overview.yml | 2 +- 3 files changed, 51 insertions(+), 28 deletions(-) diff --git a/config/locales/interface/en_dashboard_items.yml b/config/locales/interface/en_dashboard_items.yml index 54d21245d5..e4854ff9a5 100644 --- a/config/locales/interface/en_dashboard_items.yml +++ b/config/locales/interface/en_dashboard_items.yml @@ -149,23 +149,35 @@ en: In the chart below you can see the curtailed volume, compared to other uses of flexible electricity demand. all_ghg_reduction_relative_to_start_year: label: Greenhouse gases - title: Total greenhouse gas emissions relative to start year + title: Total GHG emissions relative to start year (beta release) description: 'The ETM calculates the amount of CO2 that is emitted as a result of energy use. However, there are also non-energetic sources of CO2 as well as other important greenhouse gases, such as methane (CH4) or nitrous oxide (N2O), that should be considered. This graph shows these other emissions on top of the energetic CO2 emissions resulting in an overview of all greenhouse gas emissions.' direct_emissions_total_ghg_relative_to_1990: - label: Direct GHG relative to 1990 + label: GHG relative to 1990 title: Direct total GHG emissions relative to 1990 - description: 'The year 1990 is used as reference year for the change in greenhouse gas emissions - shown in the dashboard. The chart below shows the total GHG emissions - obtained by the direct emission method. - You can find more information about this method in the documentation.' + description: | + This dashboard item represents the reduction in direct total greenhouse gas emissions + relative to total greenhouse gas emissions in 1990. The year 1990 is often used as a + reference year in greenhouse gas emission targets. The chart below shows the direct + greenhouse gas emissions per sector for 1990, the start year and the future year. +

+ Note: the emissions in this dashboard item and the chart below are calculated based + on direct emissions. This emission method is currently in beta release and is not yet + fully available for regional (Dutch) datasets. Read more about this in the + documentation. direct_emissions_total_ghg: - label: Direct GHG emissions - title: Direct total GHG emissions - description: 'The ETM calculates the total amount of future greenhouse gases that will be emitted. - The chart below shows the total GHG emissions - obtained by the direct emission method. - You can find more information about this method in the documentation.' + label: GHG emissions + title: Direct total GHG emissions (beta release) + description: | + This dashboard item represents the direct total greenhouse gas emissions in the future year. + The chart below shows the direct greenhouse gas emissions per sector for 1990, the + start year and the future year.

+ Note: the emissions in this dashboard item and the chart below are calculated based + on direct emissions. This emission method is currently in beta release and is not yet + fully available for regional (Dutch) datasets. Read more about this in the + documentation. diff --git a/config/locales/interface/nl_dashboard_items.yml b/config/locales/interface/nl_dashboard_items.yml index 5013fe8381..bc764509ad 100644 --- a/config/locales/interface/nl_dashboard_items.yml +++ b/config/locales/interface/nl_dashboard_items.yml @@ -52,7 +52,7 @@ nl: in CO2 uitstoot getoond in het dashboard co2_reduction_relative_to_start_year: label: CO2 t.o.v. startjaar - title: CO2-uitstoot ten opzichte van het startjaar + title: CO2-uitstoot t.o.v. startjaar description: '' costs_fte: label: FTE delta analyse @@ -147,24 +147,35 @@ nl: In de grafiek hieronder kun je de productiebeperking zien, vergeleken met andere inzet van flexibele elektriciteitsvraag. all_ghg_reduction_relative_to_start_year: label: Broeikasgassen - title: Totale broeikasgasemissies ten opzichte van het startjaar + title: Totale broeikasgasemissies t.o.v. startjaar description: "Het ETM berekent de CO2 emissies die door energiegebruik worden uitgestoten. Echter bestaan er ook non-energetische bronnen van CO2 en andere broeikasgassen zoals methaan (CH4) lachgas (N2O). Het is belangrijk om ook deze emissies in kaart te brengen om een goed overzicht te hebben van de totale emissies van een gebied. Deze grafiek laat deze overige emissies zien bovenop de energetische CO2 emissies. Dit geeft een beeld van de totale broeikasemissies in het gebied." direct_emissions_total_ghg_relative_to_1990: - label: Broeikasemissies t.o.v. 1990 - title: Directe totale broeikasgasemissies t.o.v. 1990 - description: 'Het jaar 1990 wordt als referentiejaar gebruikt voor de verandering - in broeikasgasemissies, getoond in het dashboard. - De onderstaande grafiek toond de uitstoot van broeikasgassen berekend door gebruik van de directe emissiemethode. - Meer informatie over deze methode kunt u vinden in de documentatie.' + label: Broeikasgasemissies t.o.v. 1990 + title: Directe totale broeikasgasemissies t.o.v. 1990 (beta release) + description: | + Dit dashboarditem representeert de reductie in directe totale broeikasgasemissies + ten opzichte van de totale broeikasgasemissies in 1990. Het jaar 1990 wordt vaak als + referentiejaar gebruikt in doelstellingen omtrent broeikasgasemissies. Onderstaande grafiek + toont de directe broeikasgasemissies per sector voor 1990, het startjaar en toekomstjaar. +

+ Let op: de emissies in dit dashboarditem en onderstaande grafiek zijn berekend op basis + van directe emissies. Deze emissiemethode is momenteel in beta release en is nog niet + volledig beschikbaar voor de regionale (Nederlandse) datasets. Lees hierover meer in de + documentatie. direct_emissions_total_ghg: - label: Directe boeikasemissie - title: Directe totale broeikasgasemissie - description: 'Het ETM berekent de broeikasgasemissies die door energiegebruik worden uitgestoten met behulp van de directe emissiemethode. - De totale hoeveelheid broeikasemissies voor het toekomstige senario is getoond in het dashboard. - De onderstaande grafiek vergelijkt de uitstoot van broeikasgassen - in 1990, het heden en de toekomst. - Meer informatie over de directe emissie methode kunt u vinden in de documentatie.' + label: Broeikasgasemissies + title: Directe totale broeikasgasemissies (beta release) + description: | + Dit dashboarditem representeert de directe totale broeikasgasemissies in het toekomstjaar. + Onderstaande grafiek toont de directe broeikasgasemissies per sector voor 1990, het + startjaar en toekomstjaar.

+ Let op: de emissies in dit dashboarditem en onderstaande grafiek zijn berekend op basis + van directe emissies. Deze emissiemethode is momenteel in beta release en is nog niet + volledig beschikbaar voor de regionale (Nederlandse) datasets. Lees hierover meer in de + documentatie. diff --git a/config/locales/interface/output_elements/nl_overview.yml b/config/locales/interface/output_elements/nl_overview.yml index 9f6e51463f..e6ade9f607 100644 --- a/config/locales/interface/output_elements/nl_overview.yml +++ b/config/locales/interface/output_elements/nl_overview.yml @@ -34,7 +34,7 @@ nl: description: | Deze grafiek vergelijkt de uitstoot van broeikasgassen in 1990, het heden en de toekomst. Het jaar 1990 wordt vaak als referentiejaar - gebruikt in doelstellingen omtrend broeikasgasemissies.

+ gebruikt in doelstellingen omtrent broeikasgasemissies.

Let op: de emissies zijn berekend op basis van directe emissies. Deze emissiemethode is momenteel in beta release en is nog niet volledig beschikbaar voor de regionale (Nederlandse) datasets. Lees hierover meer in de From ef75bd4b0c45df8124cb42b52ed4dc648b7c6ccf Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 18 Jun 2026 13:24:31 +0200 Subject: [PATCH 10/21] Locales dashboard items --- config/interface/dashboard_items.yml | 4 ++-- config/locales/interface/en_dashboard_items.yml | 11 +++++++++-- config/locales/interface/nl_dashboard_items.yml | 11 +++++++++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/config/interface/dashboard_items.yml b/config/interface/dashboard_items.yml index d83089546b..ca0d18b5d6 100644 --- a/config/interface/dashboard_items.yml +++ b/config/interface/dashboard_items.yml @@ -28,13 +28,13 @@ disabled: false output_element_key: emissions_overview - key: direct_emissions_total_ghg_relative_to_1990 - gquery_key: dashboard_reduction_of_direct_ghg_emissions_versus_1990 + gquery_key: dashboard_direct_emissions_reduction_of_total_ghg_emissions_versus_1990 group: emissions position: 140 disabled: false output_element_key: direct_emissions_per_sector - key: direct_emissions_total_ghg - gquery_key: direct_emissions_total_ghg_incl_indirect_emissions_lulucf_bunkers + gquery_key: dashboard_direct_emissions_total_ghg_emissions group: emissions position: 150 disabled: false diff --git a/config/locales/interface/en_dashboard_items.yml b/config/locales/interface/en_dashboard_items.yml index e4854ff9a5..35768cf668 100644 --- a/config/locales/interface/en_dashboard_items.yml +++ b/config/locales/interface/en_dashboard_items.yml @@ -160,10 +160,13 @@ en: title: Direct total GHG emissions relative to 1990 description: | This dashboard item represents the reduction in direct total greenhouse gas emissions - relative to total greenhouse gas emissions in 1990. The year 1990 is often used as a - reference year in greenhouse gas emission targets. The chart below shows the direct + relative to total greenhouse gas emissions in 1990. The chart below shows the direct greenhouse gas emissions per sector for 1990, the start year and the future year.

+ The total emissions include indirect emissions and LULUCF. Emissions from international + transport are included if the scenario is set to include demand from + + international transport.

Note: the emissions in this dashboard item and the chart below are calculated based on direct emissions. This emission method is currently in beta release and is not yet fully available for regional (Dutch) datasets. Read more about this in the @@ -176,6 +179,10 @@ en: This dashboard item represents the direct total greenhouse gas emissions in the future year. The chart below shows the direct greenhouse gas emissions per sector for 1990, the start year and the future year.

+ The total emissions include indirect emissions and LULUCF. Emissions from international + transport are included if the scenario is set to include demand from + + international transport.

Note: the emissions in this dashboard item and the chart below are calculated based on direct emissions. This emission method is currently in beta release and is not yet fully available for regional (Dutch) datasets. Read more about this in the diff --git a/config/locales/interface/nl_dashboard_items.yml b/config/locales/interface/nl_dashboard_items.yml index bc764509ad..2abe8a40c8 100644 --- a/config/locales/interface/nl_dashboard_items.yml +++ b/config/locales/interface/nl_dashboard_items.yml @@ -158,10 +158,13 @@ nl: title: Directe totale broeikasgasemissies t.o.v. 1990 (beta release) description: | Dit dashboarditem representeert de reductie in directe totale broeikasgasemissies - ten opzichte van de totale broeikasgasemissies in 1990. Het jaar 1990 wordt vaak als - referentiejaar gebruikt in doelstellingen omtrent broeikasgasemissies. Onderstaande grafiek + ten opzichte van de totale broeikasgasemissies in 1990. Onderstaande grafiek toont de directe broeikasgasemissies per sector voor 1990, het startjaar en toekomstjaar.

+ De totale emissies zijn inclusief indirecte emissies en LULUCF. Emissies van internationaal + transport worden meegenomen als voor het scenario is ingesteld dat de vraag van + + internationaal transport wordt meegenomen.

Let op: de emissies in dit dashboarditem en onderstaande grafiek zijn berekend op basis van directe emissies. Deze emissiemethode is momenteel in beta release en is nog niet volledig beschikbaar voor de regionale (Nederlandse) datasets. Lees hierover meer in de @@ -174,6 +177,10 @@ nl: Dit dashboarditem representeert de directe totale broeikasgasemissies in het toekomstjaar. Onderstaande grafiek toont de directe broeikasgasemissies per sector voor 1990, het startjaar en toekomstjaar.

+ De totale emissies zijn inclusief indirecte emissies en LULUCF. Emissies van internationaal + transport worden meegenomen als voor het scenario is ingesteld dat de vraag van + + internationaal transport wordt meegenomen.

Let op: de emissies in dit dashboarditem en onderstaande grafiek zijn berekend op basis van directe emissies. Deze emissiemethode is momenteel in beta release en is nog niet volledig beschikbaar voor de regionale (Nederlandse) datasets. Lees hierover meer in de From 9d3a83eb12dec15a4b7157965f207bff90f1ebe5 Mon Sep 17 00:00:00 2001 From: louispt1 Date: Thu, 18 Jun 2026 14:23:21 +0200 Subject: [PATCH 11/21] Fix target line bug --- .../direct_emissions_per_sector.yml | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/config/interface/output_element_series/direct_emissions_per_sector.yml b/config/interface/output_element_series/direct_emissions_per_sector.yml index d486c46c62..4873592aeb 100644 --- a/config/interface/output_element_series/direct_emissions_per_sector.yml +++ b/config/interface/output_element_series/direct_emissions_per_sector.yml @@ -252,20 +252,7 @@ dependent_on: output_element_key: direct_emissions_per_sector key: direct_emissions_per_sector_bunkers_1990 - # 1990, present and future net total GHG emissions target line -- label: direct_emissions_total_ghg - color: "#FF0000" - order_by: 300 - group: '' - show_at_first: false - is_target_line: true - target_line_position: '0' - gquery: direct_emissions_total_ghg_1990_for_direct_emissions_chart - is_1990: true - dependent_on: - output_element_key: direct_emissions_per_sector - key: direct_emissions_per_sector_total_ghg_1990 - label: direct_emissions_total_ghg color: "#FF0000" order_by: 310 @@ -290,3 +277,15 @@ dependent_on: output_element_key: direct_emissions_per_sector key: direct_emissions_per_sector_total_ghg_future +- label: direct_emissions_total_ghg + color: "#FF0000" + order_by: 330 + group: '' + show_at_first: false + is_target_line: true + target_line_position: '0' + gquery: direct_emissions_total_ghg_1990_for_direct_emissions_chart + is_1990: true + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_total_ghg_1990 From 308e7a8588c794014f790331a7c3970e5dbe05a4 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Thu, 18 Jun 2026 14:30:22 +0200 Subject: [PATCH 12/21] Update comment --- .../output_element_series/direct_emissions_per_sector.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/interface/output_element_series/direct_emissions_per_sector.yml b/config/interface/output_element_series/direct_emissions_per_sector.yml index 4873592aeb..ed10080593 100644 --- a/config/interface/output_element_series/direct_emissions_per_sector.yml +++ b/config/interface/output_element_series/direct_emissions_per_sector.yml @@ -252,7 +252,8 @@ dependent_on: output_element_key: direct_emissions_per_sector key: direct_emissions_per_sector_bunkers_1990 -# 1990, present and future net total GHG emissions target line + +# taget line present and future net total GHG emissions - label: direct_emissions_total_ghg color: "#FF0000" order_by: 310 @@ -277,6 +278,9 @@ dependent_on: output_element_key: direct_emissions_per_sector key: direct_emissions_per_sector_total_ghg_future + +# taget line 1990 total GHG emissions +# order_by should be higher than present and future target line to show correct totals in table view - label: direct_emissions_total_ghg color: "#FF0000" order_by: 330 From 1d49624fbd64c4113d12675eebed15b026c7ec3b Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Tue, 30 Jun 2026 08:55:16 +0200 Subject: [PATCH 13/21] Locales --- config/locales/interface/en_dashboard_items.yml | 4 ++-- config/locales/interface/nl_dashboard_items.yml | 4 ++-- config/locales/interface/output_elements/en_overview.yml | 2 +- config/locales/interface/output_elements/nl_overview.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/locales/interface/en_dashboard_items.yml b/config/locales/interface/en_dashboard_items.yml index 35768cf668..9e891604c9 100644 --- a/config/locales/interface/en_dashboard_items.yml +++ b/config/locales/interface/en_dashboard_items.yml @@ -149,7 +149,7 @@ en: In the chart below you can see the curtailed volume, compared to other uses of flexible electricity demand. all_ghg_reduction_relative_to_start_year: label: Greenhouse gases - title: Total GHG emissions relative to start year (beta release) + title: Total GHG emissions relative to start year (beta) description: 'The ETM calculates the amount of CO2 that is emitted as a result of energy use. However, there are also non-energetic sources of CO2 as well as other important greenhouse gases, such as methane (CH4) or nitrous oxide (N2O), @@ -174,7 +174,7 @@ en: target="_blank">documentation. direct_emissions_total_ghg: label: GHG emissions - title: Direct total GHG emissions (beta release) + title: Direct total GHG emissions (beta) description: | This dashboard item represents the direct total greenhouse gas emissions in the future year. The chart below shows the direct greenhouse gas emissions per sector for 1990, the diff --git a/config/locales/interface/nl_dashboard_items.yml b/config/locales/interface/nl_dashboard_items.yml index 2abe8a40c8..d47bfe1ad0 100644 --- a/config/locales/interface/nl_dashboard_items.yml +++ b/config/locales/interface/nl_dashboard_items.yml @@ -155,7 +155,7 @@ nl: emissies. Dit geeft een beeld van de totale broeikasemissies in het gebied." direct_emissions_total_ghg_relative_to_1990: label: Broeikasgasemissies t.o.v. 1990 - title: Directe totale broeikasgasemissies t.o.v. 1990 (beta release) + title: Directe totale broeikasgasemissies t.o.v. 1990 (beta) description: | Dit dashboarditem representeert de reductie in directe totale broeikasgasemissies ten opzichte van de totale broeikasgasemissies in 1990. Onderstaande grafiek @@ -172,7 +172,7 @@ nl: target="_blank">documentatie. direct_emissions_total_ghg: label: Broeikasgasemissies - title: Directe totale broeikasgasemissies (beta release) + title: Directe totale broeikasgasemissies (beta) description: | Dit dashboarditem representeert de directe totale broeikasgasemissies in het toekomstjaar. Onderstaande grafiek toont de directe broeikasgasemissies per sector voor 1990, het diff --git a/config/locales/interface/output_elements/en_overview.yml b/config/locales/interface/output_elements/en_overview.yml index 5899114aa1..eeefc0014d 100644 --- a/config/locales/interface/output_elements/en_overview.yml +++ b/config/locales/interface/output_elements/en_overview.yml @@ -27,7 +27,7 @@ en: target="_blank">1990 emissions and the emissions per sector in the ETM. direct_emissions_per_sector: - title: Direct total GHG emissions (beta release) + title: Direct total GHG emissions (beta) short_description: description: | This chart compares total GHG emissions in 1990, the present and the future. diff --git a/config/locales/interface/output_elements/nl_overview.yml b/config/locales/interface/output_elements/nl_overview.yml index e6ade9f607..0f9a2d49ce 100644 --- a/config/locales/interface/output_elements/nl_overview.yml +++ b/config/locales/interface/output_elements/nl_overview.yml @@ -29,7 +29,7 @@ nl: target="_blank">emissies per sector in het ETM. direct_emissions_per_sector: direct_emissions_per_sector: - title: Directe totale broeikasgasemissies (beta release) + title: Directe totale broeikasgasemissies (beta) short_description: description: | Deze grafiek vergelijkt de uitstoot van broeikasgassen From 3e4da69aa6ed078f02bbcf7cebef15d86a04f5d6 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Tue, 30 Jun 2026 09:58:44 +0200 Subject: [PATCH 14/21] Correction in label --- config/locales/interface/en_dashboard_items.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/interface/en_dashboard_items.yml b/config/locales/interface/en_dashboard_items.yml index 9e891604c9..dd7aa407c8 100644 --- a/config/locales/interface/en_dashboard_items.yml +++ b/config/locales/interface/en_dashboard_items.yml @@ -149,7 +149,7 @@ en: In the chart below you can see the curtailed volume, compared to other uses of flexible electricity demand. all_ghg_reduction_relative_to_start_year: label: Greenhouse gases - title: Total GHG emissions relative to start year (beta) + title: Total GHG emissions relative to start year description: 'The ETM calculates the amount of CO2 that is emitted as a result of energy use. However, there are also non-energetic sources of CO2 as well as other important greenhouse gases, such as methane (CH4) or nitrous oxide (N2O), @@ -157,7 +157,7 @@ en: resulting in an overview of all greenhouse gas emissions.' direct_emissions_total_ghg_relative_to_1990: label: GHG relative to 1990 - title: Direct total GHG emissions relative to 1990 + title: Direct total GHG emissions relative to 1990 (beta) description: | This dashboard item represents the reduction in direct total greenhouse gas emissions relative to total greenhouse gas emissions in 1990. The chart below shows the direct From 50d5b9b250cafa6279b944da6886bd6d69bc24c1 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Fri, 10 Jul 2026 09:13:24 +0200 Subject: [PATCH 15/21] Move GHG chart to chart emission section chart overview --- config/interface/output_elements/emissions.yml | 13 +++++++++++++ config/interface/output_elements/overview.yml | 13 ------------- .../interface/output_elements/en_emissions.yml | 14 +++++++++++++- .../interface/output_elements/en_overview.yml | 12 ------------ .../interface/output_elements/nl_emissions.yml | 14 +++++++++++++- .../interface/output_elements/nl_overview.yml | 13 ------------- 6 files changed, 39 insertions(+), 40 deletions(-) diff --git a/config/interface/output_elements/emissions.yml b/config/interface/output_elements/emissions.yml index 90ed588f87..47f4b31ae6 100644 --- a/config/interface/output_elements/emissions.yml +++ b/config/interface/output_elements/emissions.yml @@ -71,3 +71,16 @@ hidden: false requires_merit_order: false output_element_type_name: vertical_stacked_bar +- under_construction: false + unit: MT + percentage: false + group: emissions + show_point_label: false + growth_chart: false + key: direct_emissions_per_sector + max_axis_value: + min_axis_value: + hidden: false + requires_merit_order: false + dependent_on: + output_element_type_name: vertical_stacked_bar diff --git a/config/interface/output_elements/overview.yml b/config/interface/output_elements/overview.yml index f9edce689a..cfbf56329e 100644 --- a/config/interface/output_elements/overview.yml +++ b/config/interface/output_elements/overview.yml @@ -173,16 +173,3 @@ requires_merit_order: false dependent_on: output_element_type_name: mekko -- under_construction: false - unit: MT - percentage: false - group: Overview - show_point_label: false - growth_chart: false - key: direct_emissions_per_sector - max_axis_value: - min_axis_value: - hidden: false - requires_merit_order: false - dependent_on: - output_element_type_name: vertical_stacked_bar diff --git a/config/locales/interface/output_elements/en_emissions.yml b/config/locales/interface/output_elements/en_emissions.yml index 073112bced..853cb1efdb 100644 --- a/config/locales/interface/output_elements/en_emissions.yml +++ b/config/locales/interface/output_elements/en_emissions.yml @@ -26,9 +26,21 @@ en: short_description: description: "Emissions from transport are the result of freight transport, passenger transport, aviation or public transport. Apart from energetic CO2 emissions there are also non-energetic - CO2 emissions as a result of transport. This includes the emissions of international transport + CO2 emissions as a result of transport. This includes the emissions of international transport if you have allocted them to your scenario." emissions_indirect: title: Indirect and delayed CO2 emissions short_description: description: + direct_emissions_per_sector: + title: Direct total GHG emissions (beta) + short_description: + description: | + This chart compares total GHG emissions in 1990, the present and the future. + The year 1990 is often used as a reference year in emission targets. +

+ Note: the emissions are calculated based on direct emissions. This emissions method + is currently in beta release and is not yet completely availabe for regional (Dutch) + datasets. Read more in the + documentation. diff --git a/config/locales/interface/output_elements/en_overview.yml b/config/locales/interface/output_elements/en_overview.yml index eeefc0014d..ce0a83eed7 100644 --- a/config/locales/interface/output_elements/en_overview.yml +++ b/config/locales/interface/output_elements/en_overview.yml @@ -26,18 +26,6 @@ en: See our documentation for more info on the 1990 emissions and the emissions per sector in the ETM. - direct_emissions_per_sector: - title: Direct total GHG emissions (beta) - short_description: - description: | - This chart compares total GHG emissions in 1990, the present and the future. - The year 1990 is often used as a reference year in emission targets. -

- Note: the emissions are calculated based on direct emissions. This emissions method - is currently in beta release and is not yet completely availabe for regional (Dutch) - datasets. Read more in the - documentation. renewability: title: Renewability of final demand short_description: '' diff --git a/config/locales/interface/output_elements/nl_emissions.yml b/config/locales/interface/output_elements/nl_emissions.yml index 33a84ac6b5..a9ee7d2b19 100644 --- a/config/locales/interface/output_elements/nl_emissions.yml +++ b/config/locales/interface/output_elements/nl_emissions.yml @@ -25,9 +25,21 @@ nl: title: Broeikasgasemissies Transport (CO2-eq) short_description: description: "Emissies uit transport is een gevolg van vrachtvervoer, privévervoer, - de luchtvaart of openbaar vervoer. Dit is inclusief de emissies van internationaal + de luchtvaart of openbaar vervoer. Dit is inclusief de emissies van internationaal transport, als je die aan je scenario gealloceerd hebt." emissions_indirect: title: Indirecte en uitgestelde CO2-emissies short_description: description: + direct_emissions_per_sector: + title: Directe totale broeikasgasemissies (beta) + short_description: + description: | + Deze grafiek vergelijkt de uitstoot van broeikasgassen + in 1990, het heden en de toekomst. Het jaar 1990 wordt vaak als referentiejaar + gebruikt in doelstellingen omtrent broeikasgasemissies.

+ Let op: de emissies zijn berekend op basis van directe emissies. Deze + emissiemethode is momenteel in beta release en is nog niet volledig beschikbaar voor de + regionale (Nederlandse) datasets. Lees hierover meer in de + documentatie. diff --git a/config/locales/interface/output_elements/nl_overview.yml b/config/locales/interface/output_elements/nl_overview.yml index 0f9a2d49ce..a461276883 100644 --- a/config/locales/interface/output_elements/nl_overview.yml +++ b/config/locales/interface/output_elements/nl_overview.yml @@ -27,19 +27,6 @@ nl: Raadpleeg de documentatie voor meer informatie over de 1990 emissies en de emissies per sector in het ETM. - direct_emissions_per_sector: - direct_emissions_per_sector: - title: Directe totale broeikasgasemissies (beta) - short_description: - description: | - Deze grafiek vergelijkt de uitstoot van broeikasgassen - in 1990, het heden en de toekomst. Het jaar 1990 wordt vaak als referentiejaar - gebruikt in doelstellingen omtrent broeikasgasemissies.

- Let op: de emissies zijn berekend op basis van directe emissies. Deze - emissiemethode is momenteel in beta release en is nog niet volledig beschikbaar voor de - regionale (Nederlandse) datasets. Lees hierover meer in de - documentatie. renewability: title: Hernieuwbaarheid van eindgebruik short_description: '' From f997d3e2fc08c9574cacdbd8f70831d9e2f5a887 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Fri, 10 Jul 2026 10:18:22 +0200 Subject: [PATCH 16/21] Set direct emissions chart as default for emissions data export slide --- config/interface/slides/data_export.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/interface/slides/data_export.yml b/config/interface/slides/data_export.yml index 32c60de9c0..78da367485 100644 --- a/config/interface/slides/data_export.yml +++ b/config/interface/slides/data_export.yml @@ -15,7 +15,7 @@ - key: data_export_emissions position: 107 sidebar_item_key: data_export - output_element_key: co2_emissions + output_element_key: direct_emissions_per_sector - key: data_export_molecule_flows position: 205 sidebar_item_key: data_export From b7317b11a432bf0c816ac11dce17a2453988baf4 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Fri, 10 Jul 2026 10:43:58 +0200 Subject: [PATCH 17/21] Fix dashboard items visibility --- config/interface/dashboard_items.yml | 126 +++++++++++++-------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/config/interface/dashboard_items.yml b/config/interface/dashboard_items.yml index ca0d18b5d6..6276801388 100644 --- a/config/interface/dashboard_items.yml +++ b/config/interface/dashboard_items.yml @@ -1,158 +1,158 @@ --- +# primary energy +- key: total_primary_energy + gquery_key: dashboard_energy_demand_primary_of_final_plus_export_losses + group: energy_use + position: 1 + disabled: false + output_element_key: use_of_primary_energy + dependent_on: '' + # emissions - key: co2_reduction gquery_key: dashboard_reduction_of_co2_emissions_versus_1990 group: emissions - position: 100 + position: 2 disabled: false output_element_key: co2_emissions dependent_on: '' - key: co2_reduction_relative_to_start_year gquery_key: dashboard_co2_emissions_versus_start_year group: emissions - position: 110 + position: disabled: false output_element_key: co2_emissions dependent_on: '' - key: local_co2_reduction gquery_key: dashboard_reduction_of_local_co2_emissions_versus_1990 group: emissions - position: 120 + position: disabled: false output_element_key: co2_emissions dependent_on: '' - key: all_ghg_reduction_relative_to_start_year gquery_key: dashboard_emissions group: emissions - position: 130 + position: disabled: false output_element_key: emissions_overview - key: direct_emissions_total_ghg_relative_to_1990 gquery_key: dashboard_direct_emissions_reduction_of_total_ghg_emissions_versus_1990 group: emissions - position: 140 + position: disabled: false output_element_key: direct_emissions_per_sector - key: direct_emissions_total_ghg gquery_key: dashboard_direct_emissions_total_ghg_emissions group: emissions - position: 150 + position: disabled: false output_element_key: direct_emissions_per_sector +# import +- key: net_energy_import + gquery_key: dashboard_energy_import_netto + group: import + position: 3 + disabled: false + output_element_key: + dependent_on: '' + # costs - key: total_energy_cost gquery_key: dashboard_total_costs group: costs - position: 200 + position: 3 disabled: false output_element_key: costs_overview dependent_on: - key: profitability gquery_key: dashboard_profitability group: costs - position: 210 + position: disabled: false output_element_key: power_plant_economic_performance dependent_on: has_merit_order -# primary energy -- key: total_primary_energy - gquery_key: dashboard_energy_demand_primary_of_final_plus_export_losses - group: energy_use - position: 300 - disabled: false - output_element_key: use_of_primary_energy - dependent_on: '' - -# biomass -- key: biomass_primary_demand - gquery_key: dashboard_biomass_primary_demand - group: footprint - position: 400 - disabled: false - output_element_key: biomass_demand_by_category - dependent_on: '' -- key: biomass_final_demand - gquery_key: dashboard_biomass_final_demand - group: footprint - position: 410 - disabled: false - output_element_key: biomass_demand_by_category - dependent_on: '' -- key: biomass_import_share - gquery_key: dashboard_biomass_import_share - group: footprint - position: 420 - disabled: false - output_element_key: biomass_sankey - dependent_on: '' - -# import -- key: net_energy_import - gquery_key: dashboard_energy_import_netto - group: import - position: 500 - disabled: false - output_element_key: - dependent_on: '' - # renewable - key: renewable_percentage gquery_key: dashboard_renewability group: renewable - position: 600 + position: 4 disabled: false output_element_key: renewability dependent_on: '' - key: renewable_electricity_percentage gquery_key: dashboard_share_of_renewable_electricity group: renewable - position: 610 + position: disabled: false output_element_key: renewable_electricity dependent_on: '' - key: renewable_percentage_households gquery_key: dashboard_renewability_households group: renewable - position: 620 + position: disabled: false output_element_key: renewability dependent_on: # summary -- key: loss_of_load - gquery_key: dashboard_security_of_supply - group: summary - position: 700 - disabled: false - output_element_key: security_of_supply - dependent_on: '' - key: power_shortage_hours gquery_key: dashboard_power_shortage_hours group: summary - position: 710 + position: 6 disabled: false output_element_key: power_shortage dependent_on: has_merit_order +- key: loss_of_load + gquery_key: dashboard_security_of_supply + group: summary + position: + disabled: false + output_element_key: security_of_supply + dependent_on: '' - key: total_number_of_excess_events gquery_key: dashboard_total_number_of_excess_events group: summary - position: 720 + position: disabled: false output_element_key: merit_order_excess_events dependent_on: '' - key: total_curtailment gquery_key: dashboard_total_curtailment group: summary - position: 730 + position: disabled: false output_element_key: use_of_excess_electricity dependent_on: - key: share_of_curtailment gquery_key: dashboard_share_of_curtailment_in_inflexible_production group: summary - position: 740 + position: disabled: false output_element_key: use_of_excess_electricity dependent_on: + +# biomass +- key: biomass_import_share + gquery_key: dashboard_biomass_import_share + group: footprint + position: 7 + disabled: false + output_element_key: biomass_sankey + dependent_on: '' +- key: biomass_primary_demand + gquery_key: dashboard_biomass_primary_demand + group: footprint + position: + disabled: false + output_element_key: biomass_demand_by_category + dependent_on: '' +- key: biomass_final_demand + gquery_key: dashboard_biomass_final_demand + group: footprint + position: + disabled: false + output_element_key: biomass_demand_by_category + dependent_on: '' From 4efe203af36cea91938839bb0e24b371cab4e79d Mon Sep 17 00:00:00 2001 From: Mathijs Bijkerk Date: Tue, 14 Jul 2026 13:40:04 +0200 Subject: [PATCH 18/21] Remove redundant styling --- .../output_element_series/co2_emissions.yml | 2 +- .../direct_emissions_per_sector.yml | 86 +++++++++---------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/config/interface/output_element_series/co2_emissions.yml b/config/interface/output_element_series/co2_emissions.yml index faa2a108cf..eb1195aa26 100644 --- a/config/interface/output_element_series/co2_emissions.yml +++ b/config/interface/output_element_series/co2_emissions.yml @@ -106,7 +106,7 @@ is_1990: false dependent_on: output_element_key: co2_emissions - key: delayed_co2_emissions + key: delayed_co2_emissions - label: bunkers color: "#82589F" order_by: 50 diff --git a/config/interface/output_element_series/direct_emissions_per_sector.yml b/config/interface/output_element_series/direct_emissions_per_sector.yml index ed10080593..987d98b9e4 100644 --- a/config/interface/output_element_series/direct_emissions_per_sector.yml +++ b/config/interface/output_element_series/direct_emissions_per_sector.yml @@ -3,10 +3,10 @@ - label: energy color: "#416B86" order_by: 100 - group: '' + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: direct_emissions_energy_total_ghg_for_direct_emissions_chart is_1990: dependent_on: @@ -15,10 +15,10 @@ - label: industry color: "#A9A9A9" order_by: 110 - group: '' + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: direct_emissions_industry_total_ghg_for_direct_emissions_chart is_1990: dependent_on: @@ -27,10 +27,10 @@ - label: transport color: "#8B0000" order_by: 120 - group: '' + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: direct_emissions_transport_total_ghg_for_direct_emissions_chart is_1990: dependent_on: @@ -39,10 +39,10 @@ - label: buildings color: "#ADD8E6" order_by: 130 - group: '' + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: direct_emissions_buildings_total_ghg_for_direct_emissions_chart is_1990: dependent_on: @@ -51,10 +51,10 @@ - label: households color: "#4169E1" order_by: 140 - group: '' + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: direct_emissions_households_total_ghg_for_direct_emissions_chart is_1990: dependent_on: @@ -63,10 +63,10 @@ - label: agriculture color: "#FFD700" order_by: 150 - group: '' + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: direct_emissions_agriculture_total_ghg_for_direct_emissions_chart is_1990: dependent_on: @@ -75,10 +75,10 @@ - label: other color: "#E07033" order_by: 160 - group: '' + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: direct_emissions_other_total_ghg_for_direct_emissions_chart is_1990: dependent_on: @@ -87,10 +87,10 @@ - label: lulucf color: "#C377C3" order_by: 170 - group: '' + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: direct_emissions_lulucf_total_ghg_for_direct_emissions_chart is_1990: dependent_on: @@ -99,10 +99,10 @@ - label: waste color: "#6D6D6D" order_by: 180 - group: '' + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: direct_emissions_waste_total_ghg_for_direct_emissions_chart is_1990: dependent_on: @@ -111,10 +111,10 @@ - label: bunkers color: "#82589F" order_by: 190 - group: '' + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: direct_emissions_bunkers_total_ghg_for_direct_emissions_chart is_1990: false dependent_on: @@ -125,10 +125,10 @@ - label: energy color: "#416B86" order_by: 200 - group: '' + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: direct_emissions_energy_total_ghg_1990_for_direct_emissions_chart is_1990: true hide_label: true @@ -138,10 +138,10 @@ - label: industry color: "#A9A9A9" order_by: 210 - group: '' + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: direct_emissions_industry_total_ghg_1990_for_direct_emissions_chart is_1990: true hide_label: true @@ -151,10 +151,10 @@ - label: transport color: "#8B0000" order_by: 220 - group: '' + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: direct_emissions_transport_total_ghg_1990_for_direct_emissions_chart is_1990: true hide_label: true @@ -164,10 +164,10 @@ - label: buildings color: "#ADD8E6" order_by: 230 - group: '' + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: direct_emissions_buildings_total_ghg_1990_for_direct_emissions_chart is_1990: true hide_label: true @@ -177,10 +177,10 @@ - label: households color: "#4169E1" order_by: 240 - group: '' + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: direct_emissions_households_total_ghg_1990_for_direct_emissions_chart is_1990: true hide_label: true @@ -190,10 +190,10 @@ - label: agriculture color: "#FFD700" order_by: 250 - group: '' + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: direct_emissions_agriculture_total_ghg_1990_for_direct_emissions_chart is_1990: true hide_label: true @@ -203,10 +203,10 @@ - label: other color: "#E07033" order_by: 260 - group: '' + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: direct_emissions_other_total_ghg_1990_for_direct_emissions_chart is_1990: true hide_label: true @@ -216,10 +216,10 @@ - label: lulucf color: "#C377C3" order_by: 270 - group: '' + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: direct_emissions_lulucf_total_ghg_1990_for_direct_emissions_chart is_1990: true hide_label: true @@ -229,10 +229,10 @@ - label: waste color: "#6D6D6D" order_by: 280 - group: '' + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: direct_emissions_waste_total_ghg_1990_for_direct_emissions_chart is_1990: true hide_label: true @@ -242,10 +242,10 @@ - label: bunkers color: "#82589F" order_by: 290 - group: '' + group: show_at_first: false is_target_line: false - target_line_position: '' + target_line_position: gquery: direct_emissions_bunkers_total_ghg_1990_for_direct_emissions_chart is_1990: true hide_label: true @@ -257,7 +257,7 @@ - label: direct_emissions_total_ghg color: "#FF0000" order_by: 310 - group: '' + group: show_at_first: false is_target_line: true target_line_position: '1' @@ -269,7 +269,7 @@ - label: direct_emissions_total_ghg color: "#FF0000" order_by: 320 - group: '' + group: show_at_first: false is_target_line: true target_line_position: '2' @@ -284,7 +284,7 @@ - label: direct_emissions_total_ghg color: "#FF0000" order_by: 330 - group: '' + group: show_at_first: false is_target_line: true target_line_position: '0' From 65b34aba030de2da032e8fbf4f12bd498dbaaadb Mon Sep 17 00:00:00 2001 From: Mathijs Bijkerk Date: Tue, 14 Jul 2026 13:57:40 +0200 Subject: [PATCH 19/21] Revise emissions dashboard labels --- config/locales/interface/en_dashboard_items.yml | 6 +++--- config/locales/interface/nl_dashboard_items.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/locales/interface/en_dashboard_items.yml b/config/locales/interface/en_dashboard_items.yml index dd7aa407c8..09d48dc987 100644 --- a/config/locales/interface/en_dashboard_items.yml +++ b/config/locales/interface/en_dashboard_items.yml @@ -149,7 +149,7 @@ en: In the chart below you can see the curtailed volume, compared to other uses of flexible electricity demand. all_ghg_reduction_relative_to_start_year: label: Greenhouse gases - title: Total GHG emissions relative to start year + title: GHG emissions relative to start year description: 'The ETM calculates the amount of CO2 that is emitted as a result of energy use. However, there are also non-energetic sources of CO2 as well as other important greenhouse gases, such as methane (CH4) or nitrous oxide (N2O), @@ -157,7 +157,7 @@ en: resulting in an overview of all greenhouse gas emissions.' direct_emissions_total_ghg_relative_to_1990: label: GHG relative to 1990 - title: Direct total GHG emissions relative to 1990 (beta) + title: Direct GHG emissions relative to 1990 (beta) description: | This dashboard item represents the reduction in direct total greenhouse gas emissions relative to total greenhouse gas emissions in 1990. The chart below shows the direct @@ -174,7 +174,7 @@ en: target="_blank">documentation. direct_emissions_total_ghg: label: GHG emissions - title: Direct total GHG emissions (beta) + title: Direct GHG emissions (beta) description: | This dashboard item represents the direct total greenhouse gas emissions in the future year. The chart below shows the direct greenhouse gas emissions per sector for 1990, the diff --git a/config/locales/interface/nl_dashboard_items.yml b/config/locales/interface/nl_dashboard_items.yml index d47bfe1ad0..9951913615 100644 --- a/config/locales/interface/nl_dashboard_items.yml +++ b/config/locales/interface/nl_dashboard_items.yml @@ -147,7 +147,7 @@ nl: In de grafiek hieronder kun je de productiebeperking zien, vergeleken met andere inzet van flexibele elektriciteitsvraag. all_ghg_reduction_relative_to_start_year: label: Broeikasgassen - title: Totale broeikasgasemissies t.o.v. startjaar + title: Broeikasgasemissies t.o.v. startjaar description: "Het ETM berekent de CO2 emissies die door energiegebruik worden uitgestoten. Echter bestaan er ook non-energetische bronnen van CO2 en andere broeikasgassen zoals methaan (CH4) lachgas (N2O). Het is belangrijk om ook deze emissies in kaart te brengen om een goed overzicht te hebben @@ -155,7 +155,7 @@ nl: emissies. Dit geeft een beeld van de totale broeikasemissies in het gebied." direct_emissions_total_ghg_relative_to_1990: label: Broeikasgasemissies t.o.v. 1990 - title: Directe totale broeikasgasemissies t.o.v. 1990 (beta) + title: Directe broeikasgasemissies t.o.v. 1990 (beta) description: | Dit dashboarditem representeert de reductie in directe totale broeikasgasemissies ten opzichte van de totale broeikasgasemissies in 1990. Onderstaande grafiek @@ -172,7 +172,7 @@ nl: target="_blank">documentatie. direct_emissions_total_ghg: label: Broeikasgasemissies - title: Directe totale broeikasgasemissies (beta) + title: Directe broeikasgasemissies (beta) description: | Dit dashboarditem representeert de directe totale broeikasgasemissies in het toekomstjaar. Onderstaande grafiek toont de directe broeikasgasemissies per sector voor 1990, het From 128e3a8a6c3457a957c705e6023dd90c0c1d5218 Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Wed, 15 Jul 2026 10:26:55 +0200 Subject: [PATCH 20/21] Update colours of LULUCF and Waste --- .../output_element_series/direct_emissions_per_sector.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/interface/output_element_series/direct_emissions_per_sector.yml b/config/interface/output_element_series/direct_emissions_per_sector.yml index 987d98b9e4..641248482e 100644 --- a/config/interface/output_element_series/direct_emissions_per_sector.yml +++ b/config/interface/output_element_series/direct_emissions_per_sector.yml @@ -85,7 +85,7 @@ output_element_key: direct_emissions_per_sector key: direct_emissions_per_sector_other - label: lulucf - color: "#C377C3" + color: "#A1DC8E" order_by: 170 group: show_at_first: false @@ -97,7 +97,7 @@ output_element_key: direct_emissions_per_sector key: direct_emissions_per_sector_lulucf - label: waste - color: "#6D6D6D" + color: "#245D11" order_by: 180 group: show_at_first: false @@ -214,7 +214,7 @@ output_element_key: direct_emissions_per_sector key: direct_emissions_per_sector_other_1990 - label: lulucf - color: "#C377C3" + color: "#A1DC8E" order_by: 270 group: show_at_first: false @@ -227,7 +227,7 @@ output_element_key: direct_emissions_per_sector key: direct_emissions_per_sector_lulucf_1990 - label: waste - color: "#6D6D6D" + color: "#245D11" order_by: 280 group: show_at_first: false From 97ad0a31d2dfc23e67f1389bc17dd5c565f63c9a Mon Sep 17 00:00:00 2001 From: Kyra de Haan Date: Wed, 15 Jul 2026 12:09:36 +0200 Subject: [PATCH 21/21] Improve dashboard item texts --- .../locales/interface/en_dashboard_items.yml | 59 ++++++++++--------- .../locales/interface/nl_dashboard_items.yml | 56 ++++++++++-------- 2 files changed, 62 insertions(+), 53 deletions(-) diff --git a/config/locales/interface/en_dashboard_items.yml b/config/locales/interface/en_dashboard_items.yml index 09d48dc987..3adeea1c57 100644 --- a/config/locales/interface/en_dashboard_items.yml +++ b/config/locales/interface/en_dashboard_items.yml @@ -42,6 +42,10 @@ en: label: CO2 relative to 1990 title: CO2 emissions relative to 1990 description: | + This dashboard item represents the reduction in total CO2 emissions + relative to 1990. The dashboard item relies on calculations based on + primary emissions. +

The year 1990 is used as reference year for the change in CO2 emissions shown in the dashboard. The chart below shows the CO2 emissions that result from the inland final consumption of energy. @@ -49,12 +53,20 @@ en: local_co2_reduction: label: Domestic CO2 emissions title: Domestic CO2 emissions - description: 'The year 1990 is used as reference year for the change in CO2 - emissions shown in the dashboard. ' + description: | + This dashboard item represents the reduction in total domestically produced CO2 + emissions relative to 1990. The dashboard item relies on calculations based on + primary emissions. +

+ The year 1990 is used as reference year for the change in CO2 + emissions shown in the dashboard. co2_reduction_relative_to_start_year: label: CO2 relative to start year title: CO2 emissions relative to start year - description: '' + description: | + This dashboard item represents the reduction in total CO2 emissions + relative to the start year. This dashboard item relies on calculations based on + primary emissions. costs_fte: label: FTE delta analysis title: FTE delta analysis @@ -150,41 +162,34 @@ en: all_ghg_reduction_relative_to_start_year: label: Greenhouse gases title: GHG emissions relative to start year - description: 'The ETM calculates the amount of CO2 that is emitted + description: | + This dashboard item represents the reduction in total greenhouse gas emissions + relative to the start year. This dashboard item relies on calculations based on + primary emissions. +

+ The ETM calculates the amount of CO2 that is emitted as a result of energy use. However, there are also non-energetic sources of CO2 as well as other important greenhouse gases, such as methane (CH4) or nitrous oxide (N2O), that should be considered. This graph shows these other emissions on top of the energetic CO2 emissions - resulting in an overview of all greenhouse gas emissions.' + resulting in an overview of all greenhouse gas emissions. direct_emissions_total_ghg_relative_to_1990: label: GHG relative to 1990 title: Direct GHG emissions relative to 1990 (beta) description: | - This dashboard item represents the reduction in direct total greenhouse gas emissions - relative to total greenhouse gas emissions in 1990. The chart below shows the direct - greenhouse gas emissions per sector for 1990, the start year and the future year. + This dashboard item represents the reduction in total greenhouse gas emissions + relative to total greenhouse gas emissions in 1990. The dashboard item relies on + calculations based on direct emissions.

- The total emissions include indirect emissions and LULUCF. Emissions from international - transport are included if the scenario is set to include demand from - - international transport.

- Note: the emissions in this dashboard item and the chart below are calculated based - on direct emissions. This emission method is currently in beta release and is not yet - fully available for regional (Dutch) datasets. Read more about this in the - documentation. direct_emissions_total_ghg: label: GHG emissions title: Direct GHG emissions (beta) description: | - This dashboard item represents the direct total greenhouse gas emissions in the future year. - The chart below shows the direct greenhouse gas emissions per sector for 1990, the - start year and the future year.

- The total emissions include indirect emissions and LULUCF. Emissions from international - transport are included if the scenario is set to include demand from - - international transport.

- Note: the emissions in this dashboard item and the chart below are calculated based - on direct emissions. This emission method is currently in beta release and is not yet - fully available for regional (Dutch) datasets. Read more about this in the - direct emissions. +

+ Note: the direct emissions method is currently in beta release. Read more about this method + in the documentation. diff --git a/config/locales/interface/nl_dashboard_items.yml b/config/locales/interface/nl_dashboard_items.yml index 9951913615..524295944e 100644 --- a/config/locales/interface/nl_dashboard_items.yml +++ b/config/locales/interface/nl_dashboard_items.yml @@ -42,18 +42,29 @@ nl: label: CO2 t.o.v. 1990 title: CO2-uitstoot t.o.v. 1990 description: | + Dit dashboarditem representeert de reductie in totale CO2 emissies + ten opzichte van 1990. Het dashboarditem berust op de berekening van primaire emissies. +

Het jaar 1990 wordt als referentiejaar gebruikt voor de verandering in CO2 uitstoot getoond in het dashboard. Je kunt meer informatie vinden over deze grafiek in de documentatie. local_co2_reduction: label: Binnenlandse CO2-uitstoot title: Binnenlandse CO2-uitstoot - description: Het jaar 1990 wordt als referentiejaar gebruikt voor de verandering + description: | + Dit dashboarditem representeert de reductie in totale binnenlands geproduceerde + CO2 emissies ten opzichte van 1990. Het dashboarditem berust op de berekening van + primaire emissies. +

+ Het jaar 1990 wordt als referentiejaar gebruikt voor de verandering in CO2 uitstoot getoond in het dashboard co2_reduction_relative_to_start_year: label: CO2 t.o.v. startjaar title: CO2-uitstoot t.o.v. startjaar - description: '' + description: | + Dit dashboarditem representeert de reductie in totale CO2 emissies + ten opzichte van het startjaar. Het dashboarditem berust op de berekening van + primaire emissies. costs_fte: label: FTE delta analyse title: FTE delta analyse @@ -148,41 +159,34 @@ nl: all_ghg_reduction_relative_to_start_year: label: Broeikasgassen title: Broeikasgasemissies t.o.v. startjaar - description: "Het ETM berekent de CO2 emissies die door energiegebruik worden uitgestoten. + description: | + Dit dashboarditem representeert de reductie in totale broeikasgasemissies + ten opzichte van het startjaar. Het dashboarditem berust op de berekening van + primaire emissies. +

+ Het ETM berekent de CO2 emissies die door energiegebruik worden uitgestoten. Echter bestaan er ook non-energetische bronnen van CO2 en andere broeikasgassen zoals methaan (CH4) lachgas (N2O). Het is belangrijk om ook deze emissies in kaart te brengen om een goed overzicht te hebben van de totale emissies van een gebied. Deze grafiek laat deze overige emissies zien bovenop de energetische CO2 - emissies. Dit geeft een beeld van de totale broeikasemissies in het gebied." + emissies. Dit geeft een beeld van de totale broeikasemissies in het gebied. direct_emissions_total_ghg_relative_to_1990: label: Broeikasgasemissies t.o.v. 1990 title: Directe broeikasgasemissies t.o.v. 1990 (beta) description: | - Dit dashboarditem representeert de reductie in directe totale broeikasgasemissies - ten opzichte van de totale broeikasgasemissies in 1990. Onderstaande grafiek - toont de directe broeikasgasemissies per sector voor 1990, het startjaar en toekomstjaar. + Dit dashboarditem representeert de reductie in totale broeikasgasemissies + ten opzichte van de totale broeikasgasemissies in 1990. Het dashboarditem berust op + berekeningen van directe emissies.

- De totale emissies zijn inclusief indirecte emissies en LULUCF. Emissies van internationaal - transport worden meegenomen als voor het scenario is ingesteld dat de vraag van - - internationaal transport wordt meegenomen.

- Let op: de emissies in dit dashboarditem en onderstaande grafiek zijn berekend op basis - van directe emissies. Deze emissiemethode is momenteel in beta release en is nog niet - volledig beschikbaar voor de regionale (Nederlandse) datasets. Lees hierover meer in de - documentatie. direct_emissions_total_ghg: label: Broeikasgasemissies title: Directe broeikasgasemissies (beta) description: | - Dit dashboarditem representeert de directe totale broeikasgasemissies in het toekomstjaar. - Onderstaande grafiek toont de directe broeikasgasemissies per sector voor 1990, het - startjaar en toekomstjaar.

- De totale emissies zijn inclusief indirecte emissies en LULUCF. Emissies van internationaal - transport worden meegenomen als voor het scenario is ingesteld dat de vraag van - - internationaal transport wordt meegenomen.

- Let op: de emissies in dit dashboarditem en onderstaande grafiek zijn berekend op basis - van directe emissies. Deze emissiemethode is momenteel in beta release en is nog niet - volledig beschikbaar voor de regionale (Nederlandse) datasets. Lees hierover meer in de - directe emissies. +

+ Let op: de directe emissiemethode is momenteel in beta release. Lees meer over deze + methode in de documentatie.