Update data/climate_data.py

data/climate_data.py

@@ -91,6 +91,54 @@ class ClimateData:
         self.countries = sorted(list(set(loc.country for loc in self.locations.values())))
         self.country_states = self._group_locations_by_country_state()
 
+    def get_location_by_id(self, location_id: str, session_state: Dict[str, Any]) -> Optional[Dict[str, Any]]:
+        """Retrieve climate data by ID from session state or locations."""
+        if "climate_data" in session_state and session_state["climate_data"].get("id") == location_id:
+            return session_state["climate_data"]
+        if location_id in self.locations:
+            return self.locations[location_id].to_dict()
+        return None
+
+    @staticmethod
+    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",
+            "climate_zone", "heating_degree_days", "cooling_degree_days",
+            "winter_design_temp", "summer_design_temp_db", "summer_design_temp_wb",
+            "summer_daily_range", "monthly_temps", "monthly_humidity"
+        ]
+        month_names = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
+        
+        for field in required_fields:
+            if field not in data:
+                return False
+        
+        if not (-90 <= data["latitude"] <= 90 and -180 <= data["longitude"] <= 180):
+            return False
+        if data["elevation"] < 0:
+            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"]:
+            return False
+        if not (data["heating_degree_days"] >= 0 and data["cooling_degree_days"] >= 0):
+            return False
+        if not (-50 <= data["winter_design_temp"] <= 20):
+            return False
+        if not (0 <= data["summer_design_temp_db"] <= 50 and 0 <= data["summer_design_temp_wb"] <= 40):
+            return False
+        if data["summer_daily_range"] < 0:
+            return False
+        
+        for month in month_names:
+            if month not in data["monthly_temps"] or month not in data["monthly_humidity"]:
+                return False
+            if not (-50 <= data["monthly_temps"][month] <= 50):
+                return False
+            if not (0 <= data["monthly_humidity"][month] <= 100):
+                return False
+        
+        return True
+
     @staticmethod
     def calculate_wet_bulb(dry_bulb: np.ndarray, relative_humidity: np.ndarray) -> np.ndarray:
         """Calculate Wet Bulb Temperature using Stull (2011) approximation."""
@@ -249,9 +297,12 @@ class ClimateData:
                             monthly_humidity=monthly_humidity
                         )
                         self.add_location(location)
-                        session_state["climate_data"] = location.to_dict()  # Save to session state
+                        climate_data_dict = location.to_dict()
+                        if not self.validate_climate_data(climate_data_dict):
+                            raise ValueError("Invalid climate data. Please check all inputs.")
+                        session_state["climate_data"] = climate_data_dict  # Save to session state
                         st.success("Climate data saved manually!")
-                        st.write(f"Debug: Saved climate data for {location.city}: {location.to_dict()}")  # Debug
+                        st.write(f"Debug: Saved climate data for {location.city} (ID: {location.id}): {climate_data_dict}")  # Debug
                         self.display_design_conditions(location)
                         self.visualize_data(location, epw_data=None)
                     except Exception as e:
@@ -329,9 +380,12 @@ class ClimateData:
                         monthly_humidity=monthly_humidity
                     )
                     self.add_location(location)
-                    session_state["climate_data"] = location.to_dict()  # Save to session state
+                    climate_data_dict = location.to_dict()
+                    if not self.validate_climate_data(climate_data_dict):
+                        raise ValueError("Invalid climate data extracted from EPW file.")
+                    session_state["climate_data"] = climate_data_dict  # Save to session state
                     st.success("Climate data extracted from EPW file with calculated Wet Bulb Temperature!")
-                    st.write(f"Debug: Saved climate data for {location.city}: {location.to_dict()}")  # Debug
+                    st.write(f"Debug: Saved climate data for {location.city} (ID: {location.id}): {climate_data_dict}")  # Debug
                     self.display_design_conditions(location)
                     self.visualize_data(location, epw_data=epw_data)
                 except Exception as e:
@@ -541,5 +595,5 @@ class ClimateData:
 
 if __name__ == "__main__":
     climate_data = ClimateData()
-    session_state = {"building_info": {"country": "Iceland", "city": "Reykjavik"}, "page": "Climate Data"}
+    session_state = {"building_info": {"country": "Iceland", "city": "Reyugalvik"}, "page": "Climate Data"}
     climate_data.display_climate_input(session_state)