souvik0306 commited on
Commit
d2233e6
·
1 Parent(s): bb56ab3

Refactor check_route function and map display

Browse files
Files changed (2) hide show
  1. app.py +1 -1
  2. map_generator.py +19 -1
app.py CHANGED
@@ -38,7 +38,7 @@ def check_route(airport_selections, aircraft_type):
38
  result = {
39
  "Optimal Route": " -> ".join(optimal_route) + f" -> {optimal_route[0]}",
40
  "Total Round Trip Distance": f"{optimal_distance} km",
41
- "Total Fuel Required": feasibility_result["Total Fuel Required (kg)"],
42
  "Total Flight Time": feasibility_result["Total Flight Time (hrs)"],
43
  "Can Fly Entire Route": "Yes",
44
  "Sector Details": feasibility_result["Sector Details"]
 
38
  result = {
39
  "Optimal Route": " -> ".join(optimal_route) + f" -> {optimal_route[0]}",
40
  "Total Round Trip Distance": f"{optimal_distance} km",
41
+ "Total Fuel Required (kg)": feasibility_result["Total Fuel Required (kg)"],
42
  "Total Flight Time": feasibility_result["Total Flight Time (hrs)"],
43
  "Can Fly Entire Route": "Yes",
44
  "Sector Details": feasibility_result["Sector Details"]
map_generator.py CHANGED
@@ -17,7 +17,25 @@ def create_route_map(airports, lat_long_dict, optimal_route, refuel_sectors):
17
  for i, airport in enumerate(optimal_route):
18
  lat, lon = lat_long_dict[airport]
19
  bounds.append([lat, lon])
20
- folium.Marker([lat, lon], popup=f"{airport} - {airports[airport]}").add_to(route_map)
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
21
 
22
  # Draw lines between the airports
23
  for i in range(len(optimal_route) - 1):
 
17
  for i, airport in enumerate(optimal_route):
18
  lat, lon = lat_long_dict[airport]
19
  bounds.append([lat, lon])
20
+ folium.Marker(
21
+ [lat, lon],
22
+ popup=f"{airport} - {airports[airport]}",
23
+ icon=folium.DivIcon(html=f'''
24
+ <div style="
25
+ background-color: white;
26
+ border: 2px solid black;
27
+ border-radius: 50%;
28
+ width: 30px;
29
+ height: 30px;
30
+ display: flex;
31
+ align-items: center;
32
+ justify-content: center;
33
+ font-size: 14pt;
34
+ color: black;
35
+ ">{i + 1}</div>
36
+ ''')
37
+ ).add_to(route_map)
38
+
39
 
40
  # Draw lines between the airports
41
  for i in range(len(optimal_route) - 1):