From 448b42196edbfe297b919bf3f4d9252d9722e2a4 Mon Sep 17 00:00:00 2001
From: Daniel Roth <daniel_roth@hotmail.co.uk>
Date: Tue, 21 Apr 2026 15:36:32 +0000
Subject: [PATCH] =?UTF-8?q?map=20electric=20storage=20heater=20fuel=20type?=
 =?UTF-8?q?=20=F0=9F=9F=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 datatypes/epc/domain/mapper.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/datatypes/epc/domain/mapper.py b/datatypes/epc/domain/mapper.py
index df48336f..a554f5cd 100644
--- a/datatypes/epc/domain/mapper.py
+++ b/datatypes/epc/domain/mapper.py
@@ -1556,12 +1556,19 @@ def _map_sap_heating(
         else None
     )
 
+    _ELECTRIC_SYSTEM_TYPES = {"electric storage heaters", "electric underfloor heating"}
+    fuel_type = (
+        main.fuel
+        if main.fuel
+        else ("Electricity" if main.system_type.lower() in _ELECTRIC_SYSTEM_TYPES else main.fuel)
+    )
+
     return SapHeating(
         instantaneous_wwhrs=InstantaneousWwhrs(),
         main_heating_details=[
             MainHeatingDetail(
                 has_fghrs=main.flue_gas_heat_recovery_system,
-                main_fuel_type=main.fuel,
+                main_fuel_type=fuel_type,
                 heat_emitter_type=main.emitter,
                 emitter_temperature=main.emitter_temperature,
                 fan_flue_present=main.fan_assist,