[www] fix display of gtfs-rt and pickup location

headwaymaps · Jul 2, 2024 · 38e8470 · 38e8470
1 parent 42f9730
commit 38e8470
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 7 deletions.
diff --git a/services/frontend/www-app/src/components/MultiModalListItem.vue b/services/frontend/www-app/src/components/MultiModalListItem.vue
@@ -15,16 +15,22 @@
   <q-item-label caption v-if="active">
     {{ itinerary.walkingDistanceFormatted }}
   </q-item-label>
-  <div v-if="formattedRealTimeUntilStart() !== undefined">
-    <!-- FIXME: this isn't *always* realtime, we shouldn't imply that it is -->
-    <q-icon name="rss_feed" style="margin-right: 4px" />
+  <div v-if="formattedDurationUntilStart() !== undefined">
+    <q-icon
+      v-if="firstTransitLegIsRealTime()"
+      name="rss_feed"
+      style="margin-right: 4px"
+    />
     <span class="real-time-departure-time">
-      {{ formattedRealTimeUntilStart() }}&nbsp;
+      {{ formattedDurationUntilStart() }}&nbsp;
     </span>
-    <span class="real-time-departure-location">
+    <span
+      v-if="firstTransitLegDepartureLocation()"
+      class="real-time-departure-location"
+    >
       {{
         $t('departs_at_$location', {
-          location: 'John & 5th',
+          location: firstTransitLegDepartureLocation(),
         })
       }}
     </span>
@@ -77,7 +83,13 @@ export default defineComponent({
     };
   },
   methods: {
-    formattedRealTimeUntilStart(): string | undefined {
+    firstTransitLegIsRealTime(): boolean {
+      return this.itinerary.firstTransitLeg?.realTime ?? false;
+    },
+    firstTransitLegDepartureLocation(): string | undefined {
+      return this.itinerary.firstTransitLeg?.departureLocationName;
+    },
+    formattedDurationUntilStart(): string | undefined {
       let startTime = this.itinerary.firstTransitLeg?.startTime;
       if (!startTime) {
         return undefined;

diff --git a/services/frontend/www-app/src/models/Itinerary.ts b/services/frontend/www-app/src/models/Itinerary.ts
@@ -238,6 +238,10 @@ export class ItineraryLeg {
     return this.raw.realTime;
   }
 
+  get departureLocationName(): string | undefined {
+    return this.raw.from?.name;
+  }
+
   get alerts(): LegAlert[] {
     return this.raw.alerts?.map((a) => new LegAlert(a)) || [];
   }

diff --git a/services/travelmux/src/otp/otp_api.rs b/services/travelmux/src/otp/otp_api.rs
@@ -83,6 +83,9 @@ pub struct Leg {
     /// What time the leg starts, in millis since Unix epoch (UTC)
     pub end_time: u64,
 
+    /// Whether there is real-time data about this Leg
+    pub real_time: bool,
+
     #[serde(flatten)]
     pub extra: HashMap<String, serde_json::Value>,
 }