Fix deps + use smaller bbox

Author: martingale-2910

entrypoint.sh

@@ -8,5 +8,5 @@ then
     python3 -m hackyeah2024.main ${CMD} ${CMD_ARGS}
 else
     echo "No CLI command provided, running Streamlit server"
-    python3 -m streamlit run hackyeah2024/server.py
+    python3 -m streamlit run hackyeah2024/server.py --server.headless true
 fi

hackyeah2024/server.py

@@ -3,17 +3,21 @@
 from osmnx import distance, features_from_bbox, geocoder, graph_from_bbox, routing
 from streamlit_folium import st_folium
 
-bounding_box = {'min_lat': 49.174522, 'max_lat': 50.526524, 'min_lon': 19.076385, 'max_lon': 21.432953}
+bbox = {'min_lat': 49.880478, 'max_lat': 50.373496,
+        'min_lon': 20.478516, 'max_lon': 21.242065}
 
 
 @st.cache_resource
 def get_graph():
-    return graph_from_bbox(
-        bbox=(bounding_box['max_lat'], bounding_box['min_lat'], bounding_box['min_lon'], bounding_box['max_lon']),
+    graph = graph_from_bbox(
+        bbox=(bbox['max_lat'], bbox['min_lat'], bbox['min_lon'], bbox['max_lon']),
         network_type='bike',
         simplify=False,
         retain_all=True,
     )
+    print('Constructed graph')
+    return graph
+    
 
 
 @st.cache_data
@@ -26,21 +30,34 @@ def get_route_points(start, end):
     # print(o, d)
     route = routing.shortest_path(G, o, d)
     points = [G.nodes[x] for x in route]
+    print("Computed route")
     return [(x['y'], x['x']) for x in points]
 
 
-def plot_route(map_, route_pts):
-    route = folium.PolyLine(locations=route_pts, weight=2)
-    map_.add_child(route)
-    return map
+@st.cache_resource
+def get_map():
+    map_ = folium.Map(
+        max_bounds=True,
+        location=[0.5 * (bbox['min_lat'] + bbox['max_lat']), 0.5 * (bbox['min_lon'] + bbox['max_lon'])],
+        zoom_start=9,
+        tiles='OpenStreetMap',
+        min_lon=19.076385,
+        max_lon=21.432953,
+        min_lat=49.174522,
+        max_lat=50.526524,
+    )
+    marker = folium.Marker([50.01381, 20.98698], popup='Tarnów', tooltip='Tarnów')
+    map_.add_child(marker)
+    print('Constructed map')
+    return map_
 
 
 @st.cache_data
 def get_localities():
     print('Fetching localities')
     x = tuple(
         features_from_bbox(
-            bbox=(bounding_box['max_lat'], bounding_box['min_lat'], bounding_box['min_lon'], bounding_box['max_lon']),
+            bbox=(bbox['max_lat'], bbox['min_lat'], bbox['min_lon'], bbox['max_lon']),
             tags={'place': ['town', 'vilage']},
         )['name'].values
     )
@@ -66,26 +83,11 @@ def run_server():
 
     cont2 = st.container()
 
-    # center on Liberty Bell, add marker
-    map_ = folium.Map(
-        max_bounds=True,
-        location=[0.5 * (49.174522 + 50.526524), 0.5 * (19.944544 + 21.432953)],
-        zoom_start=9,
-        tiles='OpenStreetMap',
-        min_lon=19.076385,
-        max_lon=21.432953,
-        min_lat=49.174522,
-        max_lat=50.526524,
-    )
-    marker = folium.Marker([50.049683, 19.944544], popup='Kraków', tooltip='Kraków')
-    map_.add_child(marker)
-
-    route_pts = get_route_points(origin, destination)
-
-    plot_route(map_, route_pts)
-
     with cont2:
-        # call to render Folium map in Streamlit
+        map_ = get_map()
+        route_pts = get_route_points(origin, destination)
+        route = folium.PolyLine(locations=route_pts, weight=2)
+        map_.add_child(route)
         _st_data = st_folium(map_, width=725)
 
 

pyproject.toml

@@ -10,7 +10,7 @@ dependencies = [
     "streamlit_folium",
     "taxicab",
     "osmnx",
-    "scikt-learn",
+    "scikit-learn",
 ]
 
 

requirements.txt

@@ -48,6 +48,8 @@ jinja2==3.1.4
     #   folium
     #   pydeck
     #   streamlit-folium
+joblib==1.4.2
+    # via scikit-learn
 jsonschema==4.23.0
     # via altair
 jsonschema-specifications==2023.12.1
@@ -79,11 +81,15 @@ numpy==2.1.1
     #   pyarrow
     #   pydeck
     #   pyogrio
+    #   scikit-learn
+    #   scipy
     #   shapely
     #   streamlit
     #   taxicab
 osmnx==1.9.3
-    # via taxicab
+    # via
+    #   hackyeah2024 (pyproject.toml)
+    #   taxicab
 packaging==24.1
     # via
     #   altair
@@ -135,6 +141,10 @@ rpds-py==0.20.0
     # via
     #   jsonschema
     #   referencing
+scikit-learn==1.5.2
+    # via hackyeah2024 (pyproject.toml)
+scipy==1.14.1
+    # via scikit-learn
 shapely==2.0.6
     # via
     #   geopandas
@@ -154,6 +164,8 @@ taxicab==0.0.3
     # via hackyeah2024 (pyproject.toml)
 tenacity==8.5.0
     # via streamlit
+threadpoolctl==3.5.0
+    # via scikit-learn
 toml==0.10.2
     # via streamlit
 tornado==6.4.1