Fix: use Folium with preset locations, add sklearn and pin hopsworks

app.py

@@ -7,6 +7,7 @@ location, time, weather, and holidays.
 
 import os
 import gradio as gr
+import folium
 from datetime import datetime, timedelta
 
 # Import prediction and data fetching modules
@@ -33,6 +34,7 @@ _predict_fn = predict_occupancy_mock if USE_MOCK else predict_occupancy
 # Default map center: Linköping
 DEFAULT_LAT = 58.4108
 DEFAULT_LON = 15.6214
+DEFAULT_ZOOM = 11
 
 # Östergötland bounds (roughly)
 BOUNDS = {
@@ -42,37 +44,56 @@ BOUNDS = {
     "max_lon": 16.8
 }
 
+# Preset locations for quick selection
+PRESET_LOCATIONS = {
+    "Linköping Central": (58.4158, 15.6253),
+    "Norrköping Central": (58.5942, 16.1826),
+    "Linköping University": (58.3980, 15.5762),
+    "Mjärdevi Science Park": (58.4027, 15.5672),
+    "Motala": (58.5375, 15.0364),
+    "Finspång": (58.7050, 15.7700),
+}
+
+
+def create_map(lat=DEFAULT_LAT, lon=DEFAULT_LON):
+    """Create a Folium map centered on location with marker."""
+    m = folium.Map(
+        location=[lat, lon],
+        zoom_start=DEFAULT_ZOOM,
+        tiles="CartoDB positron"
+    )
 
-def extract_coordinates(map_data):
-    """Extract lat/lon from map selection data."""
-    if map_data is None:
-        return None, None
+    # Add marker at selected location
+    folium.Marker(
+        [lat, lon],
+        popup=f"Selected: {lat:.4f}, {lon:.4f}",
+        icon=folium.Icon(color="blue", icon="bus", prefix="fa")
+    ).add_to(m)
 
-    # gr.Map returns a dict with 'layers' containing markers
-    layers = map_data.get("layers", [])
-    if layers:
-        # Get the last placed marker
-        last_marker = layers[-1]
-        if "coordinates" in last_marker:
-            coords = last_marker["coordinates"]
-            # coordinates are [lon, lat] in GeoJSON format
-            return coords[1], coords[0]
+    # Add a rectangle showing the coverage area
+    folium.Rectangle(
+        bounds=[[BOUNDS["min_lat"], BOUNDS["min_lon"]],
+                [BOUNDS["max_lat"], BOUNDS["max_lon"]]],
+        color="#3388ff",
+        fill=False,
+        weight=1,
+        opacity=0.3,
+        popup="Coverage area"
+    ).add_to(m)
 
-    return None, None
+    return m._repr_html_()
 
 
-def make_prediction(map_data, date_choice, hour):
+def make_prediction(lat, lon, date_choice, hour):
     """
     Make occupancy prediction for given inputs.
 
     Returns formatted result HTML.
     """
-    lat, lon = extract_coordinates(map_data)
-
     if lat is None or lon is None:
         return create_result_card(
             "Please select a location",
-            "Click on the map to place a marker and get a prediction.",
+            "Use the preset buttons or enter coordinates.",
             "gray",
             None
         )
@@ -118,7 +139,7 @@ def make_prediction(map_data, date_choice, hour):
 
         # Build context string
         day_name = selected_date.strftime("%A")
-        day_type = "Holiday" if holidays.get("is_red_day") else ("Work-free day" if holidays.get("is_work_free") else "Regular workday")
+        day_type = "Holiday" if holidays.get("is_red_day") else ("Work-free day" if holidays.get("is_work_free") else "Regular day")
         temp = weather.get("temperature_2m", "?")
 
         context = f"{temp:.0f}°C  •  {day_name}  •  {day_type}"
@@ -196,6 +217,9 @@ CUSTOM_CSS = """
     margin-top: 5px;
     margin-bottom: 20px;
 }
+.location-btn {
+    margin: 2px !important;
+}
 """
 
 # Build Gradio interface
@@ -210,20 +234,43 @@ with gr.Blocks(
     gr.Markdown("*How packed are buses in Östergötland?*", elem_classes=["subtitle"])
 
     with gr.Row():
-        # Left column: Map
+        # Left column: Map and location
         with gr.Column(scale=2):
             gr.Markdown("### Select Location")
-            gr.Markdown("Click on the map to place a marker:")
-
-            map_input = gr.Map(
-                center=(DEFAULT_LAT, DEFAULT_LON),
-                zoom=10,
-                height=400,
-                label="",
-                show_label=False,
-            )
 
-        # Right column: Controls
+            # Quick location buttons
+            gr.Markdown("**Quick select:**")
+            with gr.Row():
+                location_buttons = []
+                for name in list(PRESET_LOCATIONS.keys())[:3]:
+                    btn = gr.Button(name, size="sm", elem_classes=["location-btn"])
+                    location_buttons.append((name, btn))
+            with gr.Row():
+                for name in list(PRESET_LOCATIONS.keys())[3:]:
+                    btn = gr.Button(name, size="sm", elem_classes=["location-btn"])
+                    location_buttons.append((name, btn))
+
+            # Coordinate inputs
+            with gr.Row():
+                lat_input = gr.Number(
+                    label="Latitude",
+                    value=DEFAULT_LAT,
+                    precision=4,
+                    minimum=BOUNDS["min_lat"],
+                    maximum=BOUNDS["max_lat"]
+                )
+                lon_input = gr.Number(
+                    label="Longitude",
+                    value=DEFAULT_LON,
+                    precision=4,
+                    minimum=BOUNDS["min_lon"],
+                    maximum=BOUNDS["max_lon"]
+                )
+
+            # Map display
+            map_display = gr.HTML(value=create_map())
+
+        # Right column: Time and predict
         with gr.Column(scale=1):
             gr.Markdown("### When?")
 
@@ -242,7 +289,6 @@ with gr.Blocks(
                 info="Select time of day (24h format)"
             )
 
-            # Show selected time
             time_display = gr.Markdown("**Selected: 08:00**")
 
             predict_btn = gr.Button("Predict Crowding", variant="primary", size="lg")
@@ -287,15 +333,43 @@ with gr.Blocks(
     def update_time_display(hour):
         return f"**Selected: {int(hour):02d}:00**"
 
+    def update_location(name):
+        lat, lon = PRESET_LOCATIONS[name]
+        return lat, lon, create_map(lat, lon)
+
+    def update_map_from_coords(lat, lon):
+        if lat is not None and lon is not None:
+            return create_map(lat, lon)
+        return create_map()
+
     hour_slider.change(
         fn=update_time_display,
         inputs=[hour_slider],
         outputs=[time_display]
     )
 
+    # Connect location buttons
+    for name, btn in location_buttons:
+        btn.click(
+            fn=lambda n=name: update_location(n),
+            outputs=[lat_input, lon_input, map_display]
+        )
+
+    # Update map when coordinates change
+    lat_input.change(
+        fn=update_map_from_coords,
+        inputs=[lat_input, lon_input],
+        outputs=[map_display]
+    )
+    lon_input.change(
+        fn=update_map_from_coords,
+        inputs=[lat_input, lon_input],
+        outputs=[map_display]
+    )
+
     predict_btn.click(
         fn=make_prediction,
-        inputs=[map_input, date_choice, hour_slider],
+        inputs=[lat_input, lon_input, date_choice, hour_slider],
         outputs=[result_display]
     )
 

requirements.txt

@@ -1,8 +1,10 @@
 gradio==4.44.0
 huggingface_hub>=0.24.0,<1.0.0
-hopsworks
+hopsworks==4.2.*
 xgboost>=2.0.0
+scikit-learn
 pandas
 numpy
 requests
 python-dotenv
+folium>=0.15.0