Update app.py

app.py

@@ -120,22 +120,106 @@ def optimize_route(distances: np.ndarray) -> List[int]:
     
     return tour
 
+def add_markers_and_route(m: folium.Map, places: List[Tuple[str, Tuple[float, float]]], optimal_order: List[int], routing_info: Dict):
+    """Add markers and route lines to the map"""
+    total_distance = 0
+    total_duration = 0
+    
+    for i in range(len(optimal_order)):
+        current_idx = optimal_order[i]
+        next_idx = optimal_order[(i + 1) % len(optimal_order)]
+        
+        current_place, (lat, lon) = places[current_idx]
+        segment_info = routing_info.get((current_idx, next_idx), {})
+        
+        # Add marker
+        popup_content = f"""
+        <b>Stop {i+1}: {current_place}</b><br>
+        """
+        if i < len(optimal_order) - 1:
+            popup_content += f"""
+            To next stop:<br>
+            Distance: {segment_info.get('distance_km', 'N/A')}<br>
+            Duration: {segment_info.get('duration_mins', 'N/A')}
+            """
+        
+        folium.Marker(
+            [lat, lon],
+            popup=folium.Popup(popup_content, max_width=300),
+            icon=create_numbered_marker(i+1)
+        ).add_to(m)
+        
+        # Draw route line
+        if i < len(optimal_order) - 1:
+            if 'geometry' in segment_info:
+                try:
+                    route_coords = polyline.decode(segment_info['geometry'])
+                    folium.PolyLine(
+                        route_coords,
+                        weight=2,
+                        color='blue',
+                        opacity=0.8
+                    ).add_to(m)
+                except Exception as e:
+                    st.warning(f"Error drawing route: {str(e)}")
+                    next_place = places[next_idx][1]
+                    folium.PolyLine(
+                        [[lat, lon], [next_place[0], next_place[1]]],
+                        weight=2,
+                        color='red',
+                        opacity=0.8
+                    ).add_to(m)
+            
+            # Add to totals
+            if 'distance_km' in segment_info:
+                total_distance += float(segment_info['distance_km'].split()[0])
+            if 'duration_mins' in segment_info:
+                total_duration += float(segment_info['duration_mins'].split()[0])
+    
+    return total_distance, total_duration
+
+def display_itinerary_summary(places: List[Tuple[str, Tuple[float, float]]], optimal_order: List[int], routing_info: Dict):
+    """Display the optimized itinerary summary"""
+    # Display summary first
+    st.markdown("### 📊 Summary")
+    total_distance, total_duration = add_markers_and_route(folium.Map(), places, optimal_order, routing_info)
+    st.info(f"""
+    🛣️ Total distance: **{total_distance:.1f} km**  
+    ⏱️ Total duration: **{total_duration:.0f} mins** ({total_duration/60:.1f} hours)
+    """)
+    
+    st.markdown("### 🗺️ Route Details")
+    for i in range(len(optimal_order)):
+        current_idx = optimal_order[i]
+        next_idx = optimal_order[(i + 1) % len(optimal_order)]
+        
+        current_place = places[current_idx][0]
+        segment_info = routing_info.get((current_idx, next_idx), {})
+        
+        st.markdown(f"**Stop {i+1}: {current_place}**")
+        
+        if i < len(optimal_order) - 1:
+            st.markdown(f"↓ *{segment_info.get('distance_km', 'N/A')}, "
+                      f"Duration: {segment_info.get('duration_mins', 'N/A')}*")
+            
+            if 'steps' in segment_info:
+                with st.expander("📍 Turn-by-turn directions"):
+                    instructions = format_instructions(segment_info['steps'])
+                    for idx, instruction in enumerate(instructions, 1):
+                        st.write(f"{idx}. {instruction}")
+
 def main():
     st.set_page_config(page_title="AI Travel Route Optimizer", layout="wide")
-    
     st.title("🌍 AI Travel Route Optimizer")
     st.markdown("""
     This app helps you find the optimal route between multiple destinations using real driving distances.
     Enter your destinations in the sidebar and get a customized route with turn-by-turn directions.
     """)
-    
+
     # Sidebar for inputs
     with st.sidebar:
         st.header("📍 Destinations")
-        
-        # Input for places
         num_places = st.number_input("Number of destinations", min_value=2, max_value=10, value=3)
-        
         places = []
         for i in range(num_places):
             place = st.text_input(f"Destination {i+1}")
@@ -147,11 +231,10 @@ def main():
                         st.success(f"✓ Found coordinates for {place}")
                     else:
                         st.error(f"❌ Couldn't find coordinates for {place}")
-    
+
     # Main content area
-    if len(places) == num_places and num_places >= 2:
+    if len(places) >= 2:
         col1, col2 = st.columns([2, 1])
-        
         with col1:
             with st.spinner("🚗 Calculating optimal route..."):
                 # Calculate real distances
@@ -160,100 +243,20 @@ def main():
                 # Get optimized route order
                 optimal_order = optimize_route(distances)
                 
-                # Create map
-                center_lat = sum(coord[0] for _, coord in places) / len(places)
-                center_lon = sum(coord[1] for _, coord in places) / len(places)
-                m = folium.Map(location=[center_lat, center_lon], zoom_start=4)
-                
-                # Add markers and route lines
-                total_distance = 0
-                total_duration = 0
-                
-                for i in range(len(optimal_order)):
-                    current_idx = optimal_order[i]
-                    next_idx = optimal_order[(i + 1) % len(optimal_order)]
-                    
-                    current_place, (lat, lon) = places[current_idx]
-                    segment_info = routing_info.get((current_idx, next_idx), {})
-                    
-                    # Add marker
-                    popup_content = f"""
-                    <b>Stop {i+1}: {current_place}</b><br>
-                    """
-                    if i < len(optimal_order) - 1:
-                        popup_content += f"""
-                        To next stop:<br>
-                        Distance: {segment_info.get('distance_km', 'N/A')}<br>
-                        Duration: {segment_info.get('duration_mins', 'N/A')}
-                        """
-                    
-                    folium.Marker(
-                        [lat, lon],
-                        popup=folium.Popup(popup_content, max_width=300),
-                        icon=create_numbered_marker(i+1)
-                    ).add_to(m)
-                    
-                    # Draw route line
-                    if i < len(optimal_order) - 1:
-                        if 'geometry' in segment_info:
-                            try:
-                                route_coords = polyline.decode(segment_info['geometry'])
-                                folium.PolyLine(
-                                    route_coords,
-                                    weight=2,
-                                    color='blue',
-                                    opacity=0.8
-                                ).add_to(m)
-                            except Exception as e:
-                                st.warning(f"Error drawing route: {str(e)}")
-                                next_place = places[next_idx][1]
-                                folium.PolyLine(
-                                    [[lat, lon], [next_place[0], next_place[1]]],
-                                    weight=2,
-                                    color='red',
-                                    opacity=0.8
-                                ).add_to(m)
-                        
-                        # Add to totals
-                        if 'distance_km' in segment_info:
-                            total_distance += float(segment_info['distance_km'].split()[0])
-                        if 'duration_mins' in segment_info:
-                            total_duration += float(segment_info['duration_mins'].split()[0])
-                
-                # Display map
+                # Update the route if the user changes the input
+                if st.button("Recalculate Route"):
+                    distances, routing_info = calculate_real_distances(places)
+                    optimal_order = optimize_route(distances)
+
+                # Create map and display
+                m = folium.Map()
+                total_distance, total_duration = add_markers_and_route(m, places, optimal_order, routing_info)
                 st.components.v1.html(m._repr_html_(), height=600)
-        
+
         with col2:
-            st.header("📝 Optimized Itinerary")
-            
-            # Display summary first
-            st.markdown("### 📊 Summary")
-            st.info(f"""
-            🛣️ Total distance: **{total_distance:.1f} km**  
-            ⏱️ Total duration: **{total_duration:.0f} mins** ({total_duration/60:.1f} hours)
-            """)
-            
-            st.markdown("### 🗺️ Route Details")
-            for i in range(len(optimal_order)):
-                current_idx = optimal_order[i]
-                next_idx = optimal_order[(i + 1) % len(optimal_order)]
-                
-                current_place = places[current_idx][0]
-                segment_info = routing_info.get((current_idx, next_idx), {})
-                
-                st.markdown(f"**Stop {i+1}: {current_place}**")
-                
-                if i < len(optimal_order) - 1:
-                    st.markdown(f"↓ *{segment_info.get('distance_km', 'N/A')}, "
-                              f"Duration: {segment_info.get('duration_mins', 'N/A')}*")
-                    
-                    if 'steps' in segment_info:
-                        with st.expander("📍 Turn-by-turn directions"):
-                            instructions = format_instructions(segment_info['steps'])
-                            for idx, instruction in enumerate(instructions, 1):
-                                st.write(f"{idx}. {instruction}")
+            display_itinerary_summary(places, optimal_order, routing_info)
     else:
-        st.info("👈 Please enter all destinations in the sidebar to get started")
+        st.info("👈 Please enter at least 2 destinations in the sidebar to get started")
 
 if __name__ == "__main__":
     main()