Improve server

Author: martingale-2910

hackyeah2024/server.py

@@ -17,39 +17,60 @@ def get_graph():
     )
     print('Constructed graph')
     return graph
-    
+
+
+@st.cache_data
+def get_coords(locality):
+    coords = geocoder.geocode(locality)
+    print(f"Getting coords for {locality}")
+    return coords
+
+
+@st.cache_data
+def get_marker(locality):
+    coords = get_coords(locality)
+    return folium.Marker([coords[1], coords[0]], popup=locality, tooltip=locality)
 
 
 @st.cache_data
 def get_route_points(start, end):
-    G = get_graph()
-    orig = geocoder.geocode(start)
-    dest = geocoder.geocode(end)
-    o, _ = distance.nearest_nodes(G, orig[1], orig[0], return_dist=True)
-    d, _ = distance.nearest_nodes(G, dest[1], dest[0], return_dist=True)
-    # print(o, d)
-    route = routing.shortest_path(G, o, d)
-    points = [G.nodes[x] for x in route]
+    g = get_graph()
+
+    orig = get_coords(start)
+    dest = get_coords(end)
+
+    o, _ = distance.nearest_nodes(g, orig[1], orig[0], return_dist=True)
+    d, _ = distance.nearest_nodes(g, dest[1], dest[0], return_dist=True)
+
+    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]
 
 
-@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_route(origin, destination):
+    route_pts = get_route_points(origin, destination)
+    print("Plotted route")
+    return folium.PolyLine(locations=route_pts, weight=2)
+
+
+# @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,
+#     )
+#     print('Constructed map')
+#     return map_
 
 
 @st.cache_data
@@ -84,10 +105,21 @@ def run_server():
     cont2 = st.container()
 
     with cont2:
-        map_ = get_map()
-        route_pts = get_route_points(origin, destination)
-        route = folium.PolyLine(locations=route_pts, weight=2)
+        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)
+        route = get_route(origin, destination)
         map_.add_child(route)
+        origin_marker = get_marker(origin)
+        map_.add_child(origin_marker)
+        dest_marker = get_marker(destination)
+        map_.add_child(dest_marker)
         _st_data = st_folium(map_, width=725)