From b21c9c1bf3df8ddc8613259f44e2fc35cd0d3743 Mon Sep 17 00:00:00 2001
From: Marianna Rottoli <marianna.rottoli@mail.polimi.it>
Date: Wed, 27 May 2020 17:35:06 +0200
Subject: [PATCH] Layout dashboard improved (legend, position of plots,
assumptions)
---
.../notebook_templates/EDGEdashboard.Rmd | 584 +++++++++---------
.../notebook_templates/helper_dashboard.R | 54 +-
2 files changed, 324 insertions(+), 314 deletions(-)
diff --git a/scripts/output/comparison/notebook_templates/EDGEdashboard.Rmd b/scripts/output/comparison/notebook_templates/EDGEdashboard.Rmd
index 2a00ef8..90d8e2b 100644
--- a/scripts/output/comparison/notebook_templates/EDGEdashboard.Rmd
+++ b/scripts/output/comparison/notebook_templates/EDGEdashboard.Rmd
@@ -38,8 +38,8 @@ legend=plotlist$legend
#data frame with help tooltips
helpTooltip_df <- data.frame(
- title=c("Per capita Passenger Transport Energy Services Demand", "Total Passenger Transport Energy Services Demand", "Sales composition", "Final energy LDVs by fuel","Transport Passenger Final Energy Demand", "Fleet composition", "Fleet composition comparison", "Emission intensity, new sales comparison", "Comparison of passenger final energy demand", "Emissions passenger transport", "Emission intensity of new sales", "Comparison of sales composition", "Comparison of passenger transport fossil fuels emissions", "Comparison of passenger electricity production emissions"),
- placement=c("right", "left", "right", "left", "left", "left", "right", "left", "right", "left", "left", "left", "left", "left"))
+ title=c("Distance traveled per capita", "Total Passenger Transport Energy Services Demand", "Sales composition", "Final energy LDVs by fuel","Transport Passenger Final Energy Demand", "Fleet composition", "Fleet composition comparison", "Emission intensity, new sales comparison", "Comparison of passenger final energy demand", "Emissions passenger transport", "Emission intensity of new sales", "Comparison of sales composition", "Comparison of passenger transport fossil fuels emissions", "Comparison of passenger electricity production emissions"),
+ placement=c("right", "left", "right", "left", "right", "right", "right", "right", "right", "left", "left", "right", "left", "left"))
helpTooltip = function(tooltipdf){
@@ -75,7 +75,7 @@ helpTooltip = function(tooltipdf){
result = paste0(result,"$(window).load(function () {\n");
result = paste0(result," $('.chart-title').filter(function() { return $(this).clone().children().remove().end().text() == '", title, "' }).each(function(){\n");
if(!(placement == "none"))
- result = paste0(result," $(this).append('<i class=\"glyphicon glyphicon-info-sign infoIcon\" data-toggle=\"tooltip\" data-html=\"true\" data-placement=\"right\" title=\"",contents,"\"></i>');\n");
+ result = paste0(result," $(this).append('<i data-toggle=\"tooltip\" data-html=\"true\" data-placement=\"right\" class = rightal title=\"",contents,"\">Legend</i>');\n");
result = paste0(result," $(this).find('[data-toggle=\"tooltip\"]').tooltip({ placement:'",placement,"'});\n");
result = paste0(result," })\n");
result = paste0(result,"})\n");
@@ -92,18 +92,21 @@ helpTooltip = function(tooltipdf){
<!-- ### Creating main emissions menu ### -->
-<!--Creating First Page - LDV Page-->
-Overview {data-icon="glyphicon glyphicon-scale"}
-=====================================
-Side Navigation {.sidebar .sidebarOverview data-width=160}
+<!--Creating First Page - overview Page-->
+
+LDVs {data-icon="fa-car"}
+=====================================
+
+Side Navigation {.sidebar .sidebarLDV data-width=160}
-------------------------------------
-[Baseline](#overview){class="sidebar-button selected"}
-[Conventional Case](#overview-conv-scenario){class="sidebar-button"}
-[Hydrogen Hype](#overview-fcev-scenario){class="sidebar-button"}
-[Electric Era](#overview-bev-scenario){class="sidebar-button"}
-[Synfuel Surge](#overview-synfuel-scenario){class="sidebar-button"}
+[Baseline](#ldvs){class="sidebar-button selected"}
+[Conventional Case](#ldvs-conv-scenario){class="sidebar-button"}
+[Hydrogen Hype](#ldvs-fcev-scenario){class="sidebar-button"}
+[Electric Era](#ldvs-bev-scenario){class="sidebar-button"}
+[Synfuel Surge](#ldvs-synfuel-scenario){class="sidebar-button"}
+<!-- Dividing the page in two rows-->
Row {data-height=300}
-----------------------------------------------------------------------
@@ -124,47 +127,49 @@ valueBox(plotlist$`ConvCase NoTax`$emiscen, icon = "fa-cloud")
Absence of policies oriented to promote alternative vehicles. Internal combustion engines lead the market.
More information can be found in the [Assumptions].
-<!-- Dividing the page in two columns-->
-Row {data-heigth=500}
+<!-- Dividing the page in two rows-->
+Row {data-height= 450}
-----------------------------------------------------------------------
-### Per capita Passenger Transport Energy Services Demand
+
+### Fleet composition {data-width=250}
```{r}
-plotlist$`ConvCase NoTax`$plot$ESmodecap_pass
+plotlist$`ConvCase NoTax`$plot$vintcomp
```
-### Total Passenger Transport Energy Services Demand
+
+### Final energy LDVs by fuel {data-width=250}
+
```{r}
-plotlist$`ConvCase NoTax`$plot$ESmodeabs
+plotlist$`ConvCase NoTax`$plot$EJLDV
```
-Row {data-heigth=500}
+Row {data-height= 450}
-----------------------------------------------------------------------
-### Transport Passenger Final Energy Demand
-
+### Sales composition {data-width=250}
```{r}
-plotlist$`ConvCase NoTax`$plot$EJpassfuels
+plotlist$`ConvCase NoTax`$plot$salescomp
```
-### Emissions passenger transport
+### Emission intensity of new sales {data-width=250}
```{r}
-plotlist$`ConvCase NoTax`$plot$emip
+plotlist$`ConvCase NoTax`$plot$CO2km_int_newsales
```
-Overview Conv scenario {.hidden}
-=====================================
+LDVs Conv scenario {.hidden}
+=====================================
-Side Navigation {.sidebar .sidebarOverview data-width=160}
+Side Navigation {.sidebar .sidebarLDV data-width=160}
-------------------------------------
-[Baseline](#overview){class="sidebar-button"}
-[Conventional Case](#overview-conv-scenario){class="sidebar-button selected"}
-[Hydrogen Hype](#overview-fcev-scenario){class="sidebar-button"}
-[Electric Era](#overview-bev-scenario){class="sidebar-button"}
-[Synfuel Surge](#overview-synfuel-scenario){class="sidebar-button"}
+[Baseline](#ldvs){class="sidebar-button"}
+[Conventional Case](#ldvs-conv-scenario){class="sidebar-button selected"}
+[Hydrogen Hype](#ldvs-fcev-scenario){class="sidebar-button"}
+[Electric Era](#ldvs-bev-scenario){class="sidebar-button"}
+[Synfuel Surge](#ldvs-synfuel-scenario){class="sidebar-button"}
<!-- Dividing the page in two rows-->
@@ -185,50 +190,53 @@ valueBox(plotlist$ConvCase$emiscen, icon = "fa-cloud")
### Scenario description {data-width=200}
-Absence of policies oriented to promote alternative vehicles. Internal combustion engines lead the market. More information can be found in the [Assumptions].
+Absence of policies oriented to promote alternative vehicles. Internal combustion engines lead the market.
+More information can be found in the [Assumptions].
-<!-- Dividing the page in two columns-->
-Row {data-heigth=500}
+<!-- Dividing the page in two rows-->
+Row {data-height= 450}
-----------------------------------------------------------------------
-### Per capita Passenger Transport Energy Services Demand
+### Fleet composition {data-width=250}
```{r}
-plotlist$ConvCase$plot$ESmodecap_pass
+plotlist$ConvCase$plot$vintcomp
```
-### Total Passenger Transport Energy Services Demand
+
+### Final energy LDVs by fuel {data-width=250}
+
```{r}
-plotlist$ConvCase$plot$ESmodeabs
+plotlist$ConvCase$plot$EJLDV
```
-Row {data-heigth=500}
+Row {data-height= 450}
-----------------------------------------------------------------------
-### Transport Passenger Final Energy Demand
-
+### Sales composition {data-width=250}
```{r}
-plotlist$ConvCase$plot$EJpassfuels
+plotlist$ConvCase$plot$salescomp
```
-### Emissions passenger transport
+### Emission intensity of new sales {data-width=250}
```{r}
-plotlist$ConvCase$plot$emip
+plotlist$ConvCase$plot$CO2km_int_newsales
```
-Overview FCEV scenario {.hidden}
+LDVs FCEV scenario {.hidden}
=====================================
-Side Navigation {.sidebar .sidebarOverview data-width=160}
+Side Navigation {.sidebar .sidebarLDV data-width=160}
-------------------------------------
-[Baseline](#overview){class="sidebar-button"}
-[Conventional Case](#overview-conv-scenario){class="sidebar-button"}
-[Hydrogen Hype](#overview-fcev-scenario){class="sidebar-button selected"}
-[Electric Era](#overview-bev-scenario){class="sidebar-button"}
-[Synfuel Surge](#overview-synfuel-scenario){class="sidebar-button"}
+[Baseline](#ldvs){class="sidebar-button"}
+[Conventional Case](#ldvs-conv-scenario){class="sidebar-button"}
+[Hydrogen Hype](#ldvs-fcev-scenario){class="sidebar-button selected"}
+[Electric Era](#ldvs-bev-scenario){class="sidebar-button"}
+[Synfuel Surge](#ldvs-synfuel-scenario){class="sidebar-button"}
+
<!-- Dividing the page in two rows-->
@@ -252,48 +260,55 @@ valueBox(plotlist$HydrHype$emiscen, icon = "fa-cloud")
Hydrogen vehicles gain an important share of the mix thanks to policies oriented at promoting them.
More information can be found in the [Assumptions].
-<!-- Dividing the page in two columns-->
-Row {data-heigth=500}
+
+<!-- Dividing the page in two rows-->
+Row {data-height= 450}
-----------------------------------------------------------------------
-### Per capita Passenger Transport Energy Services Demand
+### Fleet composition {data-width=250}
```{r}
-plotlist$HydrHype$plot$ESmodecap_pass
+plotlist$HydrHype$plot$vintcomp
```
-### Total Passenger Transport Energy Services Demand
+
+### Final energy LDVs by fuel {data-width=250}
+
```{r}
-plotlist$HydrHype$plot$ESmodeabs
+plotlist$HydrHype$plot$EJLDV
```
-Row {data-heigth=500}
+Row {data-height= 450}
-----------------------------------------------------------------------
-### Transport Passenger Final Energy Demand
-
+### Sales composition {data-width=250}
```{r}
-plotlist$HydrHype$plot$EJpassfuels
+plotlist$HydrHype$plot$salescomp
```
-### Emissions passenger transport
+### Emission intensity of new sales {data-width=250}
```{r}
-plotlist$HydrHype$plot$emip
+plotlist$HydrHype$plot$CO2km_int_newsales
```
-Overview BEV scenario {.hidden}
+
+LDVs BEV scenario {.hidden}
=====================================
-Side Navigation {.sidebar .sidebarOverview data-width=160}
+
+Side Navigation {.sidebar .sidebarLDV data-width=160}
-------------------------------------
-[Baseline](#overview){class="sidebar-button"}
-[Conventional Case](#overview-conv-scenario){class="sidebar-button"}
-[Hydrogen Hype](#overview-fcev-scenario){class="sidebar-button"}
-[Electric Era](#overview-bev-scenario){class="sidebar-button selected"}
-[Synfuel Surge](#overview-synfuel-scenario){class="sidebar-button"}
+[Baseline](#ldvs){class="sidebar-button"}
+[Conventional Case](#ldvs-conv-scenario){class="sidebar-button"}
+[Hydrogen Hype](#ldvs-fcev-scenario){class="sidebar-button"}
+[Electric Era](#ldvs-bev-scenario){class="sidebar-button selected"}
+[Synfuel Surge](#ldvs-synfuel-scenario){class="sidebar-button"}
+
+
+<!-- Dividing the page in two rows-->
Row {data-height=300}
-----------------------------------------------------------------------
@@ -311,52 +326,55 @@ valueBox(plotlist$ElecEra$emiscen, icon = "fa-cloud")
### Scenario description {data-width=200}
-Electric vehicles gain an important share of the mix thanks to policies oriented at promoting them.
-More information can be found in the [Assumptions].
+Electric vehicles gain an important share of the mix thanks to policies oriented at promoting them. More information can be found in the [Assumptions].
-<!-- Dividing the page in two columns-->
-Row {data-heigth=500}
+<!-- Dividing the page in two rows-->
+Row {data-height= 450}
-----------------------------------------------------------------------
-### Per capita Passenger Transport Energy Services Demand
+### Fleet composition {data-width=250}
```{r}
-plotlist$ElecEra$plot$ESmodecap_pass
+plotlist$ElecEra$plot$vintcomp
```
-### Total Passenger Transport Energy Services Demand
+
+### Final energy LDVs by fuel {data-width=250}
+
```{r}
-plotlist$ElecEra$plot$ESmodeabs
+plotlist$ElecEra$plot$EJLDV
```
-Row {data-heigth=500}
+Row {data-height= 450}
-----------------------------------------------------------------------
-### Transport Passenger Final Energy Demand
-
+### Sales composition {data-width=250}
```{r}
-plotlist$ElecEra$plot$EJpassfuels
+plotlist$ElecEra$plot$salescomp
```
-### Emissions passenger transport
+### Emission intensity of new sales {data-width=250}
```{r}
-plotlist$ElecEra$plot$emip
+plotlist$ElecEra$plot$CO2km_int_newsales
```
-Overview Synfuel scenario {.hidden}
+
+LDVs Synfuel scenario {.hidden}
=====================================
-Side Navigation {.sidebar .sidebarOverview data-width=160}
+Side Navigation {.sidebar .sidebarLDV data-width=160}
-------------------------------------
-[Baseline](#overview){class="sidebar-button"}
-[Conventional Case](#overview-conv-scenario){class="sidebar-button"}
-[Hydrogen Hype](#overview-fcev-scenario){class="sidebar-button"}
-[Electric Era](#overview-bev-scenario){class="sidebar-button"}
-[Synfuel Surge](#overview-synfuel-scenario){class="sidebar-button selected"}
+[Baseline](#ldvs){class="sidebar-button"}
+[Conventional Case](#ldvs-conv-scenario){class="sidebar-button"}
+[Hydrogen Hype](#ldvs-fcev-scenario){class="sidebar-button"}
+[Electric Era](#ldvs-bev-scenario){class="sidebar-button"}
+[Synfuel Surge](#ldvs-synfuel-scenario){class="sidebar-button selected"}
+
+<!-- Dividing the page in two rows-->
Row {data-height=300}
-----------------------------------------------------------------------
@@ -374,52 +392,93 @@ valueBox(plotlist$SynSurge$emiscen, icon = "fa-cloud")
### Scenario description {data-width=200}
-Synthetic fuels gain importance in the liquid fuels production. Absence of policies oriented to promote electric and hydrogen vehicles, while internal combustion engines lead the market.
+Synthetic fuels gain great importance in the liquid fuels production. Absence of policies oriented to promote alternative vehicles. Internal combustion engines lead the market.
More information can be found in the [Assumptions].
-<!-- Dividing the page in two columns-->
-Row {data-heigth=500}
+
+
+<!-- Dividing the page in two rows-->
+Row {data-height= 450}
-----------------------------------------------------------------------
-### Per capita Passenger Transport Energy Services Demand
+### Fleet composition {data-width=250}
```{r}
-plotlist$SynSurge$plot$ESmodecap_pass
+plotlist$SynSurge$plot$vintcomp
```
-### Total Passenger Transport Energy Services Demand
+
+### Final energy LDVs by fuel {data-width=250}
+
```{r}
-plotlist$SynSurge$plot$ESmodeabs
+plotlist$SynSurge$plot$EJLDV
```
-Row {data-heigth=500}
+Row {data-height= 450}
-----------------------------------------------------------------------
-### Transport Passenger Final Energy Demand
-
+### Sales composition {data-width=250}
```{r}
-plotlist$SynSurge$plot$EJpassfuels
+plotlist$SynSurge$plot$salescomp
```
-### Emissions passenger transport
+### Emission intensity of new sales {data-width=250}
```{r}
-plotlist$SynSurge$plot$emip
+plotlist$SynSurge$plot$CO2km_int_newsales
```
-LDVs {data-icon="fa-car"}
+Comparison {data-icon="fa-exchange-alt"}
=====================================
-Side Navigation {.sidebar .sidebarLDV data-width=160}
+Row {data-height = 450}
+-----------------------------------------------------------------------
+
+### Fleet composition comparison
+```{r}
+plotlist$comparison$plot$vintscen
+```
+
+### Comparison of passenger final energy demand
+```{r}
+plotlist$comparison$plot$EJpassfuels_scen
+```
+
+### Comparison of passenger transport fossil fuels emissions
+
+```{r}
+plotlist$comparison$plot$emipfos_scen
+```
+
+Row {data-height = 450}
+-----------------------------------------------------------------------
+
+### Comparison of sales composition
+```{r}
+plotlist$comparison$plot$salescom_scen
+```
+
+### Emission intensity, new sales comparison
+```{r}
+plotlist$comparison$plot$CO2km_intensity_newsales_scen
+```
+
+### Comparison of passenger electricity production emissions
+```{r}
+plotlist$comparison$plot$emipel_scen
+```
+
+Passenger transport overview {data-icon="glyphicon glyphicon-scale"}
+=====================================
+Side Navigation {.sidebar .sidebarOverview data-width=160}
-------------------------------------
-[Baseline](#ldvs){class="sidebar-button selected"}
-[Conventional Case](#ldvs-conv-scenario){class="sidebar-button"}
-[Hydrogen Hype](#ldvs-fcev-scenario){class="sidebar-button"}
-[Electric Era](#ldvs-bev-scenario){class="sidebar-button"}
-[Synfuel Surge](#ldvs-synfuel-scenario){class="sidebar-button"}
+[Baseline](#passenger-transport-overview){class="sidebar-button selected"}
+[Conventional Case](#passenger-transport-overview-conv-scenario){class="sidebar-button"}
+[Hydrogen Hype](#passenger-transport-overview-fcev-scenario){class="sidebar-button"}
+[Electric Era](#passenger-transport-overview-bev-scenario){class="sidebar-button"}
+[Synfuel Surge](#passenger-transport-overview-synfuel-scenario){class="sidebar-button"}
-<!-- Dividing the page in two rows-->
Row {data-height=300}
-----------------------------------------------------------------------
@@ -440,48 +499,47 @@ valueBox(plotlist$`ConvCase NoTax`$emiscen, icon = "fa-cloud")
Absence of policies oriented to promote alternative vehicles. Internal combustion engines lead the market.
More information can be found in the [Assumptions].
-<!-- Dividing the page in two rows-->
-Row {data-height= 450}
+<!-- Dividing the page in two columns-->
+Row {data-heigth=500}
-----------------------------------------------------------------------
-### Sales composition {data-width=250}
+### Distance traveled per capita
```{r}
-plotlist$`ConvCase NoTax`$plot$salescomp
+plotlist$`ConvCase NoTax`$plot$ESmodecap_pass
```
-
-### Emission intensity of new sales {data-width=250}
-
+### Total Passenger Transport Energy Services Demand
```{r}
-plotlist$`ConvCase NoTax`$plot$CO2km_int_newsales
+plotlist$`ConvCase NoTax`$plot$ESmodeabs
```
-Row {data-height= 450}
+Row {data-heigth=500}
-----------------------------------------------------------------------
-### Final energy LDVs by fuel
+### Transport Passenger Final Energy Demand
+
```{r}
-plotlist$`ConvCase NoTax`$plot$EJLDV
+plotlist$`ConvCase NoTax`$plot$EJpassfuels
```
+### Emissions passenger transport
-### Fleet composition
```{r}
-plotlist$`ConvCase NoTax`$plot$vintcomp
+plotlist$`ConvCase NoTax`$plot$emip
```
-LDVs Conv scenario {.hidden}
-=====================================
+Passenger transport overview Conv scenario {.hidden}
+=====================================
-Side Navigation {.sidebar .sidebarLDV data-width=160}
+Side Navigation {.sidebar .sidebarOverview data-width=160}
-------------------------------------
-[Baseline](#ldvs){class="sidebar-button"}
-[Conventional Case](#ldvs-conv-scenario){class="sidebar-button selected"}
-[Hydrogen Hype](#ldvs-fcev-scenario){class="sidebar-button"}
-[Electric Era](#ldvs-bev-scenario){class="sidebar-button"}
-[Synfuel Surge](#ldvs-synfuel-scenario){class="sidebar-button"}
+[Baseline](#passenger-transport-overview){class="sidebar-button"}
+[Conventional Case](#passenger-transport-overview-conv-scenario){class="sidebar-button selected"}
+[Hydrogen Hype](#passenger-transport-overview-fcev-scenario){class="sidebar-button"}
+[Electric Era](#passenger-transport-overview-bev-scenario){class="sidebar-button"}
+[Synfuel Surge](#passenger-transport-overview-synfuel-scenario){class="sidebar-button"}
<!-- Dividing the page in two rows-->
@@ -502,53 +560,50 @@ valueBox(plotlist$ConvCase$emiscen, icon = "fa-cloud")
### Scenario description {data-width=200}
-Absence of policies oriented to promote alternative vehicles. Internal combustion engines lead the market.
-More information can be found in the [Assumptions].
+Absence of policies oriented to promote alternative vehicles. Internal combustion engines lead the market. More information can be found in the [Assumptions].
-<!-- Dividing the page in two rows-->
-Row {data-height= 450}
+<!-- Dividing the page in two columns-->
+Row {data-heigth=500}
-----------------------------------------------------------------------
-### Sales composition {data-width=250}
+### Distance traveled per capita
```{r}
-plotlist$ConvCase$plot$salescomp
+plotlist$ConvCase$plot$ESmodecap_pass
```
-
-### Emission intensity of new sales {data-width=250}
-
+### Total Passenger Transport Energy Services Demand
```{r}
-plotlist$ConvCase$plot$CO2km_int_newsales
+plotlist$ConvCase$plot$ESmodeabs
```
-Row {data-height= 450}
+Row {data-heigth=500}
-----------------------------------------------------------------------
-### Final energy LDVs by fuel
+### Transport Passenger Final Energy Demand
+
```{r}
-plotlist$ConvCase$plot$EJLDV
+plotlist$ConvCase$plot$EJpassfuels
```
+### Emissions passenger transport
-### Fleet composition
```{r}
-plotlist$ConvCase$plot$vintcomp
+plotlist$ConvCase$plot$emip
```
-LDVs FCEV scenario {.hidden}
+Passenger transport overview FCEV scenario {.hidden}
=====================================
-Side Navigation {.sidebar .sidebarLDV data-width=160}
+Side Navigation {.sidebar .sidebarOverview data-width=160}
-------------------------------------
-[Baseline](#ldvs){class="sidebar-button"}
-[Conventional Case](#ldvs-conv-scenario){class="sidebar-button"}
-[Hydrogen Hype](#ldvs-fcev-scenario){class="sidebar-button selected"}
-[Electric Era](#ldvs-bev-scenario){class="sidebar-button"}
-[Synfuel Surge](#ldvs-synfuel-scenario){class="sidebar-button"}
-
+[Baseline](#passenger-transport-overview){class="sidebar-button"}
+[Conventional Case](#passenger-transport-overview-conv-scenario){class="sidebar-button"}
+[Hydrogen Hype](#passenger-transport-overview-fcev-scenario){class="sidebar-button selected"}
+[Electric Era](#passenger-transport-overview-bev-scenario){class="sidebar-button"}
+[Synfuel Surge](#passenger-transport-overview-synfuel-scenario){class="sidebar-button"}
<!-- Dividing the page in two rows-->
@@ -572,55 +627,48 @@ valueBox(plotlist$HydrHype$emiscen, icon = "fa-cloud")
Hydrogen vehicles gain an important share of the mix thanks to policies oriented at promoting them.
More information can be found in the [Assumptions].
-
-<!-- Dividing the page in two rows-->
-Row {data-height= 450}
+<!-- Dividing the page in two columns-->
+Row {data-heigth=500}
-----------------------------------------------------------------------
-### Sales composition {data-width=250}
+### Distance traveled per capita
```{r}
-plotlist$HydrHype$plot$salescomp
+plotlist$HydrHype$plot$ESmodecap_pass
```
-
-### Emission intensity of new sales {data-width=250}
-
+### Total Passenger Transport Energy Services Demand
```{r}
-plotlist$HydrHype$plot$CO2km_int_newsales
+plotlist$HydrHype$plot$ESmodeabs
```
-Row {data-height= 450}
+Row {data-heigth=500}
-----------------------------------------------------------------------
-### Final energy LDVs by fuel
+### Transport Passenger Final Energy Demand
+
```{r}
-plotlist$HydrHype$plot$EJLDV
+plotlist$HydrHype$plot$EJpassfuels
```
+### Emissions passenger transport
-### Fleet composition
```{r}
-plotlist$HydrHype$plot$vintcomp
+plotlist$HydrHype$plot$emip
```
-
-LDVs BEV scenario {.hidden}
+Passenger transport overview BEV scenario {.hidden}
=====================================
-
-Side Navigation {.sidebar .sidebarLDV data-width=160}
+Side Navigation {.sidebar .sidebarOverview data-width=160}
-------------------------------------
-[Baseline](#ldvs){class="sidebar-button"}
-[Conventional Case](#ldvs-conv-scenario){class="sidebar-button"}
-[Hydrogen Hype](#ldvs-fcev-scenario){class="sidebar-button"}
-[Electric Era](#ldvs-bev-scenario){class="sidebar-button selected"}
-[Synfuel Surge](#ldvs-synfuel-scenario){class="sidebar-button"}
-
-
+[Baseline](#passenger-transport-overview){class="sidebar-button"}
+[Conventional Case](#passenger-transport-overview-conv-scenario){class="sidebar-button"}
+[Hydrogen Hype](#passenger-transport-overview-fcev-scenario){class="sidebar-button"}
+[Electric Era](#passenger-transport-overview-bev-scenario){class="sidebar-button selected"}
+[Synfuel Surge](#passenger-transport-overview-synfuel-scenario){class="sidebar-button"}
-<!-- Dividing the page in two rows-->
Row {data-height=300}
-----------------------------------------------------------------------
@@ -638,55 +686,52 @@ valueBox(plotlist$ElecEra$emiscen, icon = "fa-cloud")
### Scenario description {data-width=200}
-Electric vehicles gain an important share of the mix thanks to policies oriented at promoting them. More information can be found in the [Assumptions].
+Electric vehicles gain an important share of the mix thanks to policies oriented at promoting them.
+More information can be found in the [Assumptions].
-<!-- Dividing the page in two rows-->
-Row {data-height= 450}
+<!-- Dividing the page in two columns-->
+Row {data-heigth=500}
-----------------------------------------------------------------------
-### Sales composition {data-width=250}
+### Distance traveled per capita
```{r}
-plotlist$ElecEra$plot$salescomp
+plotlist$ElecEra$plot$ESmodecap_pass
```
-
-### Emission intensity of new sales {data-width=250}
-
+### Total Passenger Transport Energy Services Demand
```{r}
-plotlist$ElecEra$plot$CO2km_int_newsales
+plotlist$ElecEra$plot$ESmodeabs
```
-Row {data-height= 450}
+Row {data-heigth=500}
-----------------------------------------------------------------------
-### Final energy LDVs by fuel
+### Transport Passenger Final Energy Demand
+
```{r}
-plotlist$ElecEra$plot$EJLDV
+plotlist$ElecEra$plot$EJpassfuels
```
+### Emissions passenger transport
-### Fleet composition
```{r}
-plotlist$ElecEra$plot$vintcomp
+plotlist$ElecEra$plot$emip
```
-
-LDVs Synfuel scenario {.hidden}
+Passenger transport overview Synfuel scenario {.hidden}
=====================================
-Side Navigation {.sidebar .sidebarLDV data-width=160}
+Side Navigation {.sidebar .sidebarOverview data-width=160}
-------------------------------------
-[Baseline](#ldvs){class="sidebar-button"}
-[Conventional Case](#ldvs-conv-scenario){class="sidebar-button"}
-[Hydrogen Hype](#ldvs-fcev-scenario){class="sidebar-button"}
-[Electric Era](#ldvs-bev-scenario){class="sidebar-button"}
-[Synfuel Surge](#ldvs-synfuel-scenario){class="sidebar-button selected"}
-
+[Baseline](#passenger-transport-overview){class="sidebar-button"}
+[Conventional Case](#passenger-transport-overview-conv-scenario){class="sidebar-button"}
+[Hydrogen Hype](#passenger-transport-overview-fcev-scenario){class="sidebar-button"}
+[Electric Era](#passenger-transport-overview-bev-scenario){class="sidebar-button"}
+[Synfuel Surge](#passenger-transport-overview-synfuel-scenario){class="sidebar-button selected"}
-<!-- Dividing the page in two rows-->
Row {data-height=300}
-----------------------------------------------------------------------
@@ -704,80 +749,37 @@ valueBox(plotlist$SynSurge$emiscen, icon = "fa-cloud")
### Scenario description {data-width=200}
-Synthetic fuels gain great importance in the liquid fuels production. Absence of policies oriented to promote alternative vehicles. Internal combustion engines lead the market.
+Synthetic fuels gain importance in the liquid fuels production. Absence of policies oriented to promote electric and hydrogen vehicles, while internal combustion engines lead the market.
More information can be found in the [Assumptions].
-
-
-<!-- Dividing the page in two rows-->
-Row {data-height= 450}
------------------------------------------------------------------------
-
-### Sales composition {data-width=250}
-```{r}
-plotlist$SynSurge$plot$salescomp
-```
-
-
-### Emission intensity of new sales {data-width=250}
-
-```{r}
-plotlist$SynSurge$plot$CO2km_int_newsales
-```
-
-
-Row {data-height= 450}
+<!-- Dividing the page in two columns-->
+Row {data-heigth=500}
-----------------------------------------------------------------------
-### Final energy LDVs by fuel
+### Distance traveled per capita
```{r}
-plotlist$SynSurge$plot$EJLDV
+plotlist$SynSurge$plot$ESmodecap_pass
```
-
-### Fleet composition
+### Total Passenger Transport Energy Services Demand
```{r}
-plotlist$SynSurge$plot$vintcomp
+plotlist$SynSurge$plot$ESmodeabs
```
-Comparison {data-icon="fa-exchange-alt"}
-=====================================
-Row {data-height = 450}
+Row {data-heigth=500}
-----------------------------------------------------------------------
-### Fleet composition comparison
-```{r}
-plotlist$comparison$plot$vintscen
-```
-
-### Emission intensity, new sales comparison
-```{r}
-plotlist$comparison$plot$CO2km_intensity_newsales_scen
-```
-
-### Comparison of passenger transport fossil fuels emissions
-
-```{r}
-plotlist$comparison$plot$emipfos_scen
-```
-
-Row {data-height = 450}
------------------------------------------------------------------------
+### Transport Passenger Final Energy Demand
-### Comparison of passenger final energy demand
```{r}
-plotlist$comparison$plot$EJpassfuels_scen
+plotlist$SynSurge$plot$EJpassfuels
```
-### Comparison of sales composition
-```{r}
-plotlist$comparison$plot$salescom_scen
-```
+### Emissions passenger transport
-### Comparison of passenger electricity production emissions
```{r}
-plotlist$comparison$plot$emipel_scen
+plotlist$SynSurge$plot$emip
```
@@ -787,59 +789,50 @@ Assumptions {data-icon="glyphicon glyphicon-th-list"}
Column {data-width= 450}
-----------------------------------------------------------------------
-### Conventional Case (NoTax) {data-height=200}
+### Baseline (No Carbon Pricing) {data-height=200}
</ul>
- <li> Conventional consumers patterns </li>
+ <li> Structurally conservative: continuation of historic consumer preferences for conventional combustion engine cars. </li>
<li> No policies to promote alternative vehicles </li>
- <li> Pessimistic trend of electric recharging stations </li>
- <li> Learning-by-doing on BEVs and FCEVs </li>
- <li> Market-driven behavior of light duty vehicles powertrain choice </li>
+ <li> Slow build-up of electric recharging stations </li>
</ul>
### Conventional Case {data-height=200}
</ul>
- <li> Conventional consumers patterns </li>
+ <li> Structurally conservative: continuation of historic consumer preferences for conventional combustion engine cars </li>
<li> No policies to promote alternative vehicles </li>
- <li> Pessimistic trend of electric recharging stations </li>
- <li> Learning-by-doing on BEVs and FCEVs </li>
- <li> Market-driven behavior of light duty vehicles powertrain choice </li>
+ <li> Slow build-up of electric recharging stations </li>
</ul>
### Hydrogen Hype {data-height=200}
</ul>
- <li> Learning-by-doing on BEVs and FCEVs </li>
- <li> Optimistic trend of hydrogen refuelling stations </li>
+ <li> Fast build-up of hydrogen refuelling stations </li>
<li> Rebates-feebates scheme: FCEVs receive 5000€ subsidies for purchases in 2020, around 3300€ in 2025 and 1700€ in 2030. 1000€ mark-up cost on internal combustion engines are applied in 2020, 700€ in 2025 and 300€ in 2030 </li>
- <li> Mark-up costs applied to internal combustion engines (both conventional and hybrid) </li>
- <li> Market-driven behavior of light duty vehicles powertrain choice </li>
- <li> Policy push of FCEVs: policy-driven decrease of the perceived inconvenience cost associated to the purchase of hydrogen vehicles </li>
+ <li> Increasing dis-preference for internal combustion engines due to tightening regulation </li>
+ <li> Policy push for FCEVs: Support policies induce a shift from dis-preference to preference of hydrogen vehicles, e.g. incentives to carmakers and car retailers to provide hidrogen vehicles </li>
<li> Hydrogen from renewable resources (green hydrogen) is at least 95% of the total hydrogen </li>
+ <li> Slow build-up of electric recharging stations </li>
</ul>
### Electric Era {data-height=200}
</ul>
- <li> Learning-by-doing on BEVs and FCEVs </li>
<li> Rebates-feebates scheme: BEVs receive 5000€ subsidies for purchases in 2020, around 3300€ in 2025 and 1700€ in 2030. 1000€ mark-up cost on internal combustion engines are applied in 2020, 700€ in 2025 and 300€ in 2030 </li>
- <li> Mark-up costs applied to internal combustion engines (both conventional and hybrid) </li>
- <li> Market-driven behavior of light duty vehicles powertrain choice </li>
+ <li> Increasing dis-preference for internal combustion engines due to tightening regulation </li>
</ul>
### Synfuel Surge {data-height=200}
</ul>
- <li> Conventional consumers patterns </li>
- <li> Learning-by-doing on BEVs and FCEVs </li>
- <li> Market-driven behavior of light duty vehicles powertrain choice </li>
- <li> Synfuels are forced in the liquids mix reaching 10% of liquids fuels in transportation by 2035 </li>
+ <li> Structurally conservative: continuation of historic consumer preferences for conventional combustion engine cars </li>
+ <li> Synfuels are forced in the liquids mix blending mandates reaching 10% of liquids fuels in transportation by 2035 </li>
<li> Hydrogen from renewable resources (green hydrogen) is at least 95% of the total hydrogen </li>
- <li> Emissions of CO<sub>2</sub> are captured and reused to produce syntethic fuels (Carbon Capture and Utilization) </li>
+ <li> CO<sub>2</sub> emissions from other sources (e.g., industrial installations) are captured and reused to produce syntethic fuels (Carbon Capture and Utilization) </li>
</ul>
@@ -882,7 +875,7 @@ navBarMemory = function(topMenuLabel, sideBarClass){
```
```{r, results='asis'}
- cat(navBarMemory("Overview",".sidebarOverview"))
+ cat(navBarMemory("Passenger transport overview",".sidebarOverview"))
cat(navBarMemory("LDVs",".sidebarLDV"))
```
@@ -890,7 +883,12 @@ navBarMemory = function(topMenuLabel, sideBarClass){
<!-- CSS -->
<style type="text/css">
-
+ <!-- title font of panels -->
+ .chart-title { /* chart_title */
+ font-size: 30px;
+ font-family: Algerian;
+ }
+
.sidebar-button { /* sidebar size */
display: inline-block;
font-size: 20px;
@@ -1002,8 +1000,20 @@ navBarMemory = function(topMenuLabel, sideBarClass){
-ms-user-select: none;
user-select: none;
}
+
+<!-- element "legend" of panels -->
+ .rightal {
+ float: right;
+ font-weight: bold;
+ background-color: #e8e4e1;
+ color: #7c7c7c;
+ padding: 5px 10px;
+ }
+
<!-- indentation for bullet points list -->
li{
- margin-left:10px;
+ margin-left:20px;
}
+
+
</style>
diff --git a/scripts/output/comparison/notebook_templates/helper_dashboard.R b/scripts/output/comparison/notebook_templates/helper_dashboard.R
index 204ddab..fb48dd8 100644
--- a/scripts/output/comparison/notebook_templates/helper_dashboard.R
+++ b/scripts/output/comparison/notebook_templates/helper_dashboard.R
@@ -104,7 +104,7 @@ scens = unique(EJmode_all$scenario)
## plot functions
vintcomparisondash = function(dt, scen){
- dt = dt[year %in% c(2015, 2030, 2050)]
+ dt = dt[year %in% seq(2020, 2050, 5)]
dt[, year := as.character(year)]
dt = dt[region == region_plot & scenario == scen]
dt = dt[,.(value = sum(value)), by = c("region", "technology", "year")]
@@ -143,7 +143,7 @@ vintcomparisondash = function(dt, scen){
vintscen_dash = function(dt){
dt[, scenario := ifelse(scenario == "Base_ConvCase", "ConvCaseNoTax", scenario)]
- dt = dt[year %in% c(2015, 2030, 2050)]
+ dt = dt[year %in% c(2020, 2030, 2050)]
dt[, year := as.character(year)]
dt = dt[region == region_plot]
dt = dt[,.(value = sum(value)), by = c("region", "technology", "year", "scenario")]
@@ -172,7 +172,7 @@ vintscen_dash = function(dt){
labs(x = "", y = "")
g2 = ggplot()+
- geom_bar(data = dt[year == 2015 & scenario == "ConvCase"][, scenario := "Historical"],
+ geom_bar(data = dt[year == 2020 & scenario == "ConvCase"][, scenario := "Historical"],
aes(x = scenario, y = value, group = technology, text = details, fill = technology, width=.75), position="stack", stat = "identity", width = 0.5)+
guides(fill = guide_legend(reverse=TRUE))+
facet_wrap(~year, nrow = 1)+
@@ -210,14 +210,14 @@ vintscen_dash = function(dt){
salescomdash = function(dt, scen){
- dt = dt[region == region_plot & scenario == scen & year <=2050]
+ dt = dt[region == region_plot & scenario == scen & year %in% seq(2020, 2050, 5)]
dt[, year := as.numeric(as.character(year))]
dt[, details := paste0("Share: ", round(shareFS1*100, digits = 0), " %", "<br>", "Technology: ", technology, "<br>", "Region: ", region," <br>", "Year: ", year) ]
## normalize shares so to have sum to 1
dt[, shareFS1 := round(shareFS1*100, digits = 0)]
dt[, shareFS1 := shareFS1/sum(shareFS1), by = c("region", "year")]
plot = ggplot()+
- geom_bar(data = dt, aes(x = year,y = shareFS1, group = technology, fill = technology, text = details), position = position_stack(), stat = "identity")+
+ geom_bar(data = dt, aes(x = year,y = round(shareFS1*100,0), group = technology, fill = technology, text = details), position = position_stack(), stat = "identity")+
theme_minimal()+
scale_fill_manual("Technology", values = cols)+
expand_limits(y = c(0,1))+
@@ -256,7 +256,7 @@ ESmodecapdash = function(dt, scen){
scale_fill_manual("Vehicle Type", values = cols, breaks=legend_ord)+
expand_limits(y = c(0,1))+
ylim(0,32000)+
- scale_x_continuous(breaks = c(2015, 2030, 2050))+
+ scale_x_continuous(breaks = c(2020, 2030, 2050))+
theme(axis.text.x = element_text(angle = 90, size = 8, vjust=0.5, hjust=1),
axis.text.y = element_text(size = 8),
axis.title = element_text(size = 8),
@@ -273,7 +273,7 @@ ESmodecapdash = function(dt, scen){
scale_fill_manual("Vehicle Type", values = cols, breaks=legend_ord)+
expand_limits(y = c(0,1))+
ylim(0,64000)+
- scale_x_continuous(breaks = c(2015, 2030, 2050))+
+ scale_x_continuous(breaks = c(2020, 2030, 2050))+
theme(axis.text.x = element_text(angle = 90, size = 8, vjust=0.5, hjust=1),
axis.text.y = element_text(size = 8),
axis.title = element_text(size = 8),
@@ -285,7 +285,7 @@ ESmodecapdash = function(dt, scen){
plot_pass = ggplotly(plot_pass, tooltip = c("text")) %>%
config(modeBarButtonsToRemove=plotlyButtonsToHide, displaylogo=FALSE) %>%
- layout(yaxis=list(title='[pkm/cap]', titlefont = list(size = 10)))
+ layout(yaxis=list(title='[km]', titlefont = list(size = 10)))
plot_frgt = ggplotly(plot_frgt, tooltip = c("text")) %>%
config(modeBarButtonsToRemove=plotlyButtonsToHide, displaylogo=FALSE) %>%
layout(yaxis=list(title='[tkm/cap]', titlefont = list(size = 10)))
@@ -313,7 +313,7 @@ ESmodeabs_dash = function(dt, scen){
scale_fill_manual("Vehicle Type", values = cols, breaks=legend_ord)+
expand_limits(y = c(0,1))+
ylim(0, 17)+
- scale_x_continuous(breaks = c(2015, 2030, 2050))+
+ scale_x_continuous(breaks = c(2020, 2030, 2050))+
theme(axis.text.x = element_text(angle = 90, size = 8, vjust=0.5, hjust=1),
axis.text.y = element_text(size = 8),
axis.title = element_text(size = 8),
@@ -338,7 +338,7 @@ ESmodeabs_dash = function(dt, scen){
EJpass_dash = function(dt, scen){
- dt = dt[region == region_plot & scenario == scen & year >= 2015 & year <= 2050 & sector == "trn_pass"]
+ dt = dt[region == region_plot & scenario == scen & year >= 2020 & year <= 2050 & sector == "trn_pass"]
dt[, details := paste0("Demand: ", round(demand_EJ, digits = 0), " [EJ]","<br>", "Technology: ", subtech, "<br>", "Region: ", region," <br>", "Year: ", year) ]
plot = ggplot()+
@@ -348,7 +348,7 @@ EJpass_dash = function(dt, scen){
expand_limits(y = c(0,1))+
ylim(0, 20)+
labs(x = "", y = "")+
- scale_x_continuous(breaks = c(2015, 2030, 2050))+
+ scale_x_continuous(breaks = c(2020, 2030, 2050))+
theme(axis.text.x = element_text(angle = 90, size = 8, vjust=0.5, hjust=1),
axis.text.y = element_text(size = 8),
axis.title = element_text(size = 8),
@@ -373,15 +373,15 @@ EJpass_dash = function(dt, scen){
EJpass_scen_dash = function(dt){
dt[, scenario := ifelse(scenario == "Base_ConvCase", "ConvCaseNoTax", scenario)]
dt[, subtech := factor(subtech, levels = legend_ord)]
- dt = dt[region == region_plot & year %in% c(2015, 2030, 2050) & sector == "trn_pass"]
+ dt = dt[region == region_plot & year %in% c(2020, 2030, 2050) & sector == "trn_pass"]
dt[, details := paste0("Demand: ", round(demand_EJ, digits = 0), " [EJ]","<br>", "Technology: ", subtech, "<br>", "Region: ", region," <br>", "Year: ", year) ]
dt[, scenario := gsub(".*_", "", scenario)]
dt[, scenario := factor(scenario, levels = c("ConvCaseNoTax", "ConvCase", "HydrHype", "ElecEra", "SynSurge"))]
g1 = ggplot()+
geom_bar(data = dt[year %in% c(2030, 2050)], aes(x = scenario, y = demand_EJ, group = subtech,
- fill = subtech,
- text = details, width=.75),
+ fill = subtech,
+ text = details, width=.75),
position="stack", stat = "identity", width = 0.5)+
facet_wrap(~year, nrow = 1)+
theme_minimal()+
@@ -400,9 +400,9 @@ EJpass_scen_dash = function(dt){
g2 = ggplot()+
- geom_bar(data = dt[year == 2015 & scenario == "ConvCase"][, scenario := "Historical"], aes(x = scenario, y = demand_EJ, group = subtech,
- fill = subtech,
- text = details, width=.75),
+ geom_bar(data = dt[year == 2020 & scenario == "ConvCase"][, scenario := "Historical"], aes(x = scenario, y = demand_EJ, group = subtech,
+ fill = subtech,
+ text = details, width=.75),
position="stack", stat = "identity", width = 0.5)+
facet_wrap(~year, nrow = 1)+
theme_minimal()+
@@ -449,7 +449,7 @@ CO2km_intensity_newsalesdash = function(dt, scen){
geom_text(data = targets, aes(y = value+5, x = c(2025, 2030, 2035), label = name, text = details_blank), size = 3)+
expand_limits(y = c(0,1))+
labs(x = "", y = "")+
- scale_x_continuous(breaks = c(2015, 2030, 2050))+
+ scale_x_continuous(breaks = c(2020, 2030, 2050))+
theme_minimal()+
theme(axis.text.x = element_text(angle = 90, size = 8, vjust=0.5, hjust=1),
axis.text.y = element_text(size = 8),
@@ -488,7 +488,7 @@ CO2km_intensity_newsales_scen_dash = function(dt){
geom_text(data = targets, aes(y = value+5, x = c(2025, 2030, 2035), label = name, text = details_blank), size = 3)+
expand_limits(y = c(0,1))+
labs(x = "", y = "")+
- scale_x_continuous(breaks = c(2015, 2030, 2050))+
+ scale_x_continuous(breaks = c(2020, 2030, 2050))+
theme_minimal()+
theme(axis.text.x = element_text(angle = 90, size = 8, vjust=0.5, hjust=1),
axis.text.y = element_text(size = 8),
@@ -517,7 +517,7 @@ CO2km_intensity_newsales_scen_dash = function(dt){
EJLDVdash <- function(dt, scen){
dt = dt[subsector_L1 == "trn_pass_road_LDV_4W"]
dt[, technology := factor(technology, levels = legend_ord)]
- dt = dt[region == region_plot & scenario == scen & year >= 2015 & year <= 2050]
+ dt = dt[region == region_plot & scenario == scen & year >= 2020 & year <= 2050]
dt[, details := paste0("Demand: ", round(demand_EJ, digits = 1), " [EJ]","<br>", "Technology: ", technology, "<br>", "Region: ", region," <br>", "Year: ", year) ]
plot = ggplot()+
@@ -527,7 +527,7 @@ EJLDVdash <- function(dt, scen){
scale_fill_manual("Technology", values = cols, breaks=legend_ord)+
expand_limits(y = c(0,1))+
ylim(0, 16)+
- scale_x_continuous(breaks = c(2015, 2030, 2050))+
+ scale_x_continuous(breaks = c(2020, 2030, 2050))+
theme(axis.text.x = element_text(angle = 90, size = 8, vjust=0.5, hjust=1),
axis.text.y = element_text(size = 8),
axis.title = element_text(size = 8),
@@ -571,7 +571,7 @@ emip_dash = function(dt, scen){
theme_minimal()+
expand_limits(y = c(0,1))+
ylim(-80,1800)+
- scale_x_continuous(breaks = c(2015, 2030, 2050))+
+ scale_x_continuous(breaks = c(2020, 2030, 2050))+
theme(axis.text.x = element_text(angle = 90, size = 8, vjust=0.5, hjust=1),
axis.text.y = element_text(size = 8),
axis.title = element_text(size = 8),
@@ -619,7 +619,7 @@ emipscen_dash = function(dt){
theme_minimal()+
expand_limits(y = c(0,1))+
ylim(0,1800)+
- scale_x_continuous(breaks = c(2015, 2030, 2050))+
+ scale_x_continuous(breaks = c(2020, 2030, 2050))+
theme(axis.text.x = element_text(angle = 90, size = 8, vjust=0.5, hjust=1),
axis.text.y = element_text(size = 8),
axis.title = element_text(size = 8),
@@ -643,7 +643,7 @@ emipscen_dash = function(dt){
theme_minimal()+
expand_limits(y = c(0,1))+
ylim(-80, 140)+
- scale_x_continuous(breaks = c(2015, 2030, 2050))+
+ scale_x_continuous(breaks = c(2020, 2030, 2050))+
theme(axis.text.x = element_text(angle = 90, size = 8, vjust=0.5, hjust=1),
axis.text.y = element_text(size = 8),
axis.title = element_text(size = 8),
@@ -808,9 +808,9 @@ create_plotlist = function(scens, salescomp_all, fleet_all, ESmodecap_all, EJfue
names(legend$'Sales composition'$contents) <- salescomp$vars
legend$'Sales composition'$description <- "<p>Composition of sales of light duty vehicles</p>"
- legend$'Per capita Passenger Transport Energy Services Demand'$contents <- lapply(ESmodecap$vars$vars_pass, function(var) { return(list("fill"=toString(cols[var]),"linetype"=NULL)) })
- names(legend$'Per capita Passenger Transport Energy Services Demand'$contents) <- ESmodecap$vars$vars_pass
- legend$'Per capita Passenger Transport Energy Services Demand'$description <- "<p>Energy services demand, passenger transport</p>"
+ legend$'Distance traveled per capita'$contents <- lapply(ESmodecap$vars$vars_pass, function(var) { return(list("fill"=toString(cols[var]),"linetype"=NULL)) })
+ names(legend$'Distance traveled per capita'$contents) <- ESmodecap$vars$vars_pass
+ legend$'Distance traveled per capita'$description <- "<p>Average distance traveled per capita by transport mode</p>"
legend$'Total Passenger Transport Energy Services Demand'$contents <- lapply(ESmodeabs$vars, function(var) { return(list("fill"=toString(cols[var]),"linetype"=NULL)) })
names(legend$'Total Passenger Transport Energy Services Demand'$contents) <- ESmodeabs$vars
--
GitLab