feature: vmax szlaków

src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue

@@ -4,12 +4,10 @@
       <b>{{ $t('scenery.one-way-routes') }}</b>
 
       <ul class="routes-list">
-        <li
+        <li v-for="route in station.generalInfo.routes.oneWay">
-          v-for="route in station.generalInfo.routes.oneWay"
+          <span :class="{ 'no-catenary': !route.catenary, internal: route.isInternal }"> {{ route.name }}</span>
-          :class="{ 'no-catenary': !route.catenary, internal: route.isInternal }"
+          <span v-if="route.speed" class="speed">{{ route.speed }}</span>
-        >
+          <span v-if="route.SBL" class="sbl">SBL</span>
-          {{ route.name }}
-          <b v-if="route.SBL">SBL</b>
         </li>
       </ul>
     </div>
@@ -18,41 +16,13 @@
       <b>{{ $t('scenery.two-way-routes') }}</b>
 
       <ul class="routes-list">
-        <li
+        <li v-for="route in station.generalInfo.routes.twoWay">
-          v-for="route in station.generalInfo.routes.twoWay"
+          <span :class="{ 'no-catenary': !route.catenary, internal: route.isInternal }">{{ route.name }}</span>
-          :class="{ 'no-catenary': !route.catenary, internal: route.isInternal }"
+          <span v-if="route.speed" class="speed">{{ route.speed }}</span>
-        >
+          <span v-if="route.SBL" class="sbl">SBL</span>
-          {{ route.name }} <b v-if="route.SBL">SBL</b>
         </li>
       </ul>
     </div>
-
-    <!-- <div
-      class="route-info"
-      :class="{ 'no-catenary': !route.catenary, internal: route.isInternal }"
-      v-for="route in [...station.generalInfo.routes.oneWay, ...station.generalInfo.routes.twoWay].filter(
-        (route) => route.name != '-'
-      )"
-      :key="route.name"
-      :title="`Szlak ${route.name}: ${route.isInternal ? 'wewnętrzny' : 'zewnętrzny'}, ${
-        route.tracks == 2 ? 'dwutorowy' : 'jednotorowy'
-      }, ${route.catenary ? 'zelektryfikowany' : 'niezelektryfikowany'} z ${route.SBL ? 'SBL' : 'PBL'} ${
-        route.TWB ? 'i blokadą dwukierunkową' : ''
-      }`"
-    > -->
-    <!-- <span class="track-name">
-        <b>{{ route.name }}</b>
-      </span> -->
-    <!--
-      <span class="track-specs">
-        {{ route.tracks }}tor
-        <img v-if="route.catenary" :src="icons.trackCatenary" alt="icon track catenary" />
-        <img v-else :src="icons.trackNoCatenary" alt="icon track no catenary" />
-
-        <img v-if="route.TWB" :src="icons.trackTWB" alt="icon track twb" />
-        <img v-if="route.SBL" :src="icons.trackSBL" alt="icon track sbl" />
-      </span> -->
-    <!-- </div> -->
   </section>
 </template>
 
@@ -93,10 +63,12 @@ ul.routes-list {
   display: flex;
 
   li {
-    background-color: #007599;
+    margin: 0.2em 0.25em;
 
+    span {
       padding: 0.2em 0.25em;
-    margin-left: 0.25em;
+      background-color: #007599;
+      font-weight: bold;
 
       &.no-catenary {
         background-color: #686868;
@@ -106,8 +78,28 @@ ul.routes-list {
         text-decoration: underline;
       }
 
-    b {
+      &.speed {
+        background-color: #404040;
+        color: #cfcfcf;
+      }
+
+      &.sbl {
         color: var(--clr-primary);
+        background-color: #404040;
+      }
+
+      &:last-child {
+        border-radius: 0 0.5em 0.5em 0;
+      }
+
+      &:first-child {
+        border-radius: 0.5em 0 0 0.5em;
+      }
+
+      &:only-child {
+        border-radius: 0.5em;
+
+      }
     }
   }
 }

src/components/TrainsView/TrainSchedule.vue

@@ -89,6 +89,7 @@ import dateMixin from '../../mixins/dateMixin';
 import imageMixin from '../../mixins/imageMixin';
 import Train from '../../scripts/interfaces/Train';
 import TrainStop from '../../scripts/interfaces/TrainStop';
+import { useStore } from '../../store/store';
 import StopDate from '../Global/StopDate.vue';
 
 export default defineComponent({
@@ -106,6 +107,8 @@ export default defineComponent({
 
   setup(props) {
     return {
+      store: useStore(),
+
       lastConfirmed: computed(() => {
         return props.train.timetableData!.followingStops.findIndex(
           (stop, i, stops) => stop.confirmed && !stops[i + 1]?.confirmed && !stops[i + 1]?.stopped
@@ -424,3 +427,4 @@ ul.stop_list > li.stop {
   }
 }
 </style>
+

src/scripts/interfaces/StationRoutes.ts

@@ -1,12 +1,13 @@
 export default interface StationRoutes {
-    oneWay:
+  oneWay: {
-    {
     name: string;
     catenary: boolean;
     SBL: boolean;
     TWB: boolean;
     isInternal: boolean;
     tracks: number;
+    speed: number;
+    length: number;
   }[];
 
   twoWay: {
@@ -16,6 +17,8 @@ export default interface StationRoutes {
     TWB: boolean;
     isInternal: boolean;
     tracks: number;
+    speed: number;
+    length: number;
   }[];
 
   /* [catenary, noCatenary] */

src/scripts/interfaces/Train.ts

@@ -12,7 +12,7 @@ export default interface Train {
   driverId: number;
   trainNo: number;
   driverName: string;
-  driverLevel: number;
+  driverLevel?: number;
   currentStationName: string;
   currentStationHash: string;
   locoURL: string;

src/store/store.ts

@@ -24,6 +24,7 @@ export const useStore = defineStore('store', {
 
       stationList: [],
       trainList: [],
+      routesList: [],
 
       sceneryData: [],
       lastDispatcherStatuses: [],
@@ -115,8 +116,8 @@ export const useStore = defineStore('store', {
                   sceneries: timetable.sceneries,
                 }
               : undefined,
-          };
+          } as Train;
-        }) as Train[];
+        });
     },
 
     getDispatcherStatus(onlineStationData: StationAPIData) {
@@ -294,7 +295,8 @@ export const useStore = defineStore('store', {
         return;
       }
 
-      this.stationList = sceneryData.map((scenery) => ({
+      this.stationList = sceneryData.map((scenery) => {
+        return {
           name: scenery.name,
 
           generalInfo: {
@@ -315,6 +317,9 @@ export const useStore = defineStore('store', {
                     const catenary = specs2[1] == 'E';
                     const SBL = specs2[2] == 'S';
                     const TWB = specs2[3] ? true : false;
+                    const speed = Number(routeString.split(':')[1]) || 0;
+                    const length  = Number(routeString.split(':')[2]) || 0;
+
 
                     const propName = twoWay
                       ? catenary
@@ -331,6 +336,8 @@ export const useStore = defineStore('store', {
                       catenary,
                       isInternal,
                       tracks: twoWay ? 2 : 1,
+                      length,
+                      speed,
                     });
                     if (!isInternal) acc[propName].push(name);
 
@@ -352,7 +359,8 @@ export const useStore = defineStore('store', {
               ? scenery.checkpoints.split(';').map((sub) => ({ checkpointName: sub, scheduledTrains: [] }))
               : [],
           },
-      }));
+        };
+      });
     },
 
     connectToWebsocket() {

src/store/storeTypes.ts

@@ -69,6 +69,7 @@ export interface StationJSONData {
   SUP: boolean;
 
   routes: string;
+  
   checkpoints: string | null;
   authors?: string;