Update app.py

app.py

@@ -3,98 +3,58 @@ import folium
 import networkx as nx
 from folium import Map, Marker, PolyLine
 from math import radians, cos, sin, sqrt, atan2
-import time
 from branca.element import MacroElement
 from jinja2 import Template
 
-# Uturere two mu Rwanda hamwe na coordinates (latitude, longitude)
+# 1. Districts of Rwanda with coordinates
 places = {
-    "Nyarugenge": (-1.9577, 30.0619),
-    "Gasabo": (-1.9400, 30.0861),
-    "Kicukiro": (-1.9781, 30.0597),
-    "Burera": (-1.4800, 29.7300),
-    "Gakenke": (-1.5700, 29.7561),
-    "Rulindo": (-1.8333, 30.0833),
-    "Musanze": (-1.5014, 29.6344),
-    "Gicumbi": (-1.5794, 30.0542),
-    "Nyagatare": (-1.3100, 30.3000),
-    "Gatsibo": (-1.6800, 30.3900),
-    "Kayonza": (-2.0000, 30.5667),
-    "Kirehe": (-2.3553, 30.7767),
-    "Ngoma": (-2.1600, 30.4700),
-    "Rwamagana": (-1.9491, 30.4349),
-    "Bugesera": (-2.2083, 30.2576),
-    "Kamonyi": (-2.0833, 29.9000),
-    "Muhanga": (-2.1200, 29.7561),
-    "Ruhango": (-2.2136, 29.7628),
-    "Nyamagabe": (-2.4978, 29.4897),
-    "Nyaruguru": (-2.5806, 29.4306),
-    "Huye": (-2.5921, 29.7408),
-    "Gisagara": (-2.6283, 29.6820),
-    "Nyanza": (-2.3566, 29.7507),
-    "Rutsiro": (-2.0986, 29.3269),
-    "Karongi": (-2.0667, 29.4677),
-    "Rubavu": (-1.7481, 29.2730),
-    "Rusizi": (-2.5406, 29.3737),
-    "Nyamasheke": (-2.4700, 29.3222),
-    "Ngororero": (-1.8733, 29.5811)
+    "Nyarugenge": (-1.9577, 30.0619), "Gasabo": (-1.9400, 30.0861), "Kicukiro": (-1.9781, 30.0597),
+    "Burera": (-1.4800, 29.7300), "Gakenke": (-1.5700, 29.7561), "Rulindo": (-1.8333, 30.0833),
+    "Musanze": (-1.5014, 29.6344), "Gicumbi": (-1.5794, 30.0542), "Nyagatare": (-1.3100, 30.3000),
+    "Gatsibo": (-1.6800, 30.3900), "Kayonza": (-2.0000, 30.5667), "Kirehe": (-2.3553, 30.7767),
+    "Ngoma": (-2.1600, 30.4700), "Rwamagana": (-1.9491, 30.4349), "Bugesera": (-2.2083, 30.2576),
+    "Kamonyi": (-2.0833, 29.9000), "Muhanga": (-2.1200, 29.7561), "Ruhango": (-2.2136, 29.7628),
+    "Nyamagabe": (-2.4978, 29.4897), "Nyaruguru": (-2.5806, 29.4306), "Huye": (-2.5921, 29.7408),
+    "Gisagara": (-2.6283, 29.6820), "Nyanza": (-2.3566, 29.7507), "Rutsiro": (-2.0986, 29.3269),
+    "Karongi": (-2.0667, 29.4677), "Rubavu": (-1.7481, 29.2730), "Rusizi": (-2.5406, 29.3737),
+    "Nyamasheke": (-2.4700, 29.3222), "Ngororero": (-1.8733, 29.5811)
 }
 
-# Haversine function (heuristic for A*)
+# 2. Haversine function for distance (used in graph and heuristic)
 def haversine(coord1, coord2):
-    R = 6371  # Earth radius in km
+    R = 6371
     lat1, lon1 = coord1
     lat2, lon2 = coord2
     dlat = radians(lat2 - lat1)
     dlon = radians(lon2 - lon1)
-    a = sin(dlat/2)**2 + cos(radians(lat1))*cos(radians(lat2))*sin(dlon/2)**2
-    c = 2 * atan2(sqrt(a), sqrt(1-a))
+    a = sin(dlat / 2)**2 + cos(radians(lat1)) * cos(radians(lat2)) * sin(dlon / 2)**2
+    c = 2 * atan2(sqrt(a), sqrt(1 - a))
     return R * c
 
-# Build graph with edges and weights
-G = nx.Graph()
+# 3. Graph structure with real connections between neighboring districts
 edges = [
-    ("Nyarugenge", "Gasabo"),
-    ("Gasabo", "Kicukiro"),
-    ("Burera", "Gakenke"),
-    ("Gakenke", "Rulindo"),
-    ("Musanze", "Gicumbi"),
-    ("Nyagatare", "Gatsibo"),
-    ("Kayonza", "Kirehe"),
-    ("Ngoma", "Rwamagana"),
-    ("Bugesera", "Kamonyi"),
-    ("Muhanga", "Ruhango"),
-    ("Nyamagabe", "Nyaruguru"),
-    ("Huye", "Gisagara"),
-    ("Nyanza", "Ruhango"),
-    ("Rutsiro", "Karongi"),
-    ("Rubavu", "Rusizi"),
-    ("Nyamasheke", "Ngororero"),
-    ("Rulindo", "Gasabo"),
-    ("Gicumbi", "Nyagatare"),
-    ("Kicukiro", "Kamonyi"),
-    ("Kamonyi", "Muhanga"),
-    ("Ruhango", "Nyamagabe"),
-    ("Karongi", "Rubavu"),
-    ("Rusizi", "Nyamasheke"),
-    ("Ngororero", "Rutsiro")
+    ("Nyarugenge", "Gasabo"), ("Gasabo", "Kicukiro"), ("Kicukiro", "Bugesera"), ("Bugesera", "Rwamagana"),
+    ("Rwamagana", "Kayonza"), ("Kayonza", "Kirehe"), ("Kirehe", "Ngoma"), ("Ngoma", "Gatsibo"),
+    ("Gatsibo", "Nyagatare"), ("Gatsibo", "Gicumbi"), ("Gicumbi", "Rulindo"), ("Rulindo", "Gakenke"),
+    ("Gakenke", "Burera"), ("Burera", "Musanze"), ("Musanze", "Rubavu"), ("Rubavu", "Rutsiro"),
+    ("Rutsiro", "Karongi"), ("Karongi", "Nyamasheke"), ("Nyamasheke", "Rusizi"), ("Rutsiro", "Ngororero"),
+    ("Ngororero", "Muhanga"), ("Muhanga", "Kamonyi"), ("Kamonyi", "Nyarugenge"), ("Muhanga", "Ruhango"),
+    ("Ruhango", "Nyanza"), ("Nyanza", "Huye"), ("Huye", "Gisagara"), ("Gisagara", "Nyaruguru"),
+    ("Nyaruguru", "Nyamagabe"), ("Nyamagabe", "Karongi"), ("Ngororero", "Ruhango"),
+    ("Gicumbi", "Gasabo"), ("Bugesera", "Ngoma")
 ]
-for edge in edges:
-    c1 = places[edge[0]]
-    c2 = places[edge[1]]
-    dist = haversine(c1, c2)
-    G.add_edge(edge[0], edge[1], weight=dist)
 
-# Add nodes that might be missing
-for place in places.keys():
-    if place not in G:
-        G.add_node(place)
+# 4. Build the weighted graph
+G = nx.Graph()
+for u, v in edges:
+    dist = haversine(places[u], places[v])
+    G.add_edge(u, v, weight=dist)
 
-# Heuristic function for A*
+# 5. A* heuristic function
 def heuristic(u, v):
     return haversine(places[u], places[v])
 
-# Folium animation plugin for marker movement
+# 6. Folium animation class
 class AnimateMarker(MacroElement):
     _template = Template("""
         {% macro script(this, kwargs) %}
@@ -117,46 +77,41 @@ class AnimateMarker(MacroElement):
         self._name = "AnimateMarker"
         self.locations = locations
 
+# 7. Core route generation function
 def generate_map(start, end):
-    if start is None or end is None:
-        return "Hitamo aho utangiriye n’aho ugiye neza.", ""
-    if start not in G.nodes or end not in G.nodes:
-        return "Hitamo aho utangiriye n’aho ugiye neza (ntiboneka mu rutonde).", ""
-
-    m = Map(location=[-2.0, 30.0], zoom_start=8)
-    for name, coord in places.items():
-        Marker(location=coord, popup=name).add_to(m)
-
     if start == end:
-        return "Hitamo aho utangiriye n’aho ugiye bitandukanye.", m._repr_html_()
+        return "Hitamo aho utangiriye n’aho ugiye bitandukanye.", ""
 
     if not nx.has_path(G, start, end):
-        return f"Nta nzira ibaho hagati ya {start} na {end}.", m._repr_html_()
+        return f"Nta nzira ibaho hagati ya {start} na {end}.", ""
 
     try:
         path = nx.astar_path(G, start, end, heuristic=heuristic, weight='weight')
         coords = [places[p] for p in path]
-        PolyLine(coords, color="blue", weight=5).add_to(m)
 
-        # Add animated marker along the path
+        m = Map(location=[-2.0, 30.0], zoom_start=8)
+        for name, coord in places.items():
+            Marker(location=coord, popup=name).add_to(m)
+
+        PolyLine(coords, color="blue", weight=5).add_to(m)
         m.add_child(AnimateMarker(coords))
 
         return "Inzira ngufi ni: " + " ➔ ".join(path), m._repr_html_()
     except Exception as e:
-        return f"Ntibishoboka kubona inzira: {str(e)}", m._repr_html_()
+        return f"Ntibishoboka kubona inzira: {str(e)}", ""
 
+# 8. Gradio Interface
 iface = gr.Interface(
     fn=generate_map,
     inputs=[
-        gr.Dropdown(list(places.keys()), label="Hitamo aho uri", value=list(places.keys())[0]),
-        gr.Dropdown(list(places.keys()), label="Hitamo aho ugiye", value=list(places.keys())[1])
+        gr.Dropdown(list(places.keys()), label="Hitamo aho uri"),
+        gr.Dropdown(list(places.keys()), label="Hitamo aho ugiye")
     ],
     outputs=[
         gr.Textbox(label="Ubutumwa"),
         gr.HTML(label="Ikarita")
     ],
-    title="🗺️ Rwanda Smart Route Planner with Animation"
+    title="🗺️ VIATEUR AI Rwanda Smart Route Planner "
 )
 
 iface.launch()
-