agenda/types.py

@@ -43,12 +43,6 @@ class TripElement:
     detail: StrDict
 
 
-def airport_label(airport: StrDict) -> str:
-    """Airport label: name and iata."""
-    name = airport.get("alt_name") or airport["city"]
-    return f"{name} ({airport['iata']})"
-
-
 @dataclass
 class Trip:
     """Trip."""
@@ -210,9 +204,12 @@ class Trip:
 
         for item in self.travel:
             if item["type"] == "flight":
+                flight_from = item["from_airport"]
+                flight_to = item["to_airport"]
                 name = (
-                    f"✈️ {airport_label(item['from_airport'])} → "
+                    "✈️ "
-                    + f"{airport_label(item['to_airport'])}"
+                    + f"{flight_from['name']} ({flight_from['iata']}) -> "
+                    + f"{flight_to['name']} ({flight_to['iata']})"
                 )
 
                 elements.append(
@@ -224,18 +221,17 @@ class Trip:
                     )
                 )
             if item["type"] == "train":
-                for leg in item["legs"]:
+                name = f"{item['from']} -> {item['to']}"
-                    name = f"{leg['from']} → {leg['to']}"
+                elements.append(
-                    elements.append(
+                    TripElement(
-                        TripElement(
+                        when=item["depart"],
-                            when=leg["depart"],
+                        title=name,
-                            title=name,
+                        detail=item,
-                            detail=leg,
+                        element_type="train",
-                            element_type="train",
-                        )
                     )
+                )
             if item["type"] == "ferry":
-                name = f"{item['from']} → {item['to']}"
+                name = f"{item['from']} -> {item['to']}"
                 elements.append(
                     TripElement(
                         when=item["depart"],