Upload 2 files

data/ashrae_tables.py

@@ -499,6 +499,41 @@ class ASHRAETables:
 
     def get_cltd_roof(self, roof_group: str, latitude: str, hour: int) -> float:
         """Get CLTD value for a roof."""
+        # Map latitude to standard format before forming the key
+        valid_latitudes = ['24N', '36N', '48N']
+        
+        # Handle numeric or non-standard latitude values
+        if latitude not in valid_latitudes:
+            # Try to convert to standard format
+            try:
+                # First, handle string representations that might contain direction indicators
+                if isinstance(latitude, str):
+                    # Extract numeric part, removing 'N' or 'S'
+                    lat_str = latitude.upper().strip()
+                    num_part = ''.join(c for c in lat_str if c.isdigit() or c == '.')
+                    lat_val = float(num_part)
+                    
+                    # Adjust for southern hemisphere if needed
+                    if 'S' in lat_str:
+                        lat_val = -lat_val
+                else:
+                    # Handle direct numeric input
+                    lat_val = float(latitude)
+                
+                # Take absolute value for mapping purposes
+                abs_lat = abs(lat_val)
+                
+                # Map to the closest standard latitude for roof data
+                if abs_lat < 30:
+                    latitude = '24N'
+                elif abs_lat < 42:
+                    latitude = '36N'
+                else:
+                    latitude = '48N'
+                
+            except (ValueError, TypeError):
+                raise ValueError(f"Invalid latitude format: {latitude}")
+        
         key = f"{roof_group}_{latitude}"
         if key not in self.cltd_roof:
             raise ValueError(f"Invalid roof group or latitude: {key}")
@@ -508,6 +543,45 @@ class ASHRAETables:
 
     def get_scl(self, latitude: str, month: str, orientation: str, hour: int) -> float:
         """Get SCL value for a window."""
+        # Map latitude to standard format before forming the key
+        valid_latitudes = ['24N', '32N', '40N', '48N', '56N']
+        
+        # Handle numeric or non-standard latitude values
+        if latitude not in valid_latitudes:
+            # Try to convert to standard format
+            try:
+                # First, handle string representations that might contain direction indicators
+                if isinstance(latitude, str):
+                    # Extract numeric part, removing 'N' or 'S'
+                    lat_str = latitude.upper().strip()
+                    num_part = ''.join(c for c in lat_str if c.isdigit() or c == '.')
+                    lat_val = float(num_part)
+                    
+                    # Adjust for southern hemisphere if needed
+                    if 'S' in lat_str:
+                        lat_val = -lat_val
+                else:
+                    # Handle direct numeric input
+                    lat_val = float(latitude)
+                
+                # Take absolute value for mapping purposes
+                abs_lat = abs(lat_val)
+                
+                # Map to the closest standard latitude for SCL data
+                if abs_lat < 28:
+                    latitude = '24N'
+                elif abs_lat < 36:
+                    latitude = '32N'
+                elif abs_lat < 44:
+                    latitude = '40N'
+                elif abs_lat < 52:
+                    latitude = '48N'
+                else:
+                    latitude = '56N'
+                
+            except (ValueError, TypeError):
+                raise ValueError(f"Invalid latitude format: {latitude}")
+        
         key = f"{latitude}_{month}"
         if key not in self.scl:
             raise ValueError(f"Invalid latitude or month: {key}")