From 3d630bd5893ba44432c1ccc74b91e1bc22ea838f Mon Sep 17 00:00:00 2001
From: Matt Langham <151934237+NPgMattL@users.noreply.github.com>
Date: Fri, 5 Jan 2024 09:42:06 +0000
Subject: [PATCH] #86 - change graph order and text in graphs.html

---
 2023-DFES/graphs.html | 93 +++++++++++++++++++++----------------------
 1 file changed, 45 insertions(+), 48 deletions(-)

diff --git a/2023-DFES/graphs.html b/2023-DFES/graphs.html
index 43527f1..4dd041d 100644
--- a/2023-DFES/graphs.html
+++ b/2023-DFES/graphs.html
@@ -68,44 +68,10 @@ <h1>Northern Powergrid DFES 2023: graphs</h1>
 		<div class="holder padded">
 			<p>The following graphs are supplemental to <a href="index.html">Northern Powergrid's DFES 2023 interactive map</a>. Each graph can be downloaded as a scalable-vector-graphic (SVG). The underlying data for each graph is also available as a CSV file.</p>
 	
-	
-	
-			<h2>Emissions</h2>
-			
-				<figure class="jekyll-parse">
-					<figcaption><strong>Figure 1:</strong> Annual carbon emissions (MtCO2)</figcaption>
-					<div class="table-holder">{% include_relative data/graphs/graph-annual-co2-emissions.html %}</div>
-					{% include_relative data/graphs/graph-annual-co2-emissions.svg %}
-					<div class="download">
-						<a href="data/graphs/graph-annual-co2-emissions.svg"><img src="resources/download.svg" alt="download" title="Download graph from Figure 1" /> SVG</a>
-						<a href="data/graphs/AnnualCarbonEmissions_MtCO2.csv"><img src="resources/download.svg" alt="download" title="Download data from Figure 1" /> CSV</a>
-					</div>
-				</figure>
-	
-				<figure class="jekyll-parse">
-					<figcaption><strong>Figure 2:</strong> Cumulative carbon emissions (MtCO2)</figcaption>
-					<div class="table-holder">{% include_relative data/graphs/graph-cumulative-carbon-emissions.html %}</div>
-					{% include_relative data/graphs/graph-cumulative-carbon-emissions.svg %}
-					<div class="download">
-						<a href="data/graphs/graph-cumulative-carbon-emissions.svg"><img src="resources/download.svg" alt="download" title="Download graph from Figure 2" /> SVG</a>
-						<a href="data/graphs/CumulativeCarbonEmissions_MtCO2.csv"><img src="resources/download.svg" alt="download" title="Download data from Figure 2" /> CSV</a>
-					</div>
-				</figure>
-	
-				<figure class="jekyll-parse">
-					<figcaption><strong>Figure 3:</strong> Network annual carbon emission breakdown - Planning Scenario (MtCO2)</figcaption>
-					<div class="table-holder">{% include_relative data/graphs/graph-annual-carbon-emissions-planning-scenario.html %}</div>
-					{% include_relative data/graphs/graph-annual-carbon-emissions-planning-scenario.svg %}
-					<div class="download">
-						<a href="data/graphs/graph-annual-carbon-emissions-planning-scenario.svg"><img src="resources/download.svg" alt="download" title="Download graph from Figure 3" /> SVG</a>
-						<a href="data/graphs/NetworkAnnualCarbonEmissionBreakdown_NPgPlanningScenario_MtCO2.csv"><img src="resources/download.svg" alt="download" title="Download data from Figure 3" /> CSV</a>
-					</div>
-				</figure>
-
 			<h2>Low carbon technologies</h2>
 			
 				<figure class="jekyll-parse">
-					<figcaption><strong>Figure 4:</strong> Electric vehicle uptake forecast (#)</figcaption>
+					<figcaption><strong>Figure 1:</strong> Electric vehicle uptake forecast (#)</figcaption>
 					<div class="table-holder">{% include_relative data/graphs/graph-ev.html %}</div>
 					{% include_relative data/graphs/graph-ev.svg %}
 					<div class="download">
@@ -115,7 +81,7 @@ <h2>Low carbon technologies</h2>
 				</figure>
 	
 				<figure class="jekyll-parse">
-					<figcaption><strong>Figure 5:</strong> Electric vehicle penetration of total car stock (%)</figcaption>
+					<figcaption><strong>Figure 2:</strong> Electric vehicle penetration of total car stock (%)</figcaption>
 					<div class="table-holder">{% include_relative data/graphs/graph-ev-percent.html %}</div>
 					{% include_relative data/graphs/graph-ev-percent.svg %}
 					<div class="download">
@@ -125,7 +91,7 @@ <h2>Low carbon technologies</h2>
 				</figure>
 	
 				<figure class="jekyll-parse">
-					<figcaption><strong>Figure 6:</strong> Total number of heat pumps (#)</figcaption>
+					<figcaption><strong>Figure 3:</strong> Total number of heat pumps (#)</figcaption>
 					<div class="table-holder">{% include_relative data/graphs/graph-heatpumps.html %}</div>
 					{% include_relative data/graphs/graph-heatpumps.svg %}
 					<div class="download">
@@ -135,7 +101,7 @@ <h2>Low carbon technologies</h2>
 				</figure>
 	
 				<figure class="jekyll-parse">
-					<figcaption><strong>Figure 7:</strong> Battery storage capacity installed (GW)</figcaption>
+					<figcaption><strong>Figure 4:</strong> Battery storage capacity installed (GW)</figcaption>
 					<div class="table-holder">{% include_relative data/graphs/graph-battery-storage.html %}</div>
 					{% include_relative data/graphs/graph-battery-storage.svg %}
 					<div class="download">
@@ -145,7 +111,7 @@ <h2>Low carbon technologies</h2>
 				</figure>
 	
 				<figure class="jekyll-parse">
-					<figcaption><strong>Figure 8:</strong> Renewable generation installed (GW)</figcaption>
+					<figcaption><strong>Figure 5:</strong> Renewable generation installed (GW)</figcaption>
 					<div class="table-holder">{% include_relative data/graphs/graph-renewable-generation-installed.html %}</div>
 					{% include_relative data/graphs/graph-renewable-generation-installed.svg %}
 					<div class="download">
@@ -155,7 +121,7 @@ <h2>Low carbon technologies</h2>
 				</figure>
 	
 				<figure class="jekyll-parse">
-					<figcaption><strong>Figure 9:</strong> Electric bus and HGV uptake forecast (#)</figcaption>
+					<figcaption><strong>Figure 6:</strong> Electric bus and HGV uptake forecast (#)</figcaption>
 					<div class="table-holder">{% include_relative data/graphs/graph-ebus-ehgv.html %}</div>
 					{% include_relative data/graphs/graph-ebus-ehgv.svg %}
 					<div class="download">
@@ -167,7 +133,7 @@ <h2>Low carbon technologies</h2>
 			<h2>Network data</h2>
 			
 				<figure class="jekyll-parse">
-					<figcaption><strong>Figure 10:</strong> Annual peak demand (GW)</figcaption>
+					<figcaption><strong>Figure 7:</strong> Annual peak demand (GW)</figcaption>
 					<div class="table-holder">{% include_relative data/graphs/graph-annual-peak-demand.html %}</div>
 					{% include_relative data/graphs/graph-annual-peak-demand.svg %}
 					<div class="download">
@@ -177,7 +143,7 @@ <h2>Network data</h2>
 				</figure>
 	
 				<figure class="jekyll-parse">
-					<figcaption><strong>Figure 11:</strong> Network peak demand breakdown - Planning Scenario (GW)</figcaption>
+					<figcaption><strong>Figure 8:</strong> Network peak demand breakdown - NPg Best View Scenario (GW)</figcaption>
 					<div class="table-holder">{% include_relative data/graphs/graph-annual-peak-demand-breakdown.html %}</div>
 					{% include_relative data/graphs/graph-annual-peak-demand-breakdown.svg %}
 					<div class="download">
@@ -187,7 +153,7 @@ <h2>Network data</h2>
 				</figure>
 	
 				<figure class="jekyll-parse">
-					<figcaption><strong>Figure 12:</strong> Network energy consumption breakdown - Planning Scenario (TWh)</figcaption>
+					<figcaption><strong>Figure 9:</strong> Network energy consumption breakdown - NPg Best View Scenario (TWh)</figcaption>
 					<div class="table-holder">{% include_relative data/graphs/graph-energy-consumption-breakdown.html %}</div>
 					{% include_relative data/graphs/graph-energy-consumption-breakdown.svg %}
 					<div class="download">
@@ -197,7 +163,7 @@ <h2>Network data</h2>
 				</figure>
 	
 				<figure class="jekyll-parse">
-					<figcaption><strong>Figure 13:</strong> Annual network energy consumption (TWh)</figcaption>
+					<figcaption><strong>Figure 10:</strong> Annual network energy consumption (TWh)</figcaption>
 					<div class="table-holder">{% include_relative data/graphs/graph-annual-energy-consumption.html %}</div>
 					{% include_relative data/graphs/graph-annual-energy-consumption.svg %}
 					<div class="download">
@@ -207,7 +173,7 @@ <h2>Network data</h2>
 				</figure>
 	
 				<figure class="jekyll-parse">
-					<figcaption><strong>Figure 14:</strong> Network annual fuel consumption breakdown - Planning Scenario (GWh-yr)</figcaption>
+					<figcaption><strong>Figure 11:</strong> Network annual fuel consumption breakdown - NPg Best View Scenario (GWh-yr)</figcaption>
 					<div class="table-holder">{% include_relative data/graphs/graph-fuel-consumption-planning-scenario.html %}</div>
 					{% include_relative data/graphs/graph-fuel-consumption-planning-scenario.svg %}
 					<div class="download">
@@ -217,7 +183,7 @@ <h2>Network data</h2>
 				</figure>
 	
 				<figure class="jekyll-parse">
-					<figcaption><strong>Figure 15:</strong> Additional industrial peak demand breakdown - Planning Scenario (MW)</figcaption>
+					<figcaption><strong>Figure 12:</strong> Additional industrial peak demand breakdown - NPg Best View Scenario (MW)</figcaption>
 					<div class="table-holder">{% include_relative data/graphs/graph-industry-additional-peak-demand-planning-scenario.html %}</div>
 					{% include_relative data/graphs/graph-industry-additional-peak-demand-planning-scenario.svg %}
 					<div class="download">
@@ -227,7 +193,7 @@ <h2>Network data</h2>
 				</figure>
 	
 				<figure class="jekyll-parse">
-					<figcaption><strong>Figure 16:</strong> Additional industrial energy consumption breakdown - Planning Scenario (GWh)</figcaption>
+					<figcaption><strong>Figure 13:</strong> Additional industrial energy consumption breakdown - NPg Best View Scenario (GWh)</figcaption>
 					<div class="table-holder">{% include_relative data/graphs/graph-industry-additional-energy-consumption-planning-scenario.html %}</div>
 					{% include_relative data/graphs/graph-industry-additional-energy-consumption-planning-scenario.svg %}
 					<div class="download">
@@ -235,7 +201,38 @@ <h2>Network data</h2>
 						<a href="data/graphs/IndustryAdditionalEnergyConsumptionBreakdown_NPgPlanningScenario_GWh.csv"><img src="resources/download.svg" alt="download" title="Download data from Figure 16" /> CSV</a>
 					</div>
 				</figure>
-
+			
+			<h2>Emissions</h2>
+			
+				<figure class="jekyll-parse">
+					<figcaption><strong>Figure 14:</strong> Annual carbon emissions (MtCO2)</figcaption>
+					<div class="table-holder">{% include_relative data/graphs/graph-annual-co2-emissions.html %}</div>
+					{% include_relative data/graphs/graph-annual-co2-emissions.svg %}
+					<div class="download">
+						<a href="data/graphs/graph-annual-co2-emissions.svg"><img src="resources/download.svg" alt="download" title="Download graph from Figure 1" /> SVG</a>
+						<a href="data/graphs/AnnualCarbonEmissions_MtCO2.csv"><img src="resources/download.svg" alt="download" title="Download data from Figure 1" /> CSV</a>
+					</div>
+				</figure>
+	
+				<figure class="jekyll-parse">
+					<figcaption><strong>Figure 15:</strong> Cumulative carbon emissions (MtCO2)</figcaption>
+					<div class="table-holder">{% include_relative data/graphs/graph-cumulative-carbon-emissions.html %}</div>
+					{% include_relative data/graphs/graph-cumulative-carbon-emissions.svg %}
+					<div class="download">
+						<a href="data/graphs/graph-cumulative-carbon-emissions.svg"><img src="resources/download.svg" alt="download" title="Download graph from Figure 2" /> SVG</a>
+						<a href="data/graphs/CumulativeCarbonEmissions_MtCO2.csv"><img src="resources/download.svg" alt="download" title="Download data from Figure 2" /> CSV</a>
+					</div>
+				</figure>
+	
+				<figure class="jekyll-parse">
+					<figcaption><strong>Figure 16:</strong> Network annual carbon emission breakdown - NPg Best View Scenario (MtCO2)</figcaption>
+					<div class="table-holder">{% include_relative data/graphs/graph-annual-carbon-emissions-planning-scenario.html %}</div>
+					{% include_relative data/graphs/graph-annual-carbon-emissions-planning-scenario.svg %}
+					<div class="download">
+						<a href="data/graphs/graph-annual-carbon-emissions-planning-scenario.svg"><img src="resources/download.svg" alt="download" title="Download graph from Figure 3" /> SVG</a>
+						<a href="data/graphs/NetworkAnnualCarbonEmissionBreakdown_NPgPlanningScenario_MtCO2.csv"><img src="resources/download.svg" alt="download" title="Download data from Figure 3" /> CSV</a>
+					</div>
+				</figure>
 			
 		</div>
 	</div>