section improvements; hotfixes

src/utils/vehicleUtils.ts

@@ -1,10 +1,8 @@
-import { EVehicleUseType } from "../enums/EVehicleUseType";
-import { ICarWagon, ILocomotive, IStore } from "../types";
-import { LocoType, calculateSpeedLimit } from "./speedLimitUtils";
+import { EVehicleUseType } from '../enums/EVehicleUseType';
+import { ICarWagon, ILocomotive, IStore, TCarWagonGroup, TLocoGroup } from '../types';
+import { LocoType, calculateSpeedLimit } from './speedLimitUtils';
 
-export function isLocomotive(
-  vehicle: ILocomotive | ICarWagon,
-): vehicle is ILocomotive {
+export function isLocomotive(vehicle: ILocomotive | ICarWagon): vehicle is ILocomotive {
   return (vehicle as ILocomotive).power !== undefined;
 }
 
@@ -14,39 +12,29 @@ export function locoDataList(state: IStore) {
   const stockData = state.stockData;
 
   return Object.keys(stockData.info).reduce((acc, vehiclePower) => {
-    if (!vehiclePower.startsWith("loco")) return acc;
+    if (!vehiclePower.startsWith('loco')) return acc;
 
-    const locoVehiclesData =
-      stockData.info[
-        vehiclePower as "loco-e" | "loco-s" | "loco-ezt" | "loco-szt"
-      ];
+    const locoVehiclesData = stockData.info[vehiclePower as TLocoGroup];
 
     locoVehiclesData.forEach((loco) => {
       if (state.showSupporter && !loco[4]) return;
 
-      const [type, constructionType, cabinType, maxSpeed, supportersOnly] =
-        loco;
-      const locoProps = stockData.props.find(
-        (prop) => constructionType == prop.type,
-      );
+      const [type, constructionType, cabinType, maxSpeed, sponsorsTimestamp] = loco;
+      const locoProps = stockData.props.find((prop) => constructionType == prop.type);
 
       acc.push({
-        power: vehiclePower,
+        power: vehiclePower as TLocoGroup,
+        group: vehiclePower as TLocoGroup,
         type,
         constructionType,
         cabinType,
         maxSpeed: Number(maxSpeed),
-        supportersOnly,
-        imageSrc: "",
+        isSponsorsOnly: Number(sponsorsTimestamp) > Date.now(),
+        sponsorsOnlyTimestamp: Number(sponsorsTimestamp),
+        imageSrc: '',
 
-        length:
-          locoProps?.length && type.startsWith("2EN")
-            ? locoProps.length * 2
-            : locoProps?.length || 0,
-        mass:
-          locoProps?.mass && type.startsWith("2EN")
-            ? 253
-            : locoProps?.mass || 0,
+        length: locoProps?.length && type.startsWith('2EN') ? locoProps.length * 2 : locoProps?.length || 0,
+        mass: locoProps?.mass && type.startsWith('2EN') ? 253 : locoProps?.mass || 0,
       });
     });
 
@@ -60,32 +48,33 @@ export function carDataList(state: IStore) {
   const stockData = state.stockData;
 
   return Object.keys(stockData.info).reduce((acc, vehicleUseType) => {
-    if (!vehicleUseType.startsWith("car")) return acc;
+    if (!vehicleUseType.startsWith('car')) return acc;
 
-    const carVehiclesData =
-      stockData.info[vehicleUseType as "car-passenger" | "car-cargo"];
+    const carVehiclesData = stockData.info[vehicleUseType as TCarWagonGroup];
 
     carVehiclesData.forEach((car) => {
-      if (state.showSupporter && !car[3]) return;
+      const [type, constructionType, loadable, sponsorsOnlyTimestamp, maxSpeed] = car;
 
-      const carPropsData = stockData.props.find((v) =>
-        car[0].toString().startsWith(v.type),
-      );
+      if (state.showSupporter && Number(sponsorsOnlyTimestamp) <= Date.now()) return;
+
+      const carPropsData = stockData.props.find((v) => type.toString().startsWith(v.type));
 
       acc.push({
-        useType: vehicleUseType as "car-passenger" | "car-cargo",
-        type: car[0],
-        constructionType: car[1],
-        loadable: car[2],
-        supportersOnly: car[3],
-        maxSpeed: Number(car[4]),
-        imageSrc: "",
+        useType: vehicleUseType as TCarWagonGroup,
+        group: vehicleUseType as TCarWagonGroup,
+        type,
+        constructionType,
+        loadable,
+        isSponsorsOnly: Number(sponsorsOnlyTimestamp) > Date.now(),
+        sponsorsOnlyTimestamp: Number(sponsorsOnlyTimestamp),
+        maxSpeed: Number(maxSpeed),
+        imageSrc: '',
         cargoList:
           !carPropsData || carPropsData.cargo === null
             ? []
-            : carPropsData.cargo.split(";").map((cargo) => ({
-                id: cargo.split(":")[0],
-                totalMass: Number(cargo.split(":")[1]),
+            : carPropsData.cargo.split(';').map((cargo) => ({
+                id: cargo.split(':')[0],
+                totalMass: Number(cargo.split(':')[1]),
               })),
 
         mass: carPropsData?.mass || 0,
@@ -98,46 +87,28 @@ export function carDataList(state: IStore) {
 }
 
 export function totalMass(state: IStore) {
-  return ~~state.stockList.reduce(
-    (acc, stock) =>
-      acc + (stock.cargo ? stock.cargo.totalMass : stock.mass) * stock.count,
-    0,
-  );
+  return ~~state.stockList.reduce((acc, stock) => acc + (stock.cargo ? stock.cargo.totalMass : stock.mass) * stock.count, 0);
 }
 
 export function totalLength(state: IStore) {
-  return state.stockList.reduce(
-    (acc, stock) => acc + stock.length * stock.count,
-    0,
-  );
+  return state.stockList.reduce((acc, stock) => acc + stock.length * stock.count, 0);
 }
 
 export function maxStockSpeed(state: IStore) {
-  const stockSpeedLimit = state.stockList.reduce(
-    (acc, stock) => (stock.maxSpeed < acc || acc == 0 ? stock.maxSpeed : acc),
-    0,
-  );
-  const headingLoco = state.stockList[0]?.isLoco
-    ? state.stockList[0]
-    : undefined;
+  const stockSpeedLimit = state.stockList.reduce((acc, stock) => (stock.maxSpeed < acc || acc == 0 ? stock.maxSpeed : acc), 0);
+  const headingLoco = state.stockList[0]?.isLoco ? state.stockList[0] : undefined;
 
   if (!headingLoco) return stockSpeedLimit;
 
-  const locoType = headingLoco.type.split("-")[0];
+  const locoType = headingLoco.type.split('-')[0];
 
   if (/^(EN|2EN|SN)/.test(locoType)) return stockSpeedLimit;
 
   const stockMass = totalMass(state);
 
-  const speedLimitByMass = calculateSpeedLimit(
-    locoType as LocoType,
-    stockMass,
-    isTrainPassenger(state),
-  );
+  const speedLimitByMass = calculateSpeedLimit(locoType as LocoType, stockMass, isTrainPassenger(state));
 
-  return speedLimitByMass
-    ? Math.min(stockSpeedLimit, speedLimitByMass)
-    : stockSpeedLimit;
+  return speedLimitByMass ? Math.min(stockSpeedLimit, speedLimitByMass) : stockSpeedLimit;
 }
 
 export function acceptableMass(state: IStore) {
@@ -168,9 +139,7 @@ export function isTrainPassenger(state: IStore) {
   if (state.stockList.length == 0) return false;
   if (state.stockList.every((stock) => stock.isLoco)) return false;
 
-  return state.stockList
-    .filter((stock) => !stock.isLoco)
-    .every((stock) => stock.useType === EVehicleUseType.CAR_PASSENGER);
+  return state.stockList.filter((stock) => !stock.isLoco).every((stock) => stock.useType === EVehicleUseType.CAR_PASSENGER);
 }
 
 export function chosenRealStock(state: IStore) {
@@ -179,11 +148,9 @@ export function chosenRealStock(state: IStore) {
       for (let i = 0; i < stock.count; i++) acc.push(stock.type);
       return acc;
     }, [] as string[])
-    .join(";");
+    .join(';');
 
-  const realStockObj = state.readyStockList.find(
-    (readyStock) => readyStock.stockString == currentStockString,
-  );
+  const realStockObj = state.readyStockList.find((readyStock) => readyStock.stockString == currentStockString);
 
   state.chosenRealStockName = realStockObj?.stockId ?? undefined;