From 1b0c1cb9d6bec72d36d8f74e225843c77dfa3fc2 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Sun, 16 Jan 2022 19:27:41 +0100
Subject: [PATCH] =?UTF-8?q?Dodano=20informacj=C4=99=20o=20SUP=20dla=20scen?=
 =?UTF-8?q?erii?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icon-SUP.svg                       |  2 +-
 .../SceneryInfo/SceneryInfoIcons.vue          |  7 ++++++
 src/components/StationsView/StationTable.vue  |  9 +++++++
 src/locales/en.json                           |  1 +
 src/locales/pl.json                           |  1 +
 src/scripts/interfaces/Station.ts             |  2 ++
 src/scripts/utils/apiURLs.ts                  |  2 +-
 src/store/index.ts                            | 25 +++++++++++--------
 8 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/src/assets/icon-SUP.svg b/src/assets/icon-SUP.svg
index 162b468..46d1805 100644
--- a/src/assets/icon-SUP.svg
+++ b/src/assets/icon-SUP.svg
@@ -1,6 +1,6 @@
 <svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <rect width="60" height="60" fill="#898989"/>
-<rect x="8" y="7" width="43" height="47" fill="url(#pattern0)"/>
+<rect x="11" y="9" width="38" height="41.5349" fill="url(#pattern0)"/>
 <defs>
 <pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
 <use xlink:href="#image0_769_25" transform="translate(-0.165343 -0.238194) scale(0.028928 0.026466)"/>
diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue
index 13b5cd9..ee3c528 100644
--- a/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue
+++ b/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue
@@ -7,6 +7,13 @@
       :title="$t('desc.control-type') + $t(`controls.${station.generalInfo.controlType}`)"
     />
 
+    <img
+      v-if="station.generalInfo?.SUP"
+      :src="require(`@/assets/icon-SUP.svg`)"
+      alt="SUP (RASP-UZK)"
+      :title="$t('desc.SUP')"
+    />
+
     <img
       v-if="station.generalInfo?.signalType"
       :src="require(`@/assets/icon-${station.generalInfo.signalType}.svg`)"
diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue
index 81bc8f1..9fa86da 100644
--- a/src/components/StationsView/StationTable.vue
+++ b/src/components/StationsView/StationTable.vue
@@ -156,6 +156,14 @@
                 :title="$t('desc.control-type') + $t(`controls.${station.generalInfo.controlType}`)"
               />
 
+               <img
+                class="icon-info"
+                v-if="station.generalInfo?.SUP"
+                :src="require(`@/assets/icon-SUP.svg`)"
+                alt="SUP (RASP-UZK)"
+                :title="$t('desc.SUP')"
+              />
+
               <img
                 class="icon-info"
                 v-if="station.generalInfo?.signalType"
@@ -246,6 +254,7 @@ export default defineComponent({
     userIcon: require('@/assets/icon-user.svg'),
     trainIcon: require('@/assets/icon-train.svg'),
     SBLIcon: require('@/assets/icon-SBL.svg'),
+    SUPIcon: require("@/assets/icon-SUP.svg"),
     lockIcon: require('@/assets/icon-lock.svg'),
     unavailableIcon: require('@/assets/icon-unavailable.svg'),
     unknownIcon: require('@/assets/icon-unknown.svg'),
diff --git a/src/locales/en.json b/src/locales/en.json
index f4903f1..7f1d34a 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -12,6 +12,7 @@
     "control-type": "Control type: ",
     "signals-type": "Signals type:  ",
     "SBL": "This scenery has automatic line blockade system on following routes: ",
+    "SUP": "Requires the SUP application (level crossing remote control simulator)",
     "TWB-all": "This scenery has two-way route blockade on all routes",
     "TWB-routes": "This scenery has two-way route blockade on following routes: ",
     "default": "This scenery is available by default",
diff --git a/src/locales/pl.json b/src/locales/pl.json
index 9bb0316..f8693df 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -12,6 +12,7 @@
     "control-type": "Sterowanie: ",
     "signals-type": "Sygnalizacja: ",
     "SBL": "Sceneria posiada SBL na szlakach: ",
+    "SUP": "Wymaga programu SUP do kontroli systemu RASP-UZK",
     "TWB-all": "Sceneria posiada blokadę dwukierunkową na wszystkich szlakach",
     "TWB-routes": "Sceneria posiada blokadę dwukierunkową na szlakach: ",
     "default": "Sceneria dostępna domyślnie w paczce z grą",
diff --git a/src/scripts/interfaces/Station.ts b/src/scripts/interfaces/Station.ts
index 20a77e7..6265180 100644
--- a/src/scripts/interfaces/Station.ts
+++ b/src/scripts/interfaces/Station.ts
@@ -18,6 +18,8 @@ export default interface Station {
     signalType: string;
     controlType: string;
 
+    SUP: boolean;
+
     default: boolean;
     nonPublic: boolean;
     unavailable: boolean;
diff --git a/src/scripts/utils/apiURLs.ts b/src/scripts/utils/apiURLs.ts
index 8fc1e70..b9c5ad8 100644
--- a/src/scripts/utils/apiURLs.ts
+++ b/src/scripts/utils/apiURLs.ts
@@ -1,5 +1,5 @@
 export const URLs = {
-  sceneryData: "https://spythere.github.io/api/stationData.json",
+  sceneryData: "https://spythere.github.io/api/stationDataNew.json",
   sceneryDataDev: "http://127.0.0.1:8000/data",
   stations: "https://api.td2.info.pl:9640/?method=getStationsOnline",
   trains: "https://api.td2.info.pl:9640/?method=getTrainsOnline",
diff --git a/src/store/index.ts b/src/store/index.ts
index 9bd5622..96f1ab3 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -42,7 +42,7 @@ export interface State {
   listenerLaunched: boolean;
 }
 
-type StationJSONData = [string, string, string, string, string, string, string, string, string, string, number, number, number, number, string | null, boolean, boolean, boolean];
+type StationJSONData = [string, string, string, string, string, string, string, string, boolean, string, string, number, number, number, number, string | null, boolean, boolean, boolean];
 
 export const key: InjectionKey<Store<State>> = Symbol()
 
@@ -286,23 +286,26 @@ export const store = createStore<State>({
           supportersOnly: station[5] == "TAK",
           signalType: station[6],
           controlType: station[7],
-          SBL: station[8],
-          TWB: station[9],
+          
+          SUP: station[8],
+
+          SBL: station[9],
+          TWB: station[10],
           routes: {
             oneWay: {
-              catenary: station[10],
-              noCatenary: station[11]
+              catenary: station[11],
+              noCatenary: station[12]
             },
             twoWay: {
-              catenary: station[12],
-              noCatenary: station[13]
+              catenary: station[13],
+              noCatenary: station[14]
             }
           },
-          checkpoints: station[14] ? (station[14]).split(";").map(sub => ({ checkpointName: sub, scheduledTrains: [] })) : [],
+          checkpoints: station[15] ? (station[15]).split(";").map(sub => ({ checkpointName: sub, scheduledTrains: [] })) : [],
 
-          default: station[15],
-          nonPublic: station[16],
-          unavailable: station[17],
+          default: station[16],
+          nonPublic: station[17],
+          unavailable: station[18],
         }
       }));