@geops/rvf-mobility-web-component 0.1.84 → 0.1.86

package/package.json

@@ -2,7 +2,7 @@
   "name": "@geops/rvf-mobility-web-component",
   "license": "UNLICENSED",
   "description": "Web components for rvf in the domains of mobility and logistics.",
-  "version": "0.1.84",
+  "version": "0.1.86",
   "homepage": "https://rvf-mobility-web-component-geops.vercel.app/",
   "type": "module",
   "main": "index.js",
@@ -12,7 +12,7 @@
     "jspdf": "^3.0.3",
     "lodash.debounce": "^4.0.8",
     "maplibre-gl": "^5.10.0",
-    "mobility-toolbox-js": "3.5.1-beta.4",
+    "mobility-toolbox-js": "3.5.1-beta.5",
     "ol": "^10.6.1",
     "preact": "^10.27.2",
     "preact-custom-element": "^4.5.1",

package/src/RouteStop/RouteStop.tsx

@@ -92,7 +92,7 @@ function RouteStop({
             <RouteStopTime className="ml-4 flex w-10 shrink-0 flex-col justify-center text-xs" />
             <RouteStopDelay className="flex w-8 shrink-0 flex-col justify-center text-[0.6rem]" />
             <RouteStopProgress className="relative flex w-8 shrink-0 items-center" />
-            <RouteStopStation className="flex grow flex-col items-start justify-center pr-2" />
+            <RouteStopStation className="flex grow items-center justify-center pr-2 text-sm font-medium" />
           </>
         )}
       </button>

package/src/Search/SearchHeadless.tsx

@@ -56,7 +56,7 @@ function SearchHeadless({ ...props }: SearchProps) {
 
   const onSelectTrain = useCallback(
     (match: RealtimeRouteIdentifierMatch) => {
-      setTrainId(match.trains[0].train_id);
+      setTrainId(match.train_id);
       fit.current(match, true);
     },
     [fit, setTrainId],

package/src/SearchTrainsResult/SearchTrainsResult.tsx

@@ -33,8 +33,8 @@ function SearchTrainsResult({
         onSelectItem?.(item, evt);
       }}
     >
-      <RouteIcon line={item.trains[0].line}></RouteIcon>
-      <div className="grow">{`${item.trains[0].line?.name} (${item.route_identifier})`}</div>
+      <RouteIcon line={item.line}></RouteIcon>
+      <div className="grow">{`${item.destination} (${item.route_identifier})`}</div>
     </button>
   );
 }

package/src/SearchTrainsResults/SearchTrainsResults.tsx

@@ -76,10 +76,7 @@ function SearchTrainsResults({
       >
         {results.map((item: RealtimeRouteIdentifierMatch) => {
           return (
-            <SearchResult
-              className={resultClassName}
-              key={item.trains[0].train_id}
-            >
+            <SearchResult className={resultClassName} key={item.train_id}>
               {toChildArray(children).map(
                 (
                   child: ReactElement<

package/src/utils/getTextColorForVehicle.ts

@@ -1,5 +1,7 @@
 import { realtimeConfig } from "mobility-toolbox-js/ol";
 
+import getTextColor from "./getTextColor";
+
 import type {
   RealtimeDeparture,
   RealtimeLine,
@@ -23,7 +25,7 @@ const getTextColorForVehicle = (object: unknown) => {
     (object as RealtimeStopSequence).type ||
     (object as RealtimeTrajectory).properties?.type;
 
-  return realtimeConfig.getTextColorForType(type);
+  return getTextColor(type) || realtimeConfig.getTextColorForType(type);
 };
 
 export default getTextColorForVehicle;

package/src/utils/hooks/useFit.tsx

@@ -5,10 +5,7 @@ import { useEffect, useRef } from "preact/hooks";
 
 import useFitOnFeatures from "./useFitOnFeatures";
 
-import type {
-  RealtimeRouteIdentifierMatch,
-  RealtimeTrainDetail,
-} from "mobility-toolbox-js/types";
+import type { RealtimeRouteIdentifierMatch } from "mobility-toolbox-js/types";
 import type { GeoJSONFeature } from "ol/format/GeoJSON";
 
 import type { LnpLineInfo, LnpStopInfo } from "./useLnp";
@@ -20,7 +17,6 @@ export type FitObject =
   | LnpLineInfo
   | LnpStopInfo
   | RealtimeRouteIdentifierMatch
-  | RealtimeTrainDetail
   | StopsFeature;
 
 function useFit() {
@@ -36,17 +32,9 @@ function useFit() {
         fitOnFeatures.current([obj as GeoJSONFeature], willOverlayOpen);
         return;
       }
-      let extent =
-        (obj as LnpLineInfo)?.extent || (obj as RealtimeTrainDetail)?.bounds;
-
-      if ((obj as RealtimeRouteIdentifierMatch)?.trains?.length) {
-        extent = (obj as RealtimeRouteIdentifierMatch).trains[0].bounds as [
-          number,
-          number,
-          number,
-          number,
-        ];
-      }
+      const extent =
+        (obj as LnpLineInfo)?.extent ||
+        (obj as RealtimeRouteIdentifierMatch)?.bounds;
 
       if (extent) {
         const feature = new Feature(fromExtent(extent));

package/src/utils/hooks/useRealtimeTrainsByRouteIdentifier.tsx

@@ -1,15 +1,16 @@
 import { RealtimeRestAPI } from "mobility-toolbox-js/ol";
-import { type RealtimeTrainDetail } from "mobility-toolbox-js/types";
 import { useEffect, useMemo, useState } from "preact/hooks";
 
 import useMapContext from "./useMapContext";
 
+import type { RealtimeRouteIdentifierMatch } from "mobility-toolbox-js/types";
+
 function useRealtimeTrainByRouteIdentifier(
   routeIdentifier: string,
-): RealtimeTrainDetail {
+): RealtimeRouteIdentifierMatch | undefined {
   const { apikey, hasRealtime, realtimeresturl, realtimetenant, tenant } =
     useMapContext();
-  const [train, setTrain] = useState<RealtimeTrainDetail>();
+  const [train, setTrain] = useState<RealtimeRouteIdentifierMatch>();
 
   const tenantMemo = useMemo(() => {
     return realtimetenant || tenant;
@@ -43,7 +44,7 @@ function useRealtimeTrainByRouteIdentifier(
       )
       .then((res) => {
         if (res.matches.length > 0) {
-          setTrain(res.matches[0].trains[0]);
+          setTrain(res.matches[0]);
         } else {
           setTrain(undefined);
         }