Update app.py

app.py

@@ -365,12 +365,15 @@ def flight_tracking(flight_view_level, country, local_time_zone, flight_info, ai
     # Get cached airport data
     airport_df = load_airport_data()
     airport_locations = airport_df[["Name", "City", "Country", "IATA/FAA", "Latitude", "Longitude"]]
-    airport_country_loc = airport_locations[airport_locations['Country'] == str(loc)]
-    airport_country_loc = airport_country_loc[(airport_country_loc['Country'] == str(loc)) & 
-                                            (airport_country_loc['Latitude'] >= lat_min) &
-                                            (airport_country_loc['Latitude'] <= lat_max) & 
-                                            (airport_country_loc['Longitude'] >= lon_min) &
-                            (airport_country_loc['Longitude'] <= lon_max)]
+    
+    # Filter airports for the selected country and within the view bounds
+    airport_country_loc = airport_locations[
+        (airport_locations['Country'].str.contains(str(loc[0]), case=False, na=False)) & 
+        (airport_locations['Latitude'] >= lat_min) &
+        (airport_locations['Latitude'] <= lat_max) & 
+        (airport_locations['Longitude'] >= lon_min) &
+        (airport_locations['Longitude'] <= lon_max)
+    ]
     
     # Get traffic data
     geo_df = get_traffic_gdf(lat_min, lat_max, lon_min, lon_max, local_time_zone, loc, flight_info)
@@ -510,12 +513,23 @@ def flight_tracking(flight_view_level, country, local_time_zone, flight_info, ai
     # Add airports if selected
     if airport == 1:
         for idx, row in airport_country_loc.iterrows():
-            folium.Marker(
-                location=[row['Latitude'], row['Longitude']],
-                icon=folium.Icon(icon='plane', prefix='fa', color='blue'),
-                popup=f"<b>{row['Name']}</b><br>IATA: {row['IATA/FAA']}<br>City: {row['City']}",
-                tooltip=f"Airport: {row['Name']}"
-            ).add_to(m)
+            if pd.notna(row['Latitude']) and pd.notna(row['Longitude']):
+                folium.Marker(
+                    location=[row['Latitude'], row['Longitude']],
+                    icon=folium.Icon(icon='plane', prefix='fa', color='blue'),
+                    popup=folium.Popup(
+                        f"""
+                        <div style="font-size: 14px; font-family: Arial, sans-serif;">
+                            <b>{row['Name']}</b><br>
+                            IATA: {row['IATA/FAA']}<br>
+                            City: {row['City']}<br>
+                            Country: {row['Country']}
+                        </div>
+                        """,
+                        max_width=300
+                    ),
+                    tooltip=f"Airport: {row['Name']}"
+                ).add_to(m)
     
     # Add colormap to the map
     colormap.add_to(m)