Bug : Fix local timezone display (#195)

* docs: Added code of conduct

* Deleted unused function

* feat: Added function to convert to local timezone

* feat: Updated display fonction to render local tz

Author: fe51

app/callbacks/display_callbacks.py

@@ -16,7 +16,7 @@
 
 import config as cfg
 from services import api_client
-from utils.display import build_vision_polygon, create_event_list_from_alerts
+from utils.display import build_vision_polygon, convert_dt_to_local_tz, create_event_list_from_alerts
 
 logger = logging_config.configure_logging(cfg.DEBUG, cfg.SENTRY_DSN)
 
@@ -374,7 +374,7 @@ def update_map_and_alert_info(sequence_on_display, cameras):
             bboxes=row_with_bboxes["processed_bboxes"],
         )
 
-        date_val = row_with_bboxes["created_at"].strftime("%Y-%m-%d %H:%M")
+        date_val = convert_dt_to_local_tz(lat, lon, row_with_bboxes["created_at"])
         cam_name = f"{row_cam['name'].values.item()[:-3].replace('_', ' ')} : {int(row_with_bboxes['azimuth'])}°"
 
         camera_info = f"{cam_name}"

app/utils/data.py

@@ -4,35 +4,9 @@
 # See LICENSE or go to <https://www.apache.org/licenses/LICENSE-2.0> for full license details.
 
 import ast
-from datetime import datetime
 from typing import List
 
 import pandas as pd
-import pytz
-from timezonefinder import TimezoneFinder
-
-tf = TimezoneFinder()
-
-
-def convert_time(df):
-    df_ts_local = []
-    for _, row in df.iterrows():
-        lat = round(row["lat"], 4)
-        lon = round(row["lon"], 4)
-
-        # Convert created_at to a timezone-aware datetime object assuming it's in UTC
-        alert_ts_utc = datetime.fromisoformat(str(row["created_at"])).replace(tzinfo=pytz.utc)
-
-        # Find the timezone for the alert location
-        timezone_str = tf.timezone_at(lat=lat, lng=lon)
-        if timezone_str is None:  # If the timezone is not found, handle it appropriately
-            timezone_str = "UTC"  # Fallback to UTC or some default
-        alert_timezone = pytz.timezone(timezone_str)
-
-        # Convert alert_ts_utc to the local timezone of the alert
-        df_ts_local.append(alert_ts_utc.astimezone(alert_timezone).strftime("%Y-%m-%dT%H:%M:%S"))
-
-    return df_ts_local
 
 
 def process_bbox(input_str):

app/utils/display.py

@@ -4,20 +4,61 @@
 # See LICENSE or go to <https://www.apache.org/licenses/LICENSE-2.0> for full license details.
 
 
+from datetime import datetime
 from io import StringIO
 
 import dash_leaflet as dl
 import pandas as pd
+import pytz
 import requests
 from dash import html
 from geopy import Point
 from geopy.distance import geodesic
+from timezonefinder import TimezoneFinder
 
 import config as cfg
 
 DEPARTMENTS = requests.get(cfg.GEOJSON_FILE, timeout=10).json()
 
 
+tf = TimezoneFinder()
+
+
+def convert_dt_to_local_tz(lat, lon, str_utc_timestamp):
+    """
+    Convert a UTC timestamp string to a local timezone string based on latitude and longitude.
+
+    Parameters:
+    lat (float): Latitude of the location.
+    lon (float): Longitude of the location.
+    str_utc_timestamp (str): UTC timestamp string in ISO 8601 format (e.g., "2023-10-01T12:34:56").
+
+    Returns:
+    str: Local timezone string in the format "%Y-%m-%d %H:%M" or None if the input timestamp is invalid.
+
+    Example:
+    >>> convert_dt_to_local_tz(48.8566, 2.3522, "2023-10-01T12:34:56")
+    '2023-10-01 14:34'
+    """
+    lat = round(lat, 4)
+    lon = round(lon, 4)
+
+    # Convert str_utc_timestamp to a timezone-aware datetime object assuming it's in UTC
+    try:
+        ts_utc = datetime.fromisoformat(str(str_utc_timestamp)).replace(tzinfo=pytz.utc)
+    except ValueError:
+        return None  # Handle invalid datetime format
+
+    # Find the local timezone
+    timezone_str = tf.timezone_at(lat=lat, lng=lon)
+    if timezone_str is None:  # If the timezone is not found, handle it appropriately
+        timezone_str = "UTC"  # Fallback to UTC
+    timezone = pytz.timezone(timezone_str)
+
+    # Convert ts_utc to the local timezone
+    return ts_utc.astimezone(timezone).strftime("%Y-%m-%d %H:%M")
+
+
 def build_departments_geojson():
     """
     This function reads the departments.geojson file in the /data folder thanks to the json module
@@ -191,7 +232,13 @@ def create_event_list_from_alerts(api_events, cameras):
                     ),
                     style={"fontWeight": "bold"},
                 ),
-                html.Div(event["started_at"].strftime("%Y-%m-%d %H:%M")),
+                html.Div(
+                    convert_dt_to_local_tz(
+                        lat=cameras[cameras["id"] == event["camera_id"]]["lat"].values[0],
+                        lon=cameras[cameras["id"] == event["camera_id"]]["lon"].values[0],
+                        str_utc_timestamp=event["started_at"],
+                    )
+                ),
             ],
             n_clicks=0,
             className="alert-card",