Stop Search: transport mode updates

Author: Huulivoide

ui/src/components/stop-registry/components/StopTableRow/components/LabelAndTimingPlaceTd.tsx

@@ -23,20 +23,28 @@ export const LabelAndTimingPlaceTd: FC<LabelAndTimingPlaceTdProps> = ({
   stop,
 }) => {
   const { t } = useTranslation();
-  const transportModeIcon = getTransportModeIcon(stop.transportMode);
 
   return (
     <td className={className}>
       <Row className="items-center leading-none font-bold">
-        <i
-          className={twJoin(transportModeIcon, 'mr-1 text-xl')}
-          title={
-            stop.transportMode
-              ? mapStopRegistryTransportModeTypeToUiName(t, stop.transportMode)
-              : undefined
-          }
-        />
+        {stop.transportModes.map((mode) => (
+          <i
+            key={mode}
+            className={twJoin(
+              getTransportModeIcon(
+                mode,
+                stop.activeTransportModes.includes(mode),
+                stop.trunkLineStop,
+                stop.speedTramStop,
+              ),
+              'text-xl not-last-of-type:-mr-1',
+            )}
+            title={mapStopRegistryTransportModeTypeToUiName(t, mode)}
+          />
+        ))}
+
         <Link
+          className="ml-1"
           to={routeDetails[Path.stopDetails].getLink(stop.publicCode, {
             observationDate,
             priority: stop.priority,

ui/src/components/stop-registry/components/StopTableRow/queries/DataFragments.ts

@@ -21,6 +21,11 @@ const GQL_STOP_TABLE_ROW_QUAY_DETAILS = gql`
     centroid
     description_value
 
+    transport_modes
+    active_transport_modes
+    speed_tram_stop
+    trunk_line_stop
+
     stop_place {
       id
       name_value
@@ -33,10 +38,6 @@ const GQL_STOP_TABLE_ROW_QUAY_DETAILS = gql`
           name_value
         }
       }
-    }
-
-    stop_place_newest_version {
-      id
 
       TiamatStopPlace {
         ... on stop_registry_StopPlace {

ui/src/components/stop-registry/components/StopTableRow/types/StopSearchRow.ts

@@ -26,6 +26,11 @@ export type StopSearchRow = {
   readonly priority: Priority;
 
   readonly transportMode?: StopRegistryTransportModeType | null;
+  readonly transportModes: ReadonlyArray<StopRegistryTransportModeType>;
+  readonly activeTransportModes: ReadonlyArray<StopRegistryTransportModeType>;
+  readonly speedTramStop: boolean;
+  readonly trunkLineStop: boolean;
+
   readonly replacesRailSign?: boolean;
   readonly electricity?: string | null;
   readonly shelter?: string | null;

ui/src/components/stop-registry/components/StopTableRow/utils/mapQueryResultToStopSearchRow.ts

@@ -18,6 +18,7 @@ import {
   getStopPlacesFromQueryResult,
   isValidGeoJSONPoint,
   log,
+  parseStopRegistryTransportModeJsonArray,
   requireValue,
 } from '../../../../../utils';
 import { parseStopRegistryTransportMode } from '../../../../../utils/stop-registry/transportMode';
@@ -141,7 +142,7 @@ function mapEquipmentDetails(
   | 'shelter'
   | 'accessibility'
 > {
-  const tiamatStopPlaces = quay.stop_place_newest_version?.TiamatStopPlace;
+  const tiamatStopPlaces = quay.stop_place?.TiamatStopPlace;
 
   const [stopPlace] = getStopPlacesFromQueryResult<StopPlace>(tiamatStopPlaces);
 
@@ -170,6 +171,14 @@ function mapQueryResultToStopSearchRowImpl(
     transportMode: parseStopRegistryTransportMode(
       quay.stop_place?.transport_mode,
     ),
+    transportModes: parseStopRegistryTransportModeJsonArray(
+      quay.transport_modes,
+    ),
+    activeTransportModes: parseStopRegistryTransportModeJsonArray(
+      quay.active_transport_modes,
+    ),
+    speedTramStop: !!quay.speed_tram_stop,
+    trunkLineStop: !!quay.trunk_line_stop,
 
     location: validateLocation(quay.centroid),
 
@@ -235,7 +244,21 @@ function mapSingleTiamatStopAreaQuayToStopSearchRow<
     location: validateLocation(quay.geometry),
     description: quay.description?.value ?? null,
 
-    transportMode: stopArea.transportMode ?? null,
+    ...(stopArea.transportMode
+      ? {
+          transportMode: stopArea.transportMode,
+          transportModes: [stopArea.transportMode],
+          activeTransportModes: [stopArea.transportMode],
+          speedTramStop: false,
+          trunkLineStop: false,
+        }
+      : {
+          transportMode: null,
+          transportModes: [],
+          activeTransportModes: [],
+          speedTramStop: false,
+          trunkLineStop: false,
+        }),
 
     validityStart: requireValue(
       findKeyValueParsed(quay, KnownValueKey.ValidityStart, parseDate),

ui/src/components/stop-registry/search/by-stop/filtersToQueryVariables.ts

@@ -98,11 +98,9 @@ function buildTransportationModeFilter({
   }
 
   return {
-    stop_place: {
-      transport_mode: {
-        _in: transportationMode.map(toTiamatDBEnumCase),
-      },
-    },
+    _or: transportationMode.map(toTiamatDBEnumCase).map((mode) => ({
+      transport_modes: { _contains: mode },
+    })),
   };
 }
 
@@ -310,9 +308,7 @@ export function filtersAndResultSelectionToQueryVariables(
   if (excluded.length) {
     return buildSearchStopsGqlQueryVariables(
       filters,
-      {
-        _not: { netex_id: { _in: excluded } },
-      },
+      { _not: { netex_id: { _in: excluded } } },
       ...extraConditions,
     );
   }

ui/src/generated/graphql.tsx

@@ -5,9 +5,9 @@ import {
 
 const vehicleModeValues = Object.values(ReusableComponentsVehicleModeEnum);
 
-export const parseVehicleMode = (
+export function parseVehicleMode(
   transportMode?: string | null,
-): ReusableComponentsVehicleModeEnum | null => {
+): ReusableComponentsVehicleModeEnum | null {
   if (!transportMode) {
     return null;
   }
@@ -20,27 +20,62 @@ export const parseVehicleMode = (
   }
 
   return null;
-};
+}
 
 const stopRegistryTransportModeValues = Object.values(
   StopRegistryTransportModeType,
 );
 
-export const parseStopRegistryTransportMode = (
-  transportMode?: string | StopRegistryTransportModeType | null,
-): StopRegistryTransportModeType | null => {
+export function parseStopRegistryTransportMode(
+  transportMode: unknown,
+  strict: true,
+): StopRegistryTransportModeType;
+export function parseStopRegistryTransportMode(
+  transportMode: unknown,
+  strict?: boolean,
+): StopRegistryTransportModeType | null;
+export function parseStopRegistryTransportMode(
+  transportMode: unknown,
+  strict?: boolean,
+): StopRegistryTransportModeType | null {
   if (!transportMode) {
     return null;
   }
 
-  const normalizedTransportMode = transportMode.toLowerCase();
+  if (typeof transportMode !== 'string') {
+    throw new TypeError(
+      `Expected transportMode to be a string! But was: typeof(${typeof transportMode})`,
+    );
+  }
+
+  const normalized = transportMode.toLowerCase();
   if (
     stopRegistryTransportModeValues.includes(
-      normalizedTransportMode as StopRegistryTransportModeType,
+      normalized as StopRegistryTransportModeType,
     )
   ) {
-    return normalizedTransportMode as StopRegistryTransportModeType;
+    return normalized as StopRegistryTransportModeType;
+  }
+
+  if (strict) {
+    throw new TypeError(
+      `Expected transportMode to be a valid StopRegistryTransportModeType. transportMode(${transportMode}); normalized(${normalized}); StopRegistryTransportModeType(${stopRegistryTransportModeValues})`,
+    );
   }
 
   return null;
-};
+}
+
+export function parseStopRegistryTransportModeJsonArray(
+  transportModes: unknown,
+): Array<StopRegistryTransportModeType> {
+  if (!Array.isArray(transportModes)) {
+    throw new TypeError(
+      `Expected transportModes to be an array! But was: typeof(${typeof transportModes})`,
+    );
+  }
+
+  return transportModes
+    .map((it) => parseStopRegistryTransportMode(it, true))
+    .sort();
+}