diff --git a/model_data/epc_attributes/FloorAttributes.py b/model_data/epc_attributes/FloorAttributes.py index 1fe0a8a4..2426dea8 100644 --- a/model_data/epc_attributes/FloorAttributes.py +++ b/model_data/epc_attributes/FloorAttributes.py @@ -30,6 +30,8 @@ class FloorAttributes(Definitions): "i ofod heb ei wresogi, wedigçöi inswleiddio": "to unheated space, insulated", "solet, wedigçöi inswleiddio (rhagdybiaeth)": "solid, insulated (assumed)", "solet, wedigçöi inswleiddio": "solid, insulated", + "i ofod heb ei wresogi, dim inswleiddio (rhagdybiaeth)": "to unheated space, no insulation (assumed)", + "i ofod heb ei wresogi, dim inswleiddio": "to unheated space, no insulation" } def __init__(self, description: str): diff --git a/model_data/epc_attributes/HotWaterAttributes.py b/model_data/epc_attributes/HotWaterAttributes.py index 26f2a40f..e6bc27e8 100644 --- a/model_data/epc_attributes/HotWaterAttributes.py +++ b/model_data/epc_attributes/HotWaterAttributes.py @@ -104,7 +104,10 @@ class HotWaterAttributes(Definitions): "trydan ar unwaith yn y fan lle maegçön cael ei ddefnyddio": 'electric instantaneous at point of use', "o gynllun cymunedol": "community scheme", "o'r brif system": "from main system", - "trydan ar unwaith yn y fan lle mae'n cael ei ddefnyddio": 'electric instantaneous at point of use' + "trydan ar unwaith yn y fan lle mae'n cael ei ddefnyddio": 'electric instantaneous at point of use', + "popty estynedig olew, dim thermostat ar y silindr": "oil range cooker, no cylinder thermostat", + "cynllun cymunedol": "community scheme", + "nwy wrth fwy nag un pwynt": "gas multipoint", } def __init__(self, description: str): diff --git a/model_data/epc_attributes/MainheatControlAttributes.py b/model_data/epc_attributes/MainheatControlAttributes.py index d9b8f356..e152ffae 100644 --- a/model_data/epc_attributes/MainheatControlAttributes.py +++ b/model_data/epc_attributes/MainheatControlAttributes.py @@ -81,6 +81,7 @@ class MainheatControlAttributes(Definitions): "rhaglennydd, dim thermostat ystafell": "programmer, no room thermostat", "rhaglennydd a thermostat ystafell": "programmer and room thermostat", "rheoligçör t+ól +ó llaw": "manual charge control", + "rheoli'r t+ól +ó llaw": "manual charge control", "rheolaeth amser a rheolaeth parthau tymheredd": "time and temperature zone control", "rhaglennydd a thermostatau ar y cyfarpar": "programmer, room thermostat", "rheolyddion i wresogyddion storio sygçön cadw llawer o wres": "controls for high heat retention storage " @@ -89,7 +90,8 @@ class MainheatControlAttributes(Definitions): "rhaglennydd ac o leiaf ddau thermostat ystafell": "programmer and at least two room thermostats", "thermostat ystafell yn unig": "room thermostat only", "dim rheolaeth amser na rheolaeth thermostatig ar dymheredd yr ystafell": "no time or thermostatic control of " - "room temperature" + "room temperature", + "rheoli gwefr drydanol yn awtomatig": "automatic charge control", } def __init__(self, description: str): diff --git a/model_data/tests/test_data/test_floor_attributes_cases.py b/model_data/tests/test_data/test_floor_attributes_cases.py index 00e92062..ba062c4f 100644 --- a/model_data/tests/test_data/test_floor_attributes_cases.py +++ b/model_data/tests/test_data/test_floor_attributes_cases.py @@ -363,4 +363,7 @@ clean_floor_cases = [ {'original_description': 'Solet, wediGÇÖi inswleiddio (rhagdybiaeth)', 'thermal_transmittance': None, 'thermal_transmittance_unit': None, 'is_assumed': True, 'is_to_unheated_space': False, 'is_to_external_air': False, 'is_suspended': False, 'is_solid': True, 'insulation_thickness': 'average', "another_property_below": False}, + {'original_description': 'I ofod heb ei wresogi, dim inswleiddio (rhagdybiaeth)', 'thermal_transmittance': None, + 'thermal_transmittance_unit': None, 'is_assumed': True, 'is_to_unheated_space': True, 'is_to_external_air': False, + 'is_suspended': False, 'is_solid': False, 'insulation_thickness': 'none', "another_property_below": False}, ] diff --git a/model_data/tests/test_data/test_hot_water_attributes_cases.py b/model_data/tests/test_data/test_hot_water_attributes_cases.py index 25d9889b..88f92928 100644 --- a/model_data/tests/test_data/test_hot_water_attributes_cases.py +++ b/model_data/tests/test_data/test_hot_water_attributes_cases.py @@ -173,4 +173,27 @@ hotwater_cases = [ 'system_type': None, 'thermostat_characteristics': None, 'heating_scope': None, 'energy_recovery': None, 'tariff_type': None, 'extra_features': None, 'chp_systems': None, 'distribution_system': None, 'no_system_present': None, 'assumed': False, "appliance": None}, + {'original_description': 'Oil range cooker', 'heater_type': None, 'system_type': None, + 'thermostat_characteristics': None, 'heating_scope': None, 'energy_recovery': None, 'tariff_type': None, + 'extra_features': None, 'chp_systems': None, 'distribution_system': None, 'no_system_present': None, + 'assumed': False, "appliance": "oil range cooker"}, + {'original_description': 'Oil range cooker, no cylinder thermostat', 'heater_type': None, 'system_type': None, + 'thermostat_characteristics': 'no cylinder thermostat', 'heating_scope': None, 'energy_recovery': None, + 'tariff_type': None, + 'extra_features': None, 'chp_systems': None, 'distribution_system': None, 'no_system_present': None, + 'assumed': False, "appliance": "oil range cooker"}, + {'original_description': 'Popty estynedig olew, dim thermostat ar y silindr', 'heater_type': None, + 'system_type': None, + 'thermostat_characteristics': 'no cylinder thermostat', 'heating_scope': None, 'energy_recovery': None, + 'tariff_type': None, + 'extra_features': None, 'chp_systems': None, 'distribution_system': None, 'no_system_present': None, + 'assumed': False, "appliance": "oil range cooker"}, + {'original_description': 'Cynllun cymunedol', 'heater_type': None, 'system_type': 'community scheme', + 'thermostat_characteristics': None, 'heating_scope': None, 'energy_recovery': None, 'tariff_type': None, + 'extra_features': None, 'chp_systems': None, 'distribution_system': None, 'no_system_present': None, + 'assumed': False, "appliance": None}, + {'original_description': 'Nwy wrth fwy nag un pwynt', 'heater_type': 'gas multipoint', 'system_type': None, + 'thermostat_characteristics': None, 'heating_scope': None, 'energy_recovery': None, 'tariff_type': None, + 'extra_features': None, 'chp_systems': None, 'distribution_system': None, 'no_system_present': None, + 'assumed': False, "appliance": None}, ] diff --git a/model_data/tests/test_data/test_mainheat_control_attributes_cases.py b/model_data/tests/test_data/test_mainheat_control_attributes_cases.py index dfea2833..f9174491 100644 --- a/model_data/tests/test_data/test_mainheat_control_attributes_cases.py +++ b/model_data/tests/test_data/test_mainheat_control_attributes_cases.py @@ -185,4 +185,10 @@ mainheat_control_cases = [ 'charging_system': None, 'switch_system': None, 'no_control': 'no time or thermostatic control', 'dhw_control': None, 'community_heating': None, 'multiple_room_thermostats': False, 'auxiliary_systems': None, 'trvs': None}, + {'original_description': 'Rheoli gwefr drydanol yn awtomatig', 'thermostatic_control': None, + 'charging_system': 'automatic 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': "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}, ]