Update data/climate_data.py

data/climate_data.py

@@ -77,6 +77,7 @@ class ClimateLocation:
     latitude: float
     longitude: float
     elevation: float  # meters
+    timezone: float  # hours from UTC
     climate_zone: str
     heating_degree_days: float  # base 18°C
     cooling_degree_days: float  # base 18°C
@@ -100,6 +101,7 @@ class ClimateLocation:
         self.latitude = kwargs.get("latitude")
         self.longitude = kwargs.get("longitude")
         self.elevation = kwargs.get("elevation")
+        self.timezone = kwargs.get("timezone")
         self.typical_extreme_periods = typical_extreme_periods
         self.ground_temperatures = ground_temperatures
         self.solar_calculations = kwargs.get("solar_calculations", [])
@@ -186,6 +188,7 @@ class ClimateLocation:
             "latitude": self.latitude,
             "longitude": self.longitude,
             "elevation": self.elevation,
+            "timezone": self.timezone,
             "climate_zone": self.climate_zone,
             "heating_degree_days": self.heating_degree_days,
             "cooling_degree_days": self.cooling_degree_days,
@@ -242,7 +245,7 @@ class ClimateData:
     def validate_climate_data(data: Dict[str, Any]) -> bool:
         """Validate climate data for required fields and ranges."""
         required_fields = [
-            "id", "country", "city", "latitude", "longitude", "elevation",
+            "id", "country", "city", "latitude", "longitude", "elevation", "timezone",
             "climate_zone", "heating_degree_days", "cooling_degree_days",
             "winter_design_temp", "summer_design_temp_db", "summer_design_temp_wb",
             "summer_daily_range", "wind_speed", "pressure", "hourly_data"
@@ -259,6 +262,9 @@ class ClimateData:
         if data["elevation"] < 0:
             st.error("Validation failed: Negative elevation")
             return False
+        if not (-24 <= data["timezone"] <= 24):
+            st.error(f"Validation failed: Timezone {data['timezone']} outside range")
+            return False
         if data["climate_zone"] not in ["0A", "0B", "1A", "1B", "2A", "2B", "3A", "3B", "3C", "4A", "4B", "4C", "5A", "5B", "5C", "6A", "6B", "7", "8"]:
             st.error(f"Validation failed: Invalid climate zone '{data['climate_zone']}'")
             return False
@@ -401,7 +407,7 @@ class ClimateData:
         st.markdown(STYLE, unsafe_allow_html=True)
         
         # Clear invalid session_state["climate_data"] without warning
-        if "climate_data" in session_state and not all(key in session_state["climate_data"] for key in ["id", "country", "city"]):
+        if "climate_data" in session_state and not all(key in session_state["climate_data"] for key in ["id", "country", "city", "timezone"]):
             del session_state["climate_data"]
         
         uploaded_file = st.file_uploader("Upload EPW File", type=["epw"])
@@ -528,7 +534,7 @@ class ClimateData:
                     latitude=latitude,
                     longitude=longitude,
                     elevation=elevation,
-                    timezone=timezone,
+                    timezone=timezone
                 )
                 self.add_location(location)
                 climate_data_dict = location.to_dict()
@@ -697,7 +703,7 @@ class ClimateData:
                         <li><strong>Latitude:</strong> {location.latitude}°</li>
                         <li><strong>Longitude:</strong> {location.longitude}°</li>
                         <li><strong>Elevation:</strong> {location.elevation} m</li>
-                        <li><strong>timezone:</strong> {location.timezone} m</li>
+                        <li><strong>Timezone:</strong> {location.timezone:+.1f} hours</li>
                     </ul>
                 </div>
             </div>