ev-crash-course: move l1 cost per mile to table shortcode, rename cost_charging to charging_cost

3 files changed, 36 insertions, 8 deletions

diff --git a/content/articles/ev-crash-course.md b/content/articles/ev-crash-course.md
index 65da15c..2fd200b 100644
--- a/content/articles/ev-crash-course.md
+++ b/content/articles/ev-crash-course.md
@@ -60,19 +60,15 @@ trips.
 Home Level 1 charging is billed at the residential energy rate.  In
 Virginia at $0.13/kWh and 85% efficiency, I pay:
 
-**Cost of Charging, Home Level 1 Charger**
-
-{{< table "ev_crash_course" "l1_cost_charging" >}}
+**Charging Cost, Home Level 1 Charger**
+{{< table "ev_crash_course" "l1_charging_cost" >}}
 
 Here is a cost per mile comparison of [my car][epa-model3] using home Level 1
 charging versus [Nadine's car][epa-ioniq], assuming $0.13/kWh for
 electricity and [$3.189/gallon][gas-cpg-va] for gasoline in Virginia:
 
 **Cost Per Mile Comparison, Home Level 1 Charger**
-|Vehicle|Energy Source|Unit Price|Cost per Mile|
-|-------|-------------|---------:|------------:|
-|[2017 Hyundai Ioniq Hybrid][epa-ioniq]|Gasoline|[$3.189/gallon][gas-cpg-va]|$0.0580|
-|[2019 Tesla Model 3 LR AWD][epa-model3]|Home L1 EVSE|$0.13/kWh|**$0.0444**|
+{{< table "ev_crash_course" "l1_cost_per_mile" >}}
 
 ### Level 2 Chargers
 Level 2 chargers are 240V, 30A-50A lines with a [J1772][] connector that
@@ -326,6 +322,7 @@ Here is how the number of stops, total stop time, and total cost stack
 up across all of the example cars:
 
 **Eugene, OR to Port Angeles, WA, All Example Vehicles**
+**Eugene, OR to Port Angeles, WA, All Example Vehicles**
 |Vehicle|Number of Stops|Total Stop Time (min)|Cost|
 |-------|--------------:|--------------------:|---:|
 |[2017 Hyundia Ioniq Hybrid][epa-ioniq]|**0**|**0**|$23.09|
diff --git a/data/tables/ev_crash_course/l1_cost_charging.yaml b/data/tables/ev_crash_course/l1_charging_cost.yaml
index a35e746..d0aca01 100644
--- a/data/tables/ev_crash_course/l1_cost_charging.yaml
+++ b/data/tables/ev_crash_course/l1_charging_cost.yaml
@@ -1,6 +1,6 @@
 ---
 # table name (required)
-name: "Cost of Charging, Home Level 1 Charger"
+name: "Charging Cost, Home Level 1 Charger"
 
 # table columns (required)
 cols:
diff --git a/data/tables/ev_crash_course/l1_cost_per_mile.yaml b/data/tables/ev_crash_course/l1_cost_per_mile.yaml
new file mode 100644
index 0000000..9e6ec52
--- /dev/null
+++ b/data/tables/ev_crash_course/l1_cost_per_mile.yaml
@@ -0,0 +1,31 @@
+---
+# table name (required)
+name: "Cost Per Mile Comparison, Home Level 1 Charger"
+
+# table columns (required)
+cols:
+  - id: "vehicle"
+    name: "Vehicle"
+    tip: "Vehicle."
+  - id: "source"
+    name: "Energy Source"
+    tip: "Source of energy."
+  - id: "unit_price"
+    name: "Unit Price"
+    tip: "Price of energy per unit."
+    align: "right"
+  - id: "cost_per_mile"
+    name: "Cost per Mile"
+    tip: "Cost to travel 1 mile in this vehicle and energy source."
+    align: "right"
+
+# table rows (required)
+rows:
+- vehicle: "[2017 Hyundai Ioniq Hybrid](https://www.fueleconomy.gov/feg/noframes/38484.shtml \"2017 Hyundia Ioniq Hybrid\")"
+  source: "Gasoline"
+  unit_price: "[$3.189/gallon](https://gasprices.aaa.com/?state=VA \"Cost of gas per gallon in Fairfax County\")"
+  cost_per_mile: "$0.0580"
+- vehicle: "[2019 Tesla Model 3 LR AWD](https://fueleconomy.gov/feg/Find.do?action=sbs&id=41190 \"2019 Tesla Model 3 LR AWD (my car)\")"
+  source: "Home L1 EVSE"
+  unit_price: "$0.13/kWh"
+  cost_per_mile: "**$0.0444**"