Dodano informację o SUP dla scenerii

This commit is contained in:
2022-01-16 19:27:41 +01:00
parent 1bdf3e75f4
commit 1b0c1cb9d6
8 changed files with 36 additions and 13 deletions
+1 -1
View File
@@ -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)"/>

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

@@ -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`)"
@@ -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'),
+1
View File
@@ -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",
+1
View File
@@ -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ą",
+2
View File
@@ -18,6 +18,8 @@ export default interface Station {
signalType: string;
controlType: string;
SUP: boolean;
default: boolean;
nonPublic: boolean;
unavailable: boolean;
+1 -1
View File
@@ -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",
+14 -11
View File
@@ -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],
}
}));