Merge pull request #2 from Czaki/generate_path

Add function to calculate path

Author: martingale-2910

.pre-commit-config.yaml

@@ -3,8 +3,8 @@ repos:
   rev: v0.6.4
   hooks:
   - id: ruff-format
-    exclude: examples
   - id: ruff
+    args: [--show-fixes]
 - repo: https://github.com/python-jsonschema/check-jsonschema
   rev: 0.29.2
   hooks:

hackyeah2024/main.py

@@ -1,7 +1,5 @@
 import click
 
-from hackyeah2024.server import run_server
-
 
 @click.group()
 def main():

hackyeah2024/server.py

@@ -1,12 +1,30 @@
 import folium
 import streamlit as st
-
+from osmnx import distance, 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}
+
 
-def plot_route(map, route_pts):
-    route=folium.PolyLine(locations=route_pts, weight=2)
-    map.add_child(route)
+def get_route_points(start, end):
+    G = graph_from_bbox(
+        bbox=(bounding_box['max_lat'], bounding_box['min_lat'], bounding_box['min_lon'], bounding_box['max_lon']),
+        network_type='bike',
+        simplify=False,
+    )
+    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]
+    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
 
 
@@ -19,14 +37,14 @@ def run_server():
         col1, col2 = st.columns(2)
 
         with col1:
-            st.text_input("Skąd")
+            st.text_input('Skąd')
 
         with col2:
-            st.text_input("Dokąd")
+            st.text_input('Dokąd')
 
     cont2 = st.container()
 
-    map_bound_coordinates=[
+    map_bound_coordinates = [
         (50.526524, 19.076385),
         (50.526524, 21.432953),
         (49.174522, 21.432953),
@@ -35,26 +53,26 @@ def run_server():
     ]
 
     # center on Liberty Bell, add marker
-    map = folium.Map(
+    map_ = folium.Map(
         max_bounds=True,
-        location=[0.5*(49.174522 + 50.526524), 0.5*(19.944544 + 21.432953)],
+        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
+        max_lat=50.526524,
     )
     marker = folium.Marker([50.049683, 19.944544], popup='Kraków', tooltip='Kraków')
-    map.add_child(marker)
+    map_.add_child(marker)
 
-    map_bounds=folium.PolyLine(locations=map_bound_coordinates, weight=5)
+    map_bounds = folium.PolyLine(locations=map_bound_coordinates, weight=5)
 
-    map.add_child(map_bounds)
+    map_.add_child(map_bounds)
 
     with cont2:
         # call to render Folium map in Streamlit
-        st_data = st_folium(map, width=725)
+        _st_data = st_folium(map_, width=725)
 
 
 if __name__ == '__main__':

pyproject.toml

@@ -9,6 +9,8 @@ dependencies = [
     "streamlit",
     "streamlit_folium",
     "taxicab",
+    "osmnx",
+    "scikt-learn",
 ]