From 0e8136d445f0f84c1b56b2611853aa1c3b157b7c Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Fri, 27 Sep 2024 16:18:31 +0100 Subject: [PATCH] debugging epc cleaning --- etl/epc_clean/epc_attributes/FloorAttributes.py | 3 ++- etl/epc_clean/epc_attributes/MainheatAttributes.py | 8 ++++++++ etl/epc_clean/epc_attributes/MainheatControlAttributes.py | 3 ++- etl/epc_clean/epc_attributes/RoofAttributes.py | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/etl/epc_clean/epc_attributes/FloorAttributes.py b/etl/epc_clean/epc_attributes/FloorAttributes.py index 9d0f514d..bba33424 100644 --- a/etl/epc_clean/epc_attributes/FloorAttributes.py +++ b/etl/epc_clean/epc_attributes/FloorAttributes.py @@ -32,7 +32,8 @@ class FloorAttributes(Definitions): "solet, wedigçöi inswleiddio": "solid, insulated", "solet, wedi???i inswleiddio (rhagdybiaeth)": "solid, insulated (assumed)", "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" + "i ofod heb ei wresogi, heb ei 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/etl/epc_clean/epc_attributes/MainheatAttributes.py b/etl/epc_clean/epc_attributes/MainheatAttributes.py index 896f73b9..ea61c3b4 100644 --- a/etl/epc_clean/epc_attributes/MainheatAttributes.py +++ b/etl/epc_clean/epc_attributes/MainheatAttributes.py @@ -63,6 +63,13 @@ class MainHeatAttributes(Definitions): "heaters", "pwmp gwres sygçön tarddu yn yr awyr, awyr gynnes, trydan": "air source heat pump, warm air, electric", "stor wresogyddion trydan": "electric storage heaters", + # Not 100% certain - the translation is "bottled gas" + "bwyler a rheiddiaduron, nwy potel": "boiler and radiators, lpg", + "gwresogyddion trydan cludadwy wedi i ragdybio ar gyfer y rhan fwyaf o r ystafelloedd": "portable electric " + "heaters assumed for " + "most rooms", + "st r wresogyddion trydan": "electric storage heaters", + "dim system ar gael, rhagdybir bod gwresogyddion trydan, trydan": "no system present, electric heaters assumed", # Should be handled by edge cases ", trydan": ", electric", } @@ -77,6 +84,7 @@ class MainHeatAttributes(Definitions): "radiator heating, electric": "room heaters, electric", "hot-water-only systems, gas": "no system present, electric heaters assumed", "gas-fired heat pumps, electric": "air source heat pump, electric", + "radiator heating, heat from boilers - gas": "boiler and radiators, mains gas", } edge_case_result = {} diff --git a/etl/epc_clean/epc_attributes/MainheatControlAttributes.py b/etl/epc_clean/epc_attributes/MainheatControlAttributes.py index d7509d47..4a846498 100644 --- a/etl/epc_clean/epc_attributes/MainheatControlAttributes.py +++ b/etl/epc_clean/epc_attributes/MainheatControlAttributes.py @@ -116,7 +116,8 @@ class MainheatControlAttributes(Definitions): 'trvs a falf osgoi': 'trvs and bypass', 'rheolaeth celect': 'celect-type control', 'rheoli r tal a llaw': 'manual charge control', - 'tal un gyfradd, thermostat ystafell yn unig': 'flat rate charging, room thermostat only' + 'tal un gyfradd, thermostat ystafell yn unig': 'flat rate charging, room thermostat only', + "rheoli'r t l llaw": "manual charge control", } def __init__(self, description: str): diff --git a/etl/epc_clean/epc_attributes/RoofAttributes.py b/etl/epc_clean/epc_attributes/RoofAttributes.py index 0fc2156e..2eacc951 100644 --- a/etl/epc_clean/epc_attributes/RoofAttributes.py +++ b/etl/epc_clean/epc_attributes/RoofAttributes.py @@ -27,6 +27,7 @@ class RoofAttributes(Definitions): "yn wastad, dim inswleiddio (rhagdybiaeth)": "flat, no insulation (assumed)", "yn wastad, dim inswleiddio": "flat, no insulation", "yn wastad, wedigçöi inswleiddio (rhagdybiaeth)": "flat, insulated (assumed)", + "yn wastad, wedi?i hinswleiddio (rhagdybiaeth)": "flat, insulated (assumed)", "yn wastad, wedigçöi inswleiddio": "flat, insulated", "(eiddo arall uwchben)": "(another dwelling above)", "(annedd arall uwchben)": "(another dwelling above)",