junte/Model
1
0
Fork 0
mirror of https://github.com/Hestia-Homes/Model.git synced 2026-07-27 23:35:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Int-code the surveyed window orientation to its SAP10 octant code 🟩

Browse source 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Khalim Conn-Kowlessar 2026-07-15 08:48:36 +00:00
parent 5276b45836
commit 27accc6bb1
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
datatypes/epc/domain/epc_property_data.py
View file

@ -306,7 +306,7 @@ class SapConservatory:
class SapWindow:
frame_material: Optional[str]
glazing_gap: Union[int, str]
orientation: Union[int, str]
orientation: Optional[Union[int, str]] # SAP10 octant 1..8; None → no solar gain
window_type: Union[int, str]
glazing_type: Union[int, str]
window_width: float

19
datatypes/epc/domain/mapper.py
View file

@ -6167,7 +6167,7 @@ def _map_sap_window(window: Window) -> SapWindow:
return SapWindow(
frame_material=window.frame_type,
glazing_gap=window.glazing_gap,
orientation=window.orientation,
orientation=_pashub_orientation_int(window.orientation),
window_type=window.window_type,
glazing_type=_pashub_glazing_type_int(window.glazing_type),
window_width=window.width_m,
@ -7153,6 +7153,23 @@ def _elmhurst_orientation_int(orientation: str) -> int:
return _ELMHURST_ORIENTATION_TO_SAP10.get(orientation, 1)
def _pashub_orientation_int(orientation: Optional[str]) -> Optional[int]:
"""Map a PasHub window orientation label to the SAP10 octant code (1..8)
at the mapper boundary (ADR-0015). PasHub lodges it space-separated
("South East") where the shared octant map keys hyphenated, so normalise
before lookup (mirroring `_pashub_pv_arrays`). Blank → None (the solar-
gains cascade skips a window with no orientation). Any uncovered non-empty
label strict-raises (mirroring the other `_pashub_*` coders) — passed
through raw, the string reaches the int-only `_orientation` and silently
zeroes the window's solar-gain contribution."""
if not orientation:
return None
code = _ELMHURST_ORIENTATION_TO_SAP10.get(orientation.replace(" ", "-"))
if code is None:
raise UnmappedPasHubLabel("window orientation", orientation)
return code
# RdSAP 10 §3.7.1 (PDF p.21) — the source RdSAP data set classifies
# each opening as "Window (vertical)" or "Roof window (inclined)" per
# the assessor's discrete lodgement. The Elmhurst Summary PDF §11.0