Update data/drapery.py

data/drapery.py

@@ -400,7 +400,7 @@ class CLTDCalculator:
     """Class for calculating Cooling Load Temperature Difference (CLTD) values."""
     
     def __init__(self, indoor_temp: float = 25.6, outdoor_max_temp: float = 35.0, 
-                 outdoor_daily_range: float = 11.7, latitude: Latitude = Latitude.LAT_40N, 
+                 outdoor_daily_range: float = 11.7, latitude: Any = '40N', 
                  month: int = 7):
         """
         Initialize CLTD calculator.
@@ -409,17 +409,42 @@ class CLTDCalculator:
             indoor_temp: Indoor design temperature (°C)
             outdoor_max_temp: Outdoor maximum temperature (°C)
             outdoor_daily_range: Daily temperature range (°C)
-            latitude: Latitude category (24°N, 40°N, 48°N)
+            latitude: Latitude (number, e.g., 40, or string, e.g., '40N')
             month: Month (1-12)
         """
-        self.indoor_temp = indoor_temp  # °C
-        self.outdoor_max_temp = outdoor_max_temp  # °C
-        self.outdoor_daily_range = outdoor_daily_range  # °C
-        self.latitude = latitude
+        self.indoor_temp = indoor_temp
+        self.outdoor_max_temp = outdoor_max_temp
+        self.outdoor_daily_range = outdoor_daily_range
         self.month = month
         self.outdoor_avg_temp = outdoor_max_temp - outdoor_daily_range / 2
         
-        # Initialize ASHRAE tables for SCL data
+        # Validate and map latitude
+        valid_latitudes = ['24N', '32N', '40N', '48N', '56N']
+        try:
+            if isinstance(latitude, str):
+                lat_str = latitude.upper().strip().replace('°', '').replace(' ', '')
+                num_part = ''.join(c for c in lat_str if c.isdigit() or c == '.')
+                lat_val = float(num_part)
+                if 'S' in lat_str:
+                    lat_val = -lat_val
+            else:
+                lat_val = float(latitude)
+            abs_lat = abs(lat_val)
+            if abs_lat < 28:
+                mapped_latitude = '24N'
+            elif abs_lat < 36:
+                mapped_latitude = '32N'
+            elif abs_lat < 44:
+                mapped_latitude = '40N'
+            elif abs_lat < 52:
+                mapped_latitude = '48N'
+            else:
+                mapped_latitude = '56N'
+        except (ValueError, TypeError):
+            raise ValueError(f"Invalid latitude: {latitude}. Use number (e.g., 40) or string (e.g., '40N')")
+        self.latitude = Latitude[mapped_latitude]
+        
+        # Initialize ASHRAE tables
         self.ashrae_tables = ASHRAETables()
         
         # Load CLTD tables