remapping solar assisted heat pump

model_data/epc_attributes/MainheatAttributes.py

@@ -18,7 +18,7 @@ class MainHeatAttributes(Definitions):
         "community heat pump",
     ]
     FUEL_TYPES = ["electric", "mains gas", "wood logs", "LPG", "coal", "oil", "wood pellets", "anthracite",
-                  "dual fuel mineral and wood", "smokeless fuel", "lpg"]
+                  "dual fuel mineral and wood", "smokeless fuel", "lpg", "b30k"]
     DISTRIBUTION_SYSTEMS = ["radiators", "fan coil units", "pipes in screed above insulation",
                             "pipes in insulated timber floor", "pipes in concrete slab"]
     OTHERS = ["assumed", "electricaire", "assumed for most rooms"]
@@ -37,11 +37,15 @@ class MainHeatAttributes(Definitions):
         "cynllun cymunedol": "community scheme",
         "bwyler a gwres dan y llawr, nwy prif gyflenwad": "boiler and underfloor heating, mains gas",
         "bwyler a rheiddiaduron, logiau coed": 'boiler and radiators, wood logs',
+        "bwyler a rheiddiaduron, tanwydd di-fwg": "boiler and radiators, smokeless fuel",
+        "bwyler a rheiddiaduron, b30k": "boiler and radiators, b30k",
+        "dim system ar gael, rhagdybir bod gwresogyddion trydan": "no system present, electric heaters assumed"
     }
 
     REMAP = {
         "electric ceiling": "electric ceiling heating",
         "electric heat pumps": "electric heat pump",
+        "solar-assisted heat pump": "solar assisted heat pump"
     }
 
     def __init__(self, description: str):

model_data/epc_attributes/MainheatControlAttributes.py

@@ -92,6 +92,13 @@ class MainheatControlAttributes(Definitions):
         "dim rheolaeth amser na rheolaeth thermostatig ar dymheredd yr ystafell": "no time or thermostatic control of "
                                                                                   "room temperature",
         "rheoli gwefr drydanol yn awtomatig": "automatic charge control",
+        'system dalu wedigçöi chysylltu +ó defnyddio gwres cymunedol, thermostat ystafell yn unig': "charging system "
+                                                                                                    "linked to use of"
+                                                                                                    " community "
+                                                                                                    "heating, "
+                                                                                                    "room thermostat "
+                                                                                                    "only",
+        "dim": "none"
     }
 
     def __init__(self, description: str):

model_data/epc_attributes/RoofAttributes.py

@@ -25,7 +25,9 @@ class RoofAttributes(Definitions):
         "(eiddo arall uwchben)": "(another dwelling above)",
         "(annedd arall uwchben)": "(another dwelling above)",
         "ystafell(oedd) to, wedigçöi hinswleiddio": "roof room(s), insulated",
-
+        "ystafell(oedd) to, wedigçöi hinswleiddio (rhagdybiaeth)": "roof room(s), insulated (assumed)",
+        "ystafell(oedd) to, inswleiddio cyfyngedig (rhagdybiaeth)": "roof room(s), limited insulation (assumed)",
+        "ystafell(oedd) to, inswleiddio cyfyngedig": "roof room(s), limited insulation",
     }
 
     def __init__(self, description: str):

model_data/tests/test_data/test_mainheat_attributes_cases.py

@@ -1298,4 +1298,65 @@ mainheat_cases = [
      'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False,
      "has_electric_heat_pumps": False,
      "has_micro-cogeneration": False},
+    {'original_description': 'Boiler and radiators, smokeless fuel', 'has_radiators': True, 'has_fan_coil_units': False,
+     'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False,
+     'has_pipes_in_concrete_slab': False, 'has_boiler': True, 'has_air_source_heat_pump': False,
+     'has_room_heaters': False, 'has_electric_storage_heaters': False, 'has_warm_air': False,
+     'has_electric_underfloor_heating': False, 'has_electric_ceiling_heating': False, 'has_community_scheme': False,
+     'has_ground_source_heat_pump': False, 'has_no_system_present': False, 'has_portable_electric_heaters': False,
+     'has_water_source_heat_pump': False, 'has_electric': False, 'has_mains_gas': False, 'has_wood_logs': False,
+     'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
+     'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': True, 'has_lpg': False, 'has_assumed': False,
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False,
+     "has_electric_heat_pumps": False,
+     "has_micro-cogeneration": False},
+    {'original_description': 'Bwyler a rheiddiaduron, tanwydd di-fwg', 'has_radiators': True,
+     'has_fan_coil_units': False,
+     'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False,
+     'has_pipes_in_concrete_slab': False, 'has_boiler': True, 'has_air_source_heat_pump': False,
+     'has_room_heaters': False, 'has_electric_storage_heaters': False, 'has_warm_air': False,
+     'has_electric_underfloor_heating': False, 'has_electric_ceiling_heating': False, 'has_community_scheme': False,
+     'has_ground_source_heat_pump': False, 'has_no_system_present': False, 'has_portable_electric_heaters': False,
+     'has_water_source_heat_pump': False, 'has_electric': False, 'has_mains_gas': False, 'has_wood_logs': False,
+     'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
+     'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': True, 'has_lpg': False, 'has_assumed': False,
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False,
+     "has_electric_heat_pumps": False,
+     "has_micro-cogeneration": False},
+    {'original_description': 'Boiler and radiators, B30K', 'has_radiators': True, 'has_fan_coil_units': False,
+     'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False,
+     'has_pipes_in_concrete_slab': False, 'has_boiler': True, 'has_air_source_heat_pump': False,
+     'has_room_heaters': False, 'has_electric_storage_heaters': False, 'has_warm_air': False,
+     'has_electric_underfloor_heating': False, 'has_electric_ceiling_heating': False, 'has_community_scheme': False,
+     'has_ground_source_heat_pump': False, 'has_no_system_present': False, 'has_portable_electric_heaters': False,
+     'has_water_source_heat_pump': False, 'has_electric': False, 'has_mains_gas': False, 'has_wood_logs': False,
+     'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
+     'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False,
+     "has_electric_heat_pumps": False,
+     "has_micro-cogeneration": False, "has_b30k": True},
+    {'original_description': 'Bwyler a rheiddiaduron, B30K', 'has_radiators': True, 'has_fan_coil_units': False,
+     'has_pipes_in_screed_above_insulation': False, 'has_pipes_in_insulated_timber_floor': False,
+     'has_pipes_in_concrete_slab': False, 'has_boiler': True, 'has_air_source_heat_pump': False,
+     'has_room_heaters': False, 'has_electric_storage_heaters': False, 'has_warm_air': False,
+     'has_electric_underfloor_heating': False, 'has_electric_ceiling_heating': False, 'has_community_scheme': False,
+     'has_ground_source_heat_pump': False, 'has_no_system_present': False, 'has_portable_electric_heaters': False,
+     'has_water_source_heat_pump': False, 'has_electric': False, 'has_mains_gas': False, 'has_wood_logs': False,
+     'has_LPG': False, 'has_coal': False, 'has_oil': False, 'has_wood_pellets': False, 'has_anthracite': False,
+     'has_dual_fuel_mineral_and_wood': False, 'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': False,
+     'has_electricaire': False, 'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False,
+     "has_electric_heat_pumps": False,
+     "has_micro-cogeneration": False, "has_b30k": True},
+    {'original_description': 'Dim system ar gael: rhagdybir bod gwresogyddion trydan', 'has_radiators': False,
+     'has_fan_coil_units': False, 'has_pipes_in_screed_above_insulation': False,
+     'has_pipes_in_insulated_timber_floor': False, 'has_pipes_in_concrete_slab': False, 'has_boiler': False,
+     'has_air_source_heat_pump': False, 'has_room_heaters': False, 'has_electric_storage_heaters': False,
+     'has_warm_air': False, 'has_electric_underfloor_heating': False, 'has_electric_ceiling_heating': False,
+     'has_community_scheme': False, 'has_ground_source_heat_pump': False, 'has_no_system_present': True,
+     'has_portable_electric_heaters': False, 'has_water_source_heat_pump': False, 'has_electric': True,
+     'has_mains_gas': False, 'has_wood_logs': False, 'has_LPG': False, 'has_coal': False, 'has_oil': False,
+     'has_wood_pellets': False, 'has_anthracite': False, 'has_dual_fuel_mineral_and_wood': False,
+     'has_smokeless_fuel': False, 'has_lpg': False, 'has_assumed': True, 'has_electricaire': False,
+     'has_assumed_for_most_rooms': False, 'has_underfloor_heating': False, "has_electric_heat_pumps": False,
+     "has_micro-cogeneration": False},
 ]

model_data/tests/test_data/test_mainheat_control_attributes_cases.py

@@ -191,4 +191,11 @@ mainheat_control_cases = [
     {'original_description': "Rheoli'r t+ól +ó llaw", 'thermostatic_control': None,
      'charging_system': 'manual charge control', 'switch_system': None, 'no_control': None, 'dhw_control': None,
      'community_heating': None, 'multiple_room_thermostats': False, 'auxiliary_systems': None, 'trvs': None},
+    {'original_description': 'System dalu wediGÇÖi chysylltu +ó defnyddio gwres cymunedol, thermostat ystafell yn unig',
+     'thermostatic_control': 'room thermostat', 'charging_system': 'charging system', 'switch_system': None,
+     'no_control': None, 'dhw_control': None, 'community_heating': 'use of community heating',
+     'multiple_room_thermostats': False, 'auxiliary_systems': None, 'trvs': None},
+    {'original_description': 'Dim', 'thermostatic_control': None, 'charging_system': None, 'switch_system': None,
+     'no_control': 'none', 'dhw_control': None, 'community_heating': None, 'multiple_room_thermostats': False,
+     'auxiliary_systems': None, 'trvs': None},
 ]

model_data/tests/test_data/test_roof_attributes_cases.py

@@ -382,4 +382,8 @@ clean_roof_test_cases = [
      'thermal_transmittance_unit': None, 'is_pitched': False, 'is_roof_room': False, 'is_loft': False, 'is_flat': True,
      'is_thatched': False, 'is_at_rafters': False, 'is_assumed': True, 'has_dwelling_above': False, 'is_valid': True,
      'insulation_thickness': 'average'},
+    {'original_description': 'Ystafell(oedd) to, inswleiddio cyfyngedig (rhagdybiaeth)', 'thermal_transmittance': None,
+     'thermal_transmittance_unit': None, 'is_pitched': False, 'is_roof_room': True, 'is_loft': False, 'is_flat': False,
+     'is_thatched': False, 'is_at_rafters': False, 'is_assumed': True, 'has_dwelling_above': False, 'is_valid': True,
+     'insulation_thickness': 'below average'},
 ]