Update data/climate_data.py

data/climate_data.py

@@ -223,103 +223,103 @@ class ClimateData:
         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", "time_zone",
-                "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"
-            ]
-            
-            for field in required_fields:
-                if field not in data:
-                    st.error(f"Validation failed: Missing required field '{field}'")
-                    return False
-            
-            if not (-90 <= data["latitude"] <= 90 and -180 <= data["longitude"] <= 180):
-                st.error("Validation failed: Invalid latitude or longitude")
-                return False
-            if data["elevation"] < 0:
-                st.error("Validation failed: Negative elevation")
+    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", "time_zone",
+            "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"
+        ]
+        
+        for field in required_fields:
+            if field not in data:
+                st.error(f"Validation failed: Missing required field '{field}'")
                 return False
-            if not (-12 <= data["time_zone"] <= 14):
-                st.error(f"Validation failed: Time zone {data['time_zone']} outside range (-12 to +14)")
+        
+        if not (-90 <= data["latitude"] <= 90 and -180 <= data["longitude"] <= 180):
+            st.error("Validation failed: Invalid latitude or longitude")
+            return False
+        if data["elevation"] < 0:
+            st.error("Validation failed: Negative elevation")
+            return False
+        if not (-12 <= data["time_zone"] <= 14):
+            st.error(f"Validation failed: Time zone {data['time_zone']} outside range (-12 to +14)")
+            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
+        if not (data["heating_degree_days"] >= 0 and data["cooling_degree_days"] >= 0):
+            st.error("Validation failed: Negative degree days")
+            return False
+        if not (-50 <= data["winter_design_temp"] <= 20):
+            st.error(f"Validation failed: Winter design temp {data['winter_design_temp']} outside range")
+            return False
+        if not (0 <= data["summer_design_temp_db"] <= 50 and 0 <= data["summer_design_temp_wb"] <= 40):
+            st.error("Validation failed: Invalid summer design temperatures")
+            return False
+        if data["summer_daily_range"] < 0:
+            st.error("Validation failed: Negative summer daily range")
+            return False
+        if not (0 <= data["wind_speed"] <= 30):
+            st.error(f"Validation failed: Wind speed {data['wind_speed']} outside range")
+            return False
+        if not (80000 <= data["pressure"] <= 110000):
+            st.error(f"Validation failed: Pressure {data['pressure']} outside range")
+            return False
+        
+        if not data["hourly_data"] or len(data["hourly_data"]) < 8700:
+            st.error(f"Validation failed: Hourly data has {len(data['hourly_data'])} records, expected ~8760")
+            return False
+        for record in data["hourly_data"]:
+            if not (1 <= record["month"] <= 12):
+                st.error(f"Validation failed: Invalid month {record['month']}")
                 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']}'")
+            if not (1 <= record["day"] <= 31):
+                st.error(f"Validation failed: Invalid day {record['day']}")
                 return False
-            if not (data["heating_degree_days"] >= 0 and data["cooling_degree_days"] >= 0):
-                st.error("Validation failed: Negative degree days")
+            if not (1 <= record["hour"] <= 24):
+                st.error(f"Validation failed: Invalid hour {record['hour']}")
                 return False
-            if not (-50 <= data["winter_design_temp"] <= 20):
-                st.error(f"Validation failed: Winter design temp {data['winter_design_temp']} outside range")
+            if not (-50 <= record["dry_bulb"] <= 50):
+                st.error(f"Validation failed: Dry bulb {record['dry_bulb']} outside range")
                 return False
-            if not (0 <= data["summer_design_temp_db"] <= 50 and 0 <= data["summer_design_temp_wb"] <= 40):
-                st.error("Validation failed: Invalid summer design temperatures")
+            if not (0 <= record["relative_humidity"] <= 100):
+                st.error(f"Validation failed: Relative humidity {record['relative_humidity']} outside range")
                 return False
-            if data["summer_daily_range"] < 0:
-                st.error("Validation failed: Negative summer daily range")
+            if not (80000 <= record["atmospheric_pressure"] <= 110000):
+                st.error(f"Validation failed: Atmospheric pressure {record['atmospheric_pressure']} outside range")
                 return False
-            if not (0 <= data["wind_speed"] <= 30):
-                st.error(f"Validation failed: Wind speed {data['wind_speed']} outside range")
+            if not (0 <= record["global_horizontal_radiation"] <= 1200):
+                st.error(f"Validation failed: Global radiation {record['global_horizontal_radiation']} outside range")
                 return False
-            if not (80000 <= data["pressure"] <= 110000):
-                st.error(f"Validation failed: Pressure {data['pressure']} outside range")
+            if not (0 <= record["wind_speed"] <= 30):
+                st.error(f"Validation failed: Wind speed {record['wind_speed']} outside range")
                 return False
-            
-            if not data["hourly_data"] or len(data["hourly_data"]) < 8700:
-                st.error(f"Validation failed: Hourly data has {len(data['hourly_data'])} records, expected ~8760")
+            if not (0 <= record["wind_direction"] <= 360):
+                st.error(f"Validation failed: Wind direction {record['wind_direction']} outside range")
                 return False
-            for record in data["hourly_data"]:
-                if not (1 <= record["month"] <= 12):
-                    st.error(f"Validation failed: Invalid month {record['month']}")
-                    return False
-                if not (1 <= record["day"] <= 31):
-                    st.error(f"Validation failed: Invalid day {record['day']}")
-                    return False
-                if not (1 <= record["hour"] <= 24):
-                    st.error(f"Validation failed: Invalid hour {record['hour']}")
-                    return False
-                if not (-50 <= record["dry_bulb"] <= 50):
-                    st.error(f"Validation failed: Dry bulb {record['dry_bulb']} outside range")
-                    return False
-                if not (0 <= record["relative_humidity"] <= 100):
-                    st.error(f"Validation failed: Relative humidity {record['relative_humidity']} outside range")
-                    return False
-                if not (80000 <= record["atmospheric_pressure"] <= 110000):
-                    st.error(f"Validation failed: Atmospheric pressure {record['atmospheric_pressure']} outside range")
-                    return False
-                if not (0 <= record["global_horizontal_radiation"] <= 1200):
-                    st.error(f"Validation failed: Global radiation {record['global_horizontal_radiation']} outside range")
-                    return False
-                if not (0 <= record["wind_speed"] <= 30):
-                    st.error(f"Validation failed: Wind speed {record['wind_speed']} outside range")
-                    return False
-                if not (0 <= record["wind_direction"] <= 360):
-                    st.error(f"Validation failed: Wind direction {record['wind_direction']} outside range")
-                    return False
-            
-            # Validate typical/extreme periods (optional)
-            if "typical_extreme_periods" in data and data["typical_extreme_periods"]:
-                expected_periods = ["summer_extreme", "summer_typical", "winter_extreme", "winter_typical"]
-                missing_periods = [p for p in expected_periods if p not in data["typical_extreme_periods"]]
-                if missing_periods:
-                    st.warning(f"Validation warning: Missing typical/extreme periods: {', '.join(missing_periods)}")
-                for period in data["typical_extreme_periods"].values():
-                    for date in ["start", "end"]:
-                        if not (1 <= period[date]["month"] <= 12 and 1 <= period[date]["day"] <= 31):
-                            st.error(f"Validation failed: Invalid date in typical/extreme periods: {period[date]}")
-                            return False
-            
-            # Validate ground temperatures (optional)
-            if "ground_temperatures" in data and data["ground_temperatures"]:
-                for depth, temps in data["ground_temperatures"].items():
-                    if len(temps) != 12 or not all(0 <= t <= 50 for t in temps):
-                        st.error(f"Validation failed: Invalid ground temperatures for depth {depth}")
+        
+        # Validate typical/extreme periods (optional)
+        if "typical_extreme_periods" in data and data["typical_extreme_periods"]:
+            expected_periods = ["summer_extreme", "summer_typical", "winter_extreme", "winter_typical"]
+            missing_periods = [p for p in expected_periods if p not in data["typical_extreme_periods"]]
+            if missing_periods:
+                st.warning(f"Validation warning: Missing typical/extreme periods: {', '.join(missing_periods)}")
+            for period in data["typical_extreme_periods"].values():
+                for date in ["start", "end"]:
+                    if not (1 <= period[date]["month"] <= 12 and 1 <= period[date]["day"] <= 31):
+                        st.error(f"Validation failed: Invalid date in typical/extreme periods: {period[date]}")
                         return False
-            
-            return True
+        
+        # Validate ground temperatures (optional)
+        if "ground_temperatures" in data and data["ground_temperatures"]:
+            for depth, temps in data["ground_temperatures"].items():
+                if len(temps) != 12 or not all(0 <= t <= 50 for t in temps):
+                    st.error(f"Validation failed: Invalid ground temperatures for depth {depth}")
+                    return False
+        
+        return True
 
     @staticmethod
     def calculate_wet_bulb(dry_bulb: np.ndarray, relative_humidity: np.ndarray) -> np.ndarray: