fixed tag and note filtering

HSLdevcom · Oct 2, 2023 · 9c92c6d · 9c92c6d
1 parent f955569
commit 9c92c6d
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/src/components/timetable/timetableContainer.js b/src/components/timetable/timetableContainer.js
@@ -144,6 +144,12 @@ function combineConsecutiveDays(daysObject) {
         const { note, ...rest } = departure;
         return rest;
       }
+      if (departure.note && departure.note.includes('pe')) {
+        return {
+          ...departure,
+          note: departure.note.replace('pe', '').trim(),
+        };
+      }
       return departure;
     });
 
@@ -324,17 +330,6 @@ const propsMapper = mapProps(props => {
         duplicateRoutes.push(direction.routeId);
       }),
     );
-
-  departures.forEach(departure => {
-    if (departure.note && !specialSymbols.includes(departure.note)) {
-      specialSymbols.push(departure.note);
-    }
-  });
-
-  if (departures.some(departure => departure.routeId.includes('H'))) {
-    specialSymbols.push('H');
-  }
-
   departures = departures.map(departure => ({
     ...departure,
     note: modifyNote(
@@ -378,6 +373,17 @@ const propsMapper = mapProps(props => {
     sundays,
   });
 
+  const combinedDepartures = [].concat(...Object.values(combinedDays));
+  combinedDepartures.forEach(departure => {
+    if (departure.note && !specialSymbols.includes(departure.note)) {
+      specialSymbols.push(departure.note);
+    }
+  });
+
+  if (combinedDepartures.some(departure => departure.routeId.includes('H'))) {
+    specialSymbols.push('H');
+  }
+
   return {
     weekdays,
     saturdays,