Update data/climate_data.py

data/climate_data.py

@@ -129,22 +129,83 @@ class ClimateData:
             with st.form("manual_climate_form"):
                 col1, col2 = st.columns(2)
                 with col1:
-                    id_input = st.text_input("Location ID", value=f"{session_state.building_info['country'][:2].upper()}-{session_state.building_info['city'][:3].upper()}")
-                    state_province = st.text_input("State/Province", value="N/A")
-                    latitude = st.number_input("Latitude", min_value=-90.0, max_value=90.0, value=0.0, step=0.1)
-                    longitude = st.number_input("Longitude", min_value=-180.0, max_value=180.0, value=0.0, step=0.1)
-                    elevation = st.number_input("Elevation (m)", min_value=0.0, value=0.0, step=10.0)
-                    climate_zone = st.selectbox("Climate Zone", ["0A", "0B", "1A", "1B", "2A", "2B", "3A", "3B", "3C", "4A", "4B", "4C", "5A", "5B", "5C", "6A", "6B", "7", "8"])
+                    latitude = st.number_input(
+                        "Latitude",
+                        min_value=-90.0,
+                        max_value=90.0,
+                        value=0.0,
+                        step=0.1,
+                        help="Enter the latitude of the location in degrees (e.g., 64.1 for Reykjavik)"
+                    )
+                    longitude = st.number_input(
+                        "Longitude",
+                        min_value=-180.0,
+                        max_value=180.0,
+                        value=0.0,
+                        step=0.1,
+                        help="Enter the longitude of the location in degrees (e.g., -21.9 for Reykjavik)"
+                    )
+                    elevation = st.number_input(
+                        "Elevation (m)",
+                        min_value=0.0,
+                        value=0.0,
+                        step=10.0,
+                        help="Enter the elevation of the location above sea level in meters"
+                    )
+                    climate_zone = st.selectbox(
+                        "Climate Zone",
+                        ["0A", "0B", "1A", "1B", "2A", "2B", "3A", "3B", "3C", "4A", "4B", "4C", "5A", "5B", "5C", "6A", "6B", "7", "8"],
+                        help="Select the ASHRAE climate zone for the location (e.g., 6A for cold, humid climates)"
+                    )
                 
                 with col2:
-                    hdd = st.number_input("Heating Degree Days (base 18°C)", min_value=0.0, value=0.0, step=100.0)
-                    cdd = st.number_input("Cooling Degree Days (base 18°C)", min_value=0.0, value=0.0, step=100.0)
-                    winter_design_temp = st.number_input("Winter Design Temp (99.6%) (°C)", min_value=-50.0, max_value=20.0, value=0.0, step=0.5)
-                    summer_design_temp_db = st.number_input("Summer Design Temp DB (0.4%) (°C)", min_value=0.0, max_value=50.0, value=35.0, step=0.5)
-                    summer_design_temp_wb = st.number_input("Summer Design Temp WB (0.4%) (°C)", min_value=0.0, max_value=40.0, value=25.0, step=0.5)
-                    summer_daily_range = st.number_input("Summer Daily Range (°C)", min_value=0.0, value=5.0, step=0.5)
+                    hdd = st.number_input(
+                        "Heating Degree Days (base 18°C)",
+                        min_value=0.0,
+                        value=0.0,
+                        step=100.0,
+                        help="Enter the annual heating degree days using an 18°C base temperature"
+                    )
+                    cdd = st.number_input(
+                        "Cooling Degree Days (base 18°C)",
+                        min_value=0.0,
+                        value=0.0,
+                        step=100.0,
+                        help="Enter the annual cooling degree days using an 18°C base temperature"
+                    )
+                    winter_design_temp = st.number_input(
+                        "Winter Design Temp (99.6%) (°C)",
+                        min_value=-50.0,
+                        max_value=20.0,
+                        value=0.0,
+                        step=0.5,
+                        help="Enter the 99.6% winter design temperature in °C (extreme cold condition)"
+                    )
+                    summer_design_temp_db = st.number_input(
+                        "Summer Design Temp DB (0.4%) (°C)",
+                        min_value=0.0,
+                        max_value=50.0,
+                        value=35.0,
+                        step=0.5,
+                        help="Enter the 0.4% summer design dry-bulb temperature in °C (extreme hot condition)"
+                    )
+                    summer_design_temp_wb = st.number_input(
+                        "Summer Design Temp WB (0.4%) (°C)",
+                        min_value=0.0,
+                        max_value=40.0,
+                        value=25.0,
+                        step=0.5,
+                        help="Enter the 0.4% summer design wet-bulb temperature in °C (for humidity consideration)"
+                    )
+                    summer_daily_range = st.number_input(
+                        "Summer Daily Range (°C)",
+                        min_value=0.0,
+                        value=5.0,
+                        step=0.5,
+                        help="Enter the average daily temperature range in summer in °C"
+                    )
                 
-                # Monthly Data with clear titles
+                # Monthly Data with clear titles (no help added here)
                 monthly_temps = {}
                 monthly_humidity = {}
                 month_names = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
@@ -168,10 +229,12 @@ class ClimateData:
                         monthly_humidity[month] = st.number_input(f"{month} Humidity (%)", min_value=0.0, max_value=100.0, value=50.0, step=5.0, key=f"hum_{month}")
                 
                 if st.form_submit_button("Save Climate Data"):
+                    # Generate ID internally using country and city from session_state
+                    generated_id = f"{session_state.building_info['country'][:2].upper()}-{session_state.building_info['city'][:3].upper()}"
                     location = ClimateLocation(
-                        id=id_input,
+                        id=generated_id,
                         country=session_state.building_info["country"],
-                        state_province=state_province,
+                        state_province="N/A",  # Default since input removed
                         city=session_state.building_info["city"],
                         latitude=latitude,
                         longitude=longitude,
@@ -191,7 +254,7 @@ class ClimateData:
                     self.display_design_conditions(location)
                     self.visualize_data(location, epw_data=None)
 
-        # EPW Upload Tab
+        # EPW Upload Tab (unchanged)
         with tab2:
             uploaded_file = st.file_uploader("Upload EPW File", type=["epw"])
             if uploaded_file: