Update app/main.py

app/main.py

@@ -2,6 +2,7 @@
 HVAC Calculator Code Documentation.
 Updated 2025-05-02: Integrated skylights, surface color, glazing type, frame type, and drapery adjustments from main_new.py.
 Updated 2025-05-02: Enhanced per Plan.txt to include winter design temperature, humidity, building height, ventilation rate, internal load enhancements, and calculation parameters.
+Updated 2025-05-09: Fixed latitude parsing to return string (e.g., "24N") to match ASHRAE table keys and added group validation.
 """
 
 import streamlit as st
@@ -52,6 +53,10 @@ VENTILATION_RATES = {
     "Custom": {"people_rate": 0.0, "area_rate": 0.0}
 }
 
+# Valid wall and roof groups for ASHRAE CLTD tables (adjust based on ashrae_tables.py)
+VALID_WALL_GROUPS = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H']
+VALID_ROOF_GROUPS = ['A', 'B', 'C', 'D', 'E', 'F', 'G']
+
 class HVACCalculator:
     def __init__(self):
         st.set_page_config(
@@ -225,6 +230,13 @@ class HVACCalculator:
                         return False, f"Glazing type missing for {component_type}: {comp.name}"
                     if getattr(comp, 'frame_type', None) is None:
                         return False, f"Frame type missing for {component_type}: {comp.name}"
+                # NEW: Validate wall and roof groups
+                if component_type == 'walls':
+                    if getattr(comp, 'wall_group', '') not in VALID_WALL_GROUPS:
+                        return False, f"Invalid wall group '{comp.wall_group}' for {comp.name}. Valid groups: {', '.join(VALID_WALL_GROUPS)}"
+                if component_type == 'roofs':
+                    if getattr(comp, 'roof_group', '') not in VALID_ROOF_GROUPS:
+                        return False, f"Invalid roof group '{comp.roof_group}' for {comp.name}. Valid groups: {', '.join(VALID_ROOF_GROUPS)}"
         
         # Validate ventilation rate
         if building_info.get('ventilation_rate', 0) < 0:
@@ -279,18 +291,30 @@ class HVACCalculator:
         
         return True, "Valid load."
     
-    def parse_latitude(self, latitude: Any) -> float:
-        """Parse latitude from string or float to float value."""
+    def parse_latitude(self, latitude: Any) -> str:
+        """Parse latitude from string or number to ASHRAE table format (e.g., '24N')."""
         try:
             if isinstance(latitude, (int, float)):
-                return float(latitude)
-            if isinstance(latitude, str):
+                lat_value = float(latitude)
+            elif isinstance(latitude, str):
                 lat_str = latitude.strip().upper().replace('N', '').replace('S', '')
-                return float(lat_str)
-            raise ValueError("Invalid latitude format")
+                lat_value = float(lat_str)
+            else:
+                raise ValueError("Invalid latitude format")
+            
+            # Convert to ASHRAE table format (e.g., '24N', '32N')
+            if lat_value in [24, 32, 40, 48]:  # Common ASHRAE latitudes
+                return f"{int(lat_value)}N"
+            else:
+                # Round to nearest supported latitude
+                supported_latitudes = [24, 32, 40, 48]
+                closest_lat = min(supported_latitudes, key=lambda x: abs(x - lat_value))
+                st.warning(f"Latitude {lat_value} not in ASHRAE tables. Using closest: {closest_lat}N")
+                return f"{closest_lat}N"
+                
         except (ValueError, AttributeError) as e:
-            st.error(f"Invalid latitude: {latitude}. Using default 32.0.")
-            return 32.0  # Default to 32N
+            st.error(f"Invalid latitude: {latitude}. Using default 32N.")
+            return "32N"  # Default to 32N
     
     def display_internal_loads(self):
         st.title("Internal Loads")
@@ -1131,7 +1155,7 @@ class HVACCalculator:
                 'lights': {
                     'power': sum(load['power'] for load in internal_loads.get('lighting', [])),
                     'use_factor': internal_loads.get('lighting', [{}])[0].get('usage_factor', 0.8),
-                    'hours_operation': internal_loads.get('lighting', [{}])[0].get('hours_in_operation', '8h'),
+                    'hours_operation': internal_loads.get('lighting', [{}])[0].get('hours_in_operation』, '8h'),
                     'zone_type': internal_loads.get('lighting', [{}])[0].get('zone_type', 'A')
                 },
                 'equipment': {