From f94c867a717dc0e8fa6f646047a37cbc549199cd Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Tue, 1 Mar 2022 23:03:50 +0100
Subject: [PATCH] Poprawiono opisy ikonek dla SBL i TWB

---
 .../SceneryView/SceneryInfo/SceneryInfoIcons.vue  | 12 ++++++------
 src/views/SceneryView.vue                         | 15 +++------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue
index ee3c528..c395402 100644
--- a/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue
+++ b/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue
@@ -22,18 +22,18 @@
     />
 
     <img
-      v-if="station.generalInfo && station.generalInfo.SBL !== ''"
+      v-if="station.generalInfo && station.generalInfo.routes.sblRouteNames.length > 0"
       :src="icons.SBL"
-      :alt="$t('desc.SBL') + `${station.generalInfo.SBL}`"
-      :title="$t('desc.SBL') + `${station.generalInfo.SBL}`"
+      alt="sbl icon"
+      :title="$t('desc.SBL') + `${station.generalInfo.routes.sblRouteNames.join(', ')}`"
     />
 
     <img
-      v-if="station.generalInfo && station.generalInfo.TWB !== ''"
+      v-if="station.generalInfo && station.generalInfo.routes.twoWay.some(route => route.TWB)"
       :src="icons.TWB"
-      alt="two way route blockade"
+      alt="TWB icon"
       :title="
-        `${station.generalInfo.TWB === 'TAK' ? $t('desc.TWB-all') : $t('desc.TWB-routes') + station.generalInfo.TWB}`
+        $t('desc.TWB-routes') + station.generalInfo.routes.twoWay.filter(route => route.TWB).map(route => route.name).join(', ')
       "
     />
 
diff --git a/src/views/SceneryView.vue b/src/views/SceneryView.vue
index f614fe0..6fb8765 100644
--- a/src/views/SceneryView.vue
+++ b/src/views/SceneryView.vue
@@ -56,25 +56,15 @@ import SceneryHeader from '@/components/SceneryView/SceneryHeader.vue';
 
 import ActionButton from '@/components/Global/ActionButton.vue';
 
-import { computed, ComputedRef, defineComponent } from '@vue/runtime-core';
+import { computed, ComputedRef, defineComponent, onMounted } from '@vue/runtime-core';
 import { useStore } from '@/store';
 import { GETTERS } from '@/constants/storeConstants';
 import { useRoute } from 'vue-router';
 
 import axios from 'axios';
 import { URLs } from '@/scripts/utils/apiURLs';
-import { watch, watchEffect } from 'vue';
 import Station from '@/scripts/interfaces/Station';
 
-interface SceneryHistoryData {
-  response?: {
-    stationName: string;
-    currentDispatcher: string;
-    currentDispatcherId: number;
-    currentDispatcherFrom: number;
-  };
-}
-
 export default defineComponent({
   components: { SceneryInfo, SceneryTimetable, SceneryHistory, ActionButton, SceneryHeader },
 
@@ -107,6 +97,7 @@ export default defineComponent({
        return data.value.stationList.find((station) => station.name === route.query.station?.toString().replace(/_/g, ' '))
     })
 
+
     // const onlineFrom = computed(async () => {
     //   return await (await axios.get(`${URLs.stacjownikAPI}?name=${route.query.station}&historyCount=0`)).data;
     // });
@@ -132,7 +123,7 @@ export default defineComponent({
   },
 
   async mounted() {
-    this.stationInfo = (this.$store.getters[GETTERS.allData] as StoreData).stationList.find((station) => station.name === this.$route.query.station?.toString().replace(/_/g, ' '))
+    // this.stationInfo = (this.$store.getters[GETTERS.allData] as StoreData).stationList.find((station) => station.name === this.$route.query.station?.toString().replace(/_/g, ' '))
   },
 
   async activated() {