Update data/climate_data.py

data/climate_data.py

@@ -92,16 +92,20 @@ class ClimateLocation:
     _solar_cache: Dict[str, Dict[str, float]]  # Cache for solar angle calculations
     
     def __init__(self, epw_file: pd.DataFrame, typical_extreme_periods: Dict, ground_temperatures: Dict, albedo: float = 0.2, **kwargs):
-        """Initialize ClimateLocation with EPW file data and header information."""
-        self.latitude = float(epw_file.columns[6])  # Latitude from EPW header
-        self.longitude = float(epw_file.columns[7])  # Longitude from EPW header
-        self.time_zone = float(epw_file.columns[8])  # Time zone from EPW header
-        self.elevation = float(epw_file.columns[9])  # Elevation from EPW header
+        self.id = kwargs.get("id")
+        self.country = kwargs.get("country")  # Set country from kwargs
+        self.state_province = kwargs.get("state_province", "N/A")
+        self.city = kwargs.get("city")
+        self.latitude = kwargs.get("latitude")
+        self.longitude = kwargs.get("longitude")
+        self.elevation = kwargs.get("elevation")
+        self.time_zone = kwargs.get("time_zone")
+        self.albedo = albedo
         self.hourly_data = epw_file.iloc[8:].to_dict('records')  # Assuming data starts at row 8
         self.typical_extreme_periods = typical_extreme_periods
         self.ground_temperatures = ground_temperatures
-        self.albedo = albedo
-        self.tz = pytz.FixedOffset(int(self.time_zone * 60))  # Fixed UTC+10 offset in minutes
+        self.solstice_zenith_angles = {}
+        self.tz = pytz.FixedOffset(int(self.time_zone * 60))  # Fixed offset in minutes
         
         # Extract columns from EPW data
         months = pd.to_numeric(epw_file[1], errors='coerce').values