Update server.py

server.py

@@ -1,11 +1,18 @@
 # server.py
 import matplotlib.pyplot as plt
-from shiny import render, ui
+from shiny import render, ui, reactive
 import faicons as fa
 #from fontawesomefree import icons
 import numpy as np
 from utils import conlogo, vendorlogo
 from utils import create_pie_chart, create_bar_chart, create_bar_chart, create_stacked_bar_chart
+import plotly.express as px
+from utils import load_data, filter_trips
+from shinywidgets import output_widget, render_widget
+import plotly.graph_objects as go
+
+# Load the data
+zones, trips = load_data()
 
 def create_server(app_dir):
     def server(input, output, session):
@@ -49,5 +56,72 @@ def create_server(app_dir):
             out_napa = [2000, 4000, 2000, 5000, 1000]
 
             return create_stacked_bar_chart(categories, intra_napa, into_napa, out_napa)
+        
+        # Reactive values to track selections
+        selected_origin = reactive.Value(None)
+        selected_destination = reactive.Value(None)
+
+        @reactive.Effect
+        #@reactive.event(input)
+        @reactive.event(input.origin_map_click, input.destination_map_click)
+        def update_selections():
+            """Update selections when a map is clicked."""
+            selected_origin.set(input.origin_map_click.get("customdata"))
+            selected_destination.set(input.destination_map_click.get("customdata"))
+
+        @reactive.Calc
+        def filtered_data():
+            """Filter trips based on selected origin or destination."""
+            return filter_trips(trips, zones, selected_origin.get(), selected_destination.get())
+
+        @output
+        #@render.plot
+        #@render.ui
+        @render_widget
+        def origin_map():
+            filtered_origins, _ = filtered_data()
+            fig = px.choropleth(
+                filtered_origins,
+                geojson=filtered_origins.geometry,
+                locations=filtered_origins.index,
+                color="trip_count",
+                title="Trip Origins",
+                custom_data=["FPID"],
+                #mapbox_style="open-street-map",
+                #zoom=7.5,
+                #center={"lat": filtered_origins.geometry.centroid.y.mean(), "lon": filtered_origins.geometry.centroid.x.mean()},
+                #opacity=0.7,
+                # color_continuous_scale="amp",
+                # labels={
+                #     "Zone ID": "FPID",
+                #     "Trips": "trip_count"
+                # }
+            )
+            fig.update_geos(fitbounds="locations", visible=False)
+            #fig.update_layout(coloraxis_colorbar=dict(title="Trip Count"))  # Add legend
+            return fig
+            #return ui.HTML(fig.to_html())
+            #return ui.HTML(fig.to_html(full_html=False, include_plotlyjs="cdn"))
+
+        @output
+        #@render.plot
+        #@render.ui
+        @render_widget
+        def destination_map():
+            _, filtered_destinations = filtered_data()
+            fig = px.choropleth(
+                filtered_destinations,
+                geojson=filtered_destinations.geometry,
+                locations=filtered_destinations.index,
+                color="trip_count",
+                title="Trip Destinations",
+                custom_data=["FPID"]
+            )
+            fig.update_geos(fitbounds="locations", visible=False)
+            #fig.update_layout(coloraxis_colorbar=dict(title="Trip Count"))  # Add legend
+            return fig
+            #return ui.HTML(fig.to_html())
+            #return ui.HTML(fig.to_html(full_html=False, include_plotlyjs="cdn"))
+        
                 
     return server