Update app.py

app.py

@@ -1,167 +1,133 @@
 import gradio as gr
 import requests
 import os
+import folium
 
 # Your Google Pollen API key should be set as a secret in your Hugging Face Space
 API_KEY = os.environ.get("GOOGLE_API_KEY")
 
-# --- Event Handlers ---
-
-def handle_map_select(evt: gr.SelectData):
-    """
-    This function is triggered when a user clicks on the map.
-    It returns the selected latitude and longitude.
-    """
-    return evt.value["latitude"], evt.value["longitude"]
+# --- Map Function ---
+def create_map_html(latitude, longitude):
+    """Creates a Folium map and returns its HTML representation."""
+    try:
+        lat = float(latitude)
+        lon = float(longitude)
+        # Create a map centered on the coordinates
+        m = folium.Map(location=[lat, lon], zoom_start=12, tiles="OpenStreetMap")
+        # Add a marker to the map
+        folium.Marker([lat, lon], popup="Selected Location").add_to(m)
+        return m._repr_html_()
+    except (ValueError, TypeError):
+        # Return a default map if inputs are invalid or empty
+        m = folium.Map(location=[40.7128, -74.0060], zoom_start=5, tiles="OpenStreetMap")
+        return m._repr_html_()
 
+# --- API Call Function ---
 def get_pollen_data(latitude, longitude):
     """
     Fetches and formats all available pollen data from the Google Pollen API.
+    Also returns an updated map.
     """
     if not API_KEY:
-        error_message = "Error: GOOGLE_API_KEY not found. Please set it as a secret in your Hugging Face Space."
-        # Return an error message for all three output tabs
-        return error_message, error_message, error_message
+        error_message = "Error: GOOGLE_API_KEY not found. Please set it as a secret."
+        map_html = create_map_html(latitude, longitude)
+        return error_message, error_message, error_message, map_html
 
     if not latitude or not longitude:
-        # Return a blank message for all three tabs if there's no input
-        return "", "", ""
+        return "", "", "", create_map_html(latitude, longitude)
 
     try:
         lat = float(latitude)
         lon = float(longitude)
     except (ValueError, TypeError):
         error_message = "Error: Invalid latitude or longitude."
-        return error_message, error_message, error_message
+        return error_message, error_message, error_message, create_map_html(latitude, longitude)
 
     endpoint = "https://pollen.googleapis.com/v1/forecast:lookup"
-    params = {
-        "key": API_KEY,
-        "location.latitude": lat,
-        "location.longitude": lon,
-        "days": 5,
-        "languageCode": "en"
-    }
+    params = {"key": API_KEY, "location.latitude": lat, "location.longitude": lon, "days": 5, "languageCode": "en"}
 
     try:
         response = requests.get(endpoint, params=params)
         response.raise_for_status()
         data = response.json()
+        map_html = create_map_html(latitude, longitude)
 
         if not data.get('dailyInfo'):
-            no_data_message = "No pollen data found for this location in the API response."
-            return no_data_message, no_data_message, no_data_message
+            no_data_message = "No pollen data found for this location."
+            return no_data_message, no_data_message, no_data_message, map_html
 
-        # Initialize strings for each pollen category tab
         outputs = {'TREE': "", 'GRASS': "", 'WEED': ""}
-
         for day_info in data.get('dailyInfo', []):
             date = day_info.get('date', {})
             date_str = f"{date.get('year', 'N/A')}-{date.get('month', 'N/A'):02d}-{date.get('day', 'N/A'):02d}"
             
-            # Add date header to each category for the current day
             for cat in outputs.keys():
                 outputs[cat] += f"## Date: {date_str}\n"
 
             pollen_found_for_day = {'TREE': False, 'GRASS': False, 'WEED': False}
             
-            # Process every pollen type returned by the API for the day
             for pollen in day_info.get('pollenTypeInfo', []):
                 plant_type = pollen.get('plantType', 'UNKNOWN')
-                if plant_type not in outputs:
-                    continue
+                if plant_type not in outputs: continue
                 
                 pollen_found_for_day[plant_type] = True
                 
                 display_name = pollen.get('displayName', 'N/A')
-                in_season_str = "Yes" if pollen.get('inSeason', False) else "No"
-                
-                # Start formatting the detailed output for this pollen type
-                formatted_pollen_info = f"### {display_name}\n"
-                formatted_pollen_info += f"- **In Season:** {in_season_str}\n"
-
-                # Extract and display all details from indexInfo
                 index_info = pollen.get('indexInfo', {})
-                if index_info:
-                    index_value = index_info.get('value', 'N/A')
-                    category = index_info.get('category', 'N/A')
-                    description = index_info.get('description', '')
-                    color = index_info.get('color', '#FFFFFF')
-                    color_swatch = f'<span style="display: inline-block; width: 15px; height: 15px; background-color: {color}; border: 1px solid #ccc; border-radius: 3px; vertical-align: middle;"></span>'
-                    
-                    formatted_pollen_info += f"- **Index Value:** {index_value}\n"
-                    formatted_pollen_info += f"- **Category:** {color_swatch} {category}\n"
-                    if description:
-                         formatted_pollen_info += f"- **Description:** *{description}*\n"
+                category = index_info.get('category', 'N/A')
+                color = index_info.get('color', '#FFFFFF')
+                color_swatch = f'<span style="display: inline-block; width: 15px; height: 15px; background-color: {color}; border: 1px solid #ccc; vertical-align: middle;"></span>'
                 
-                # Extract and display all health recommendations
-                health_recs = pollen.get('healthRecommendations', [])
-                if health_recs:
-                    formatted_pollen_info += "- **Health Recommendations:**\n"
-                    for rec in health_recs:
-                        formatted_pollen_info += f"  - {rec}\n"
-                
-                outputs[plant_type] += formatted_pollen_info + "\n---\n" # Add a separator
+                formatted_pollen_info = f"### {display_name}\n- **Category:** {color_swatch} {category}\n"
+                outputs[plant_type] += formatted_pollen_info + "\n---\n"
 
-            # If after checking all pollen types, a category had none, add a message
             for p_type, found in pollen_found_for_day.items():
                 if not found:
-                    outputs[p_type] += "- No specific pollen data was returned for this category on this day.\n\n---\n"
+                    outputs[p_type] += "- No specific pollen data returned for this category on this day.\n\n---\n"
         
-        # Return the final formatted strings for each tab
-        return outputs['TREE'].strip(), outputs['GRASS'].strip(), outputs['WEED'].strip()
+        return outputs['TREE'].strip(), outputs['GRASS'].strip(), outputs['WEED'].strip(), map_html
 
-    except requests.exceptions.RequestException as e:
-        error_message = f"Error connecting to the API: {e}"
-        return error_message, error_message, error_message
     except Exception as e:
-        error_message = f"An unexpected error occurred: {e}"
-        return error_message, error_message, error_message
+        error_message = f"An error occurred: {e}"
+        return error_message, error_message, error_message, create_map_html(latitude, longitude)
 
 # --- Gradio Interface ---
-with gr.Blocks(theme=gr.themes.Soft(), css="footer {display: none !important}") as demo:
-    gr.Markdown("# 🤧 Interactive Pollen Forecast Map")
-    gr.Markdown("Click on the map to select a location, or enter coordinates manually. The pollen forecast for the next 5 days will be displayed below.")
+with gr.Blocks(theme=gr.themes.Soft()) as demo:
+    gr.Markdown("# 🤧 Pollen Forecast Map")
+    gr.Markdown("Enter coordinates and click 'Get Forecast' to see the 5-day pollen forecast and the location on the map.")
     
     with gr.Row():
-        with gr.Column(scale=2):
-            # Use the native Gradio Map component
-            map_component = gr.Map(label="Location Map", value={"latitude": 45.6770, "longitude": -111.0429}, interactive=True)
-        
         with gr.Column(scale=1):
-            lat_input = gr.Textbox(label="Latitude", placeholder="Select on map or enter here")
-            lon_input = gr.Textbox(label="Longitude", placeholder="Select on map or enter here")
+            lat_input = gr.Textbox(label="Latitude", value="40.7128")
+            lon_input = gr.Textbox(label="Longitude", value="-74.0060")
+            submit_button = gr.Button("Get Forecast", variant="primary")
             gr.Examples(
-                examples=[
-                    ["40.7128", "-74.0060"], # New York, NY
-                    ["34.0522", "-118.2437"], # Los Angeles,CA
-                    ["51.5074", "-0.1278"],  # London, UK
-                ],
+                examples=[["34.0522", "-118.2437"], ["51.5074", "-0.1278"]],
                 inputs=[lat_input, lon_input],
                 label="Example Locations"
             )
+        
+        with gr.Column(scale=2):
+            map_output = gr.HTML(label="Location Map")
 
-    with gr.Tabs() as data_tabs:
+    with gr.Tabs():
         with gr.TabItem("🌳 Tree"):
             tree_output = gr.Markdown()
         with gr.TabItem("🌱 Grass"):
             grass_output = gr.Markdown()
         with gr.TabItem("🌿 Weed"):
             weed_output = gr.Markdown()
-            
-    # --- Event Listeners ---
-    
-    # 1. When a user clicks the map, update the latitude and longitude textboxes.
-    map_component.select(handle_map_select, None, [lat_input, lon_input])
-    
-    # 2. When the latitude or longitude textboxes change (either from map click or manual entry),
-    #    automatically call the pollen API.
-    lat_input.change(get_pollen_data, [lat_input, lon_input], [tree_output, grass_output, weed_output])
-    lon_input.change(get_pollen_data, [lat_input, lon_input], [tree_output, grass_output, weed_output])
-    
-    # 3. When the app loads, get data for the default location.
-    demo.load(get_pollen_data, [lat_input, lon_input], [tree_output, grass_output, weed_output])
 
+    submit_button.click(
+        fn=get_pollen_data,
+        inputs=[lat_input, lon_input],
+        outputs=[tree_output, grass_output, weed_output, map_output]
+    )
+    demo.load(
+        fn=get_pollen_data,
+        inputs=[lat_input, lon_input],
+        outputs=[tree_output, grass_output, weed_output, map_output]
+    )
 
 if __name__ == "__main__":
     demo.launch()