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/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/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/dashboard_item.rb b/app/models/dashboard_item.rb index bcdc05f587..920338fd9d 100644 --- a/app/models/dashboard_item.rb +++ b/app/models/dashboard_item.rb @@ -12,7 +12,7 @@ class DashboardItem < YModel::Base # dashboard views. GROUPS = %w[ energy_use - co2 + emissions import costs footprint 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/dashboard_items.yml b/config/interface/dashboard_items.yml index 064c1c7b7b..6276801388 100644 --- a/config/interface/dashboard_items.yml +++ b/config/interface/dashboard_items.yml @@ -1,46 +1,87 @@ --- +# primary energy - key: total_primary_energy gquery_key: dashboard_energy_demand_primary_of_final_plus_export_losses group: energy_use - position: 2 + 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: co2 - position: 1 + group: emissions + 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: + 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: disabled: false output_element_key: co2_emissions dependent_on: '' +- key: all_ghg_reduction_relative_to_start_year + gquery_key: dashboard_emissions + group: emissions + 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: + 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: + disabled: false + output_element_key: direct_emissions_per_sector + +# import - key: net_energy_import gquery_key: dashboard_energy_import_netto group: import - position: 6 + position: 3 disabled: false output_element_key: dependent_on: '' + +# costs - key: total_energy_cost gquery_key: dashboard_total_costs group: costs - position: 4 + position: 3 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 + +# renewable - key: renewable_percentage gquery_key: dashboard_renewability group: renewable - position: 5 + position: 4 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,27 +89,29 @@ disabled: false output_element_key: renewable_electricity 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: local_co2_reduction - gquery_key: dashboard_reduction_of_local_co2_emissions_versus_1990 - group: co2 +- key: renewable_percentage_households + gquery_key: dashboard_renewability_households + group: renewable position: disabled: false - output_element_key: co2_emissions - dependent_on: '' + output_element_key: renewability + dependent_on: + +# summary - key: power_shortage_hours gquery_key: dashboard_power_shortage_hours group: summary - position: 7 + 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 @@ -90,20 +133,15 @@ 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: + +# biomass +- key: biomass_import_share + gquery_key: dashboard_biomass_import_share + group: footprint + position: 7 disabled: false - output_element_key: co2_emissions + output_element_key: biomass_sankey 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 @@ -118,16 +156,3 @@ 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 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 new file mode 100644 index 0000000000..641248482e --- /dev/null +++ b/config/interface/output_element_series/direct_emissions_per_sector.yml @@ -0,0 +1,295 @@ +--- +# 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: "#A1DC8E" + 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: "#245D11" + 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: energy + color: "#416B86" + order_by: 200 + group: + show_at_first: false + is_target_line: false + 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 +- 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 + hide_label: 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 + hide_label: 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 + hide_label: 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 + hide_label: 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 + hide_label: 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 + hide_label: true + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_other_1990 +- label: lulucf + color: "#A1DC8E" + 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 + hide_label: true + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_lulucf_1990 +- label: waste + color: "#245D11" + 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 + hide_label: 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 + hide_label: true + dependent_on: + output_element_key: direct_emissions_per_sector + key: direct_emissions_per_sector_bunkers_1990 + +# taget line present and future net total GHG emissions +- 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 + 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: 320 + 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 + +# 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 + 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 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/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 diff --git a/config/locales/en_etm.yml b/config/locales/en_etm.yml index c55d97da97..25fead3128 100644 --- a/config/locales/en_etm.yml +++ b/config/locales/en_etm.yml @@ -150,7 +150,7 @@ en: dashboard_item_groups: energy_use: "Energy use" - co2: "CO2 emissions" + emissions: "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..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 @@ -115,7 +127,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. @@ -149,9 +161,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 - description: 'The ETM calculates the amount of CO2 that is emitted + title: GHG emissions relative to start year + 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 total greenhouse gas emissions + relative to total greenhouse gas emissions in 1990. The dashboard item relies on + calculations based on direct emissions. +

+ Note: the direct emissions method is currently in beta release. Read more about this method + in the documentation. + direct_emissions_total_ghg: + label: GHG emissions + title: Direct GHG emissions (beta) + description: | + This dashboard item represents the total greenhouse gas emissions in the future year. + The dashboard item relies on calculations based on 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 475745f2bd..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 ten opzichte van het startjaar - description: '' + title: CO2-uitstoot t.o.v. startjaar + 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 @@ -147,9 +158,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 - description: "Het ETM berekent de CO2 emissies die door energiegebruik worden uitgestoten. + title: Broeikasgasemissies t.o.v. startjaar + 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 totale broeikasgasemissies + ten opzichte van de totale broeikasgasemissies in 1990. Het dashboarditem berust op + berekeningen van directe emissies. +

+ Let op: de directe emissiemethode is momenteel in beta release. Lees meer over deze + methode in de documentatie. + direct_emissions_total_ghg: + label: Broeikasgasemissies + title: Directe broeikasgasemissies (beta) + description: | + Dit dashboarditem representeert de totale broeikasgasemissies in het toekomstjaar. + Het dashboarditem berust op de berekening van directe emissies. +

+ Let op: de directe emissiemethode is momenteel in beta release. Lees meer over deze + methode in de documentatie. 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_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 608e33dcd4..ce0a83eed7 100644 --- a/config/locales/interface/output_elements/en_overview.yml +++ b/config/locales/interface/output_elements/en_overview.yml @@ -19,7 +19,7 @@ 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.

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/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" 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