rezoom map

app.py

@@ -452,23 +452,23 @@ def get_map_from_summary(summary_txt):
         return None
     else:
         # cameraimg_df = call_api('http://datamall2.mytransport.sg/ltaodataservice/Traffic-Imagesv2?long=')
-        print('nearest cam')
+        # print('nearest cam')
         nearest_cam_df, cameraimg_df= get_nearest_camera((lat,lng), 3)
-        print('ok. nearest fire')
+        # print('ok. nearest fire')
         nearest_fire_df = get_firestation_from_latlong((lat,lng), 3)
-        print('ok. nearest hosp')
+        # print('ok. nearest hosp')
         nearest_hosp_df = get_hospital_from_latlong((lat,lng), 3)
 
         avg_lat = np.mean(cameraimg_df["Latitude"])
         avg_lng = np.mean(cameraimg_df["Longitude"])
-        print('ok. folium map')
+        # print('ok. folium map')
+
         map = folium.Map(location=[avg_lat, avg_lng], zoom_start=12)
+        fg = folium.FeatureGroup(show=False).add_to(map)
         folium.Marker(location=[float(lat), float(lng)],
                       icon=folium.Icon(color='red'),
                       popup="Incident"
-                     ).add_to(map)
-        print('ok')
-
+                     ).add_to(fg)
         for idx in tqdm(cameraimg_df.index, desc="Processing Traffic Cameras"):
             if cameraimg_df["CameraID"][idx] in list(nearest_cam_df["CameraID"]):
                 print('added nearby camera', nearest_cam_df["Description"][idx])
@@ -483,7 +483,7 @@ def get_map_from_summary(summary_txt):
 
                 folium.Marker(location=[nearest_cam_df["Latitude"][idx], nearest_cam_df["Longitude"][idx]],
                                        icon=folium.Icon(color='blue'),
-                                       popup=popup).add_to(map)
+                                       popup=popup).add_to(fg)
             else:
                 # Add marker for the camera with the specified color
                 folium.Marker(location=[cameraimg_df["Latitude"][idx], cameraimg_df["Longitude"][idx]], icon=folium.Icon(color='gray')).add_to(map)
@@ -491,13 +491,13 @@ def get_map_from_summary(summary_txt):
         for idx in tqdm(nearest_fire_df.index, desc="Processing Fire Stations"):
             folium.Marker(location=[nearest_fire_df["lat"][idx], nearest_fire_df["long"][idx]],
                               icon=folium.Icon(color='orange'),
-                             popup=nearest_fire_df["name"][idx]).add_to(map)
+                             popup=nearest_fire_df["name"][idx]).add_to(fg)
 
         for idx in tqdm(nearest_hosp_df.index, desc="Processing Hospitals"):
             folium.Marker(location=[nearest_hosp_df["lat"][idx], nearest_hosp_df["long"][idx]],
                               icon=folium.Icon(color='green'),
-                             popup=nearest_hosp_df["name"][idx]).add_to(map)
-
+                             popup=nearest_hosp_df["name"][idx]).add_to(fg)
+        map.fit_bounds(fg.get_bounds(), padding=(30, 30))
         return map
 
 async def a_get_map_from_summary(summary_txt, get_num_cameras=3):
@@ -519,12 +519,13 @@ async def a_get_map_from_summary(summary_txt, get_num_cameras=3):
 
         avg_lat = np.mean(cameraimg_df["Latitude"])
         avg_lng = np.mean(cameraimg_df["Longitude"])
+
         map = folium.Map(location=[avg_lat, avg_lng], zoom_start=12)
+        fg = folium.FeatureGroup(show=False).add_to(map)
         folium.Marker(location=[float(lat), float(lng)],
                       icon=folium.Icon(color='red'),
                       popup="Incident"
-                     ).add_to(map)
-
+                     ).add_to(fg)
         for idx in tqdm(cameraimg_df.index, desc="Processing Traffic Cameras"):
             if cameraimg_df["CameraID"][idx] in list(nearest_cam_df["CameraID"]):
                 print('added nearby camera', nearest_cam_df["Description"][idx])
@@ -539,7 +540,7 @@ async def a_get_map_from_summary(summary_txt, get_num_cameras=3):
 
                 folium.Marker(location=[nearest_cam_df["Latitude"][idx], nearest_cam_df["Longitude"][idx]],
                                        icon=folium.Icon(color='blue'),
-                                       popup=popup).add_to(map)
+                                       popup=popup).add_to(fg)
             else:
                 # Add marker for the camera with the specified color
                 folium.Marker(location=[cameraimg_df["Latitude"][idx], cameraimg_df["Longitude"][idx]], icon=folium.Icon(color='gray')).add_to(map)
@@ -547,13 +548,13 @@ async def a_get_map_from_summary(summary_txt, get_num_cameras=3):
         for idx in tqdm(nearest_fire_df.index, desc="Processing Fire Stations"):
             folium.Marker(location=[nearest_fire_df["lat"][idx], nearest_fire_df["long"][idx]],
                               icon=folium.Icon(color='orange'),
-                             popup=nearest_fire_df["name"][idx]).add_to(map)
+                             popup=nearest_fire_df["name"][idx]).add_to(fg)
 
         for idx in tqdm(nearest_hosp_df.index, desc="Processing Hospitals"):
             folium.Marker(location=[nearest_hosp_df["lat"][idx], nearest_hosp_df["long"][idx]],
                               icon=folium.Icon(color='green'),
-                             popup=nearest_hosp_df["name"][idx]).add_to(map)
-
+                             popup=nearest_hosp_df["name"][idx]).add_to(fg)
+        map.fit_bounds(fg.get_bounds(), padding=(30, 30))
         return map
 
 ########################## RAG to Recommendations functions ##############################