From 94901bf99b6705ec165deb6fc1b57759185ea30f Mon Sep 17 00:00:00 2001 From: Spythere Date: Mon, 15 Nov 2021 17:29:31 +0100 Subject: [PATCH] Nowe filtry scenerii --- .gitignore | 1 + package.json | 2 +- .../StationsView/StationFilterCard.vue | 131 +++++------------- src/data/options.json | 46 +++++- src/data/stationData.json | 2 +- src/locales/en.json | 5 + src/locales/pl.json | 6 + src/scripts/interfaces/Filter.ts | 2 +- src/scripts/managers/stationFilterManager.ts | 29 +++- src/views/StationsView.vue | 80 +++++------ 10 files changed, 157 insertions(+), 147 deletions(-) diff --git a/.gitignore b/.gitignore index 4f40eef..9a6b0db 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ node_modules .firebaserc firebase.json + .env .fake diff --git a/package.json b/package.json index a228013..cd3692a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "stacjownik", - "version": "1.4.93", + "version": "1.4.95", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/src/components/StationsView/StationFilterCard.vue b/src/components/StationsView/StationFilterCard.vue index f779112..0867f0c 100644 --- a/src/components/StationsView/StationFilterCard.vue +++ b/src/components/StationsView/StationFilterCard.vue @@ -37,15 +37,21 @@
- +
@@ -102,46 +108,6 @@ import StorageManager from '@/scripts/managers/storageManager'; import ActionButton from '../Global/ActionButton.vue'; import FilterOption from './FilterOption.vue'; -/* -Do JSONa - { - "id": "endingStatus", - "name": "endingStatus", - "iconName": "", - - "section": "status", - "value": true, - "defaultValue": true - }, - { - "id": "afkStatus", - "name": "afkStatus", - "iconName": "", - - "section": "status", - "value": true, - "defaultValue": true - }, - { - "id": "noSpaceStatus", - "name": "noSpaceStatus", - "iconName": "", - - "section": "status", - "value": true, - "defaultValue": true - }, - { - "id": "unavailableStatus", - "name": "unavailableStatus", - "iconName": "", - - "section": "status", - "value": true, - "defaultValue": true - } -*/ - export default defineComponent({ components: { ActionButton, FilterOption }, emits: ['changeFilterValue', 'invertFilters', 'resetFilters'], @@ -153,6 +119,8 @@ export default defineComponent({ saveOptions: false, STORAGE_KEY: 'options_saved', + minimumHours: 0, + currentRegion: { id: '', value: '' }, }), @@ -161,14 +129,18 @@ export default defineComponent({ return { isVisible, - - minimumTimeString: ref('BEZ LIMITU'), }; }, mounted() { this.saveOptions = StorageManager.isRegistered(this.STORAGE_KEY); + if (StorageManager.isRegistered('onlineFromHours') && this.saveOptions) { + this.minimumHours = StorageManager.getNumericValue('onlineFromHours'); + + this.changeNumericFilterValue('onlineFromHours', this.minimumHours); + } + this.currentRegion = this.$store.getters[GETTERS.currentRegion]; }, @@ -200,64 +172,25 @@ export default defineComponent({ this.closeCard(); }, - subHour() { - if (this.minimumTimeString == 'BEZ LIMITU') { - const prevHour = new Date().getHours() + 7; - - this.minimumTimeString = `${prevHour < 10 ? '0' : ''}${prevHour}:00`; - - const prevDate = new Date(); - prevDate.setHours(prevHour, 0, 0); - - this.$emit('changeFilterValue', { - name: 'onlineToTimestamp', - value: prevDate.getTime(), - }); - return; - } - - const prevHour = Number(this.minimumTimeString.split(':')[0]) - 1; - - if (prevHour < new Date().getHours() + 1) return; - - this.minimumTimeString = `${prevHour < 10 ? '0' : ''}${prevHour}:00`; - - const prevDate = new Date(); - prevDate.setHours(prevHour, 0, 0); - - console.log(prevDate); - + changeNumericFilterValue(name: string, value: number, saveToStorage = false) { this.$emit('changeFilterValue', { - name: 'onlineToTimestamp', - value: prevDate.getTime(), + name, + value, }); + + if (this.saveOptions && saveToStorage) StorageManager.setNumericValue(name, value); + }, + + subHour() { + this.minimumHours = this.minimumHours < 1 ? 8 : this.minimumHours - 1; + + this.changeNumericFilterValue('onlineFromHours', this.minimumHours, true); }, addHour() { - if (this.minimumTimeString == 'BEZ LIMITU') return; + this.minimumHours = this.minimumHours > 7 ? 0 : this.minimumHours + 1; - const nextHour = Number(this.minimumTimeString.split(':')[0]) + 1; - - if (nextHour > new Date().getHours() + 7) { - this.minimumTimeString = 'BEZ LIMITU'; - - this.$emit('changeFilterValue', { - name: 'onlineToTimestamp', - value: -1, - }); - - return; - } - - this.minimumTimeString = `${nextHour < 10 ? '0' : ''}${nextHour}:00`; - - const nextDate = new Date(); - nextDate.setHours(nextHour, 0, 0); - - this.$emit('changeFilterValue', { - name: 'onlineToTimestamp', - value: nextDate.getTime(), - }); + this.changeNumericFilterValue('onlineFromHours', this.minimumHours, true); }, invertFilters() { @@ -295,6 +228,8 @@ export default defineComponent({ StorageManager.setNumericValue(slider.name, slider.value); }); + this.minimumHours = 0; + this.$emit('resetFilters'); }, diff --git a/src/data/options.json b/src/data/options.json index 095fcbf..c7c18a3 100644 --- a/src/data/options.json +++ b/src/data/options.json @@ -31,6 +31,14 @@ "value": true, "defaultValue": true }, + { + "id": "non-public", + "name": "nonPublic", + "iconName": "user", + "section": "access", + "value": true, + "defaultValue": true + }, { "id": "unavailable", "name": "unavailable", @@ -138,7 +146,43 @@ "section": "status", "value": true, "defaultValue": true - } + }, + { + "id": "endingStatus", + "name": "endingStatus", + "iconName": "", + + "section": "status", + "value": true, + "defaultValue": true + }, + { + "id": "afkStatus", + "name": "afkStatus", + "iconName": "", + + "section": "status", + "value": true, + "defaultValue": true + }, + { + "id": "noSpaceStatus", + "name": "noSpaceStatus", + "iconName": "", + + "section": "status", + "value": true, + "defaultValue": true + }, + { + "id": "unavailableStatus", + "name": "unavailableStatus", + "iconName": "", + + "section": "status", + "value": true, + "defaultValue": true + } ], "sliders": [{ "id": "min-lvl", diff --git a/src/data/stationData.json b/src/data/stationData.json index 6cffd27..1329ad9 100644 --- a/src/data/stationData.json +++ b/src/data/stationData.json @@ -1 +1 @@ -[["Krzęcz","https://td2.info.pl/scenerie/krzecz/","",null,"0","NIE","kształtowa","mechaniczne","","",0,2,0,0,"",false,false,false],["Wełtawa","https://td2.info.pl/scenerie/weltawa/","",null,"","NIE","współczesna","SPK","","TAK",0,0,2,0,"Wełtawa;Most, podg.",false,true,false],["Dobrzyca Towarowa","https://td2.info.pl/scenerie/dobrzyca-towarowa/","",null,"","NIE","współczesna","SCS","","DZ, DW, Tr",1,0,3,0,"Dobrzyca DTA;Dobrzyca DTB;Dobrzyca DTC",false,true,false],["Parów","https://td2.info.pl/scenerie/parow/","",null,"0","NIE","współczesna","SCS","","TAK",0,0,2,0,"",false,false,false],["Lisków","https://td2.info.pl/scenerie/liskow/","","ISDR","8","NIE","współczesna","SPK","","Bk, Wi",1,1,2,0,"Lisków;Tefama",true,false,false],["Lisków Miasto","https://td2.info.pl/scenerie/liskow-miasto/","","ISDR","6","NIE","współczesna","SPK","","",0,1,0,0,"Lisków Miasto;Lisków Rynek, podg.",true,false,false],["Żory","https://td2.info.pl/scenerie/zory/","148, 159",null,"","NIE","współczesna","SCS","","Rb, Wa",1,0,2,0,"Żory;Ciepłownia, podg.;Kleszczów, podg.;Ryb. Gotartowice, podg.",false,true,false],["Cenorzyce Nowe","https://td2.info.pl/scenerie/cenorzyce-nowe/","",null,"","NIE","współczesna","SCS","","TAK",1,0,2,0,"",false,true,false],["Wielichowo","https://td2.info.pl/scenerie/wielichowo/","",null,"10","NIE","mieszana","SPK","","Sj, Rk",1,0,2,0,"Wielichowo Główne;Wielichowo Główne gt;Wielichowo Wieś;Borowiki, podg.",true,false,false],["Winiary","https://td2.info.pl/scenerie/winiary/","",null,"","NIE","mieszana","mechaniczne","","",0,1,2,0,"Winiary;Winiary Towarowa",false,true,false],["Bystra Woda","https://td2.info.pl/scenerie/bystra-woda","",null,"0","NIE","współczesna","SPK","","",2,0,0,0,"",false,false,false],["Tarkowo","https://td2.info.pl/scenerie/tarkowo","",null,"0","NIE","współczesna","mechaniczne","","",2,0,0,0,"",false,false,false],["Kowalewo","https://td2.info.pl/scenerie/kowalewo/","",null,"8","NIE","kształtowa","mechaniczne","","",0,0,3,0,"",false,false,false],["Radzikowo","https://td2.info.pl/scenerie/radzikowo/","",null,"0","NIE","współczesna","SPK","","TAK",0,0,2,0,"",false,false,false],["Radostowice","https://td2.info.pl/scenerie/radostowice/msg71530/?topicseen#msg71530","148",null,"0","NIE","współczesna","SPK","","",2,0,0,0,"",true,false,false],["Trawniczki","https://td2.info.pl/scenerie/trawniczki/","",null,"2","NIE","współczesna","SPK","","TAK",0,0,2,0,"",false,false,false],["Motławy","https://td2.info.pl/scenerie/motlawy/","",null,"0","NIE","współczesna","SCS","","",2,0,0,0,"",false,false,false],["Nakło","https://td2.info.pl/scenerie/naklo/","",null,"0","NIE","współczesna","SCS","","TAK",0,0,2,0,"",false,false,false],["LCS Żywiec","https://td2.info.pl/scenerie/lcs-zywiec/","139",null,"10","NIE","współczesna","SCS","","",3,0,0,0,"Żywiec;Węgierska Górka;Łodygowice;BB Leszczyny;BB Lipnik, podg.",true,false,false],["Pilichowice","https://td2.info.pl/scenerie/pilichowice-projekt-cmk/","4","CMK","5","NIE","współczesna","SCS","Op, Ol","TAK",0,0,2,0,"",false,false,false],["Góra Włodowska","https://td2.info.pl/scenerie/gora-wlodowska-projekt-cmk/","4","CMK","0","NIE","współczesna","SCS","Zw, Ps","TAK",0,0,2,0,"",false,false,false],["Borki","https://td2.info.pl/scenerie/borki","",null,"5","NIE","współczesna","SCS","","Dw, Bn",2,0,2,0,"",false,false,false],["Kszęty","https://td2.info.pl/scenerie/kszety-7118/","",null,"0","NIE","współczesna","SPK","","TAK",0,0,2,0,"",false,false,false],["Żerniki","https://td2.info.pl/scenerie/zerniki/","",null,"3","NIE","współczesna","SCS","Ol","TAK",0,0,3,0,"",false,false,false],["Ligota Grabowska","https://td2.info.pl/scenerie/ligota-grabowska-projekt-1001/","","Projekt 1001","","NIE","współczesna","SPK","","Sr",1,0,1,0,"Ligota Grabowska;Ligota Trzeszcze",false,true,false],["Blaszki","https://td2.info.pl/scenerie/blaszki/","",null,"10","NIE","współczesna","SPK","","Fs, Ki",1,1,2,0,"Blaszki;Prawylas, podg.",false,false,false],["LCS Borowe","https://td2.info.pl/scenerie/lcs-borowe/","",null,"10","NIE","współczesna","SCS","Br-Np","La, Pmi, KzA",1,0,3,0,"Borowe, podg.;Wysoka, podg.;Naprawa, podg.;Borowe Towarowe",false,false,true],["LCS Gdańsk","https://td2.info.pl/scenerie/lcs-gdansk/","9, 202, 227, 249, 250",null,"10","NIE","współczesna","SCS","Wr, Wr-SKM, PrG","Wr, PrG",3,0,3,0,"Gdańsk Główny;Gdańsk Południowy;SKM Śródmieście",false,false,true],["Lębork","https://td2.info.pl/scenerie/lebork-5834/","202, 229, 237",null,"8","NIE","współczesna","mechaniczne","","",2,2,0,0,"",true,false,false],["Grabów Miasto","https://td2.info.pl/scenerie/grabow-miasto-v2/","",null,"6","NIE","współczesna","SCS","","Ki",2,1,1,0,"Grabów Miasto;Grabów Wieś",false,false,false],["Parzęczewo","https://td2.info.pl/scenerie/parzeczewo/","",null,"6","NIE","mieszana","SCS","ZWk, SBk","ZWk",1,0,2,0,"Parzęczewo;Parzęczewo Miasto;Parzęczewo gt",false,false,true],["Aleksandrów Kujawski","https://td2.info.pl/scenerie/aleksandrow-kujawski/","18, 245",null,"4","NIE","współczesna","SPK","","Oc, NsWg",1,0,2,0,"",true,false,false],["Arkadia Zdrój 2012","https://td2.info.pl/scenerie/arkadia-zdroj/","",null,"4","NIE","mieszana","mechaniczne+SPK","","",1,0,2,0,"",true,false,false],["Buk 2018","https://td2.info.pl/scenerie/buk2/","",null,"4","NIE","współczesna","SCS-SPK","","B",2,0,1,0,"",false,false,false],["Jordanowo","https://td2.info.pl/scenerie/jordanowo/","",null,"4","NIE","mieszana","mechaniczne","","",3,2,0,0,"",false,false,false],["LCS Głowno","https://td2.info.pl/scenerie/glowno-(linia-nr-15-lka)/","15","ŁKA","4","NIE","współczesna","SCS","","",2,0,0,0,"Głowno;Domaniewice",true,false,false],["LCS Ozorków","https://td2.info.pl/scenerie/lcs-ozorkow/","16","ŁKA","4","NIE","współczesna","SPE","","",2,0,0,0,"Ozorków;Chociszew",true,false,false],["LCS Skrzynki","https://td2.info.pl/scenerie/lcs-skrzynki/","25","ŁKA","4","NIE","współczesna","SCS","","TAK",0,0,2,0,"Skrzynki;Wykno",false,false,false],["Łask","https://td2.info.pl/scenerie/lask-w-ramach-lka/","14","ŁKA","4","NIE","współczesna","mechaniczne+SCS","","",0,0,2,0,"",false,false,false],["Naterki","https://td2.info.pl/scenerie/naterki/","353",null,"4","NIE","kształtowa","mechaniczne+SCS","","",0,0,2,0,"",false,false,false],["Santok Zdrój","https://td2.info.pl/scenerie/santok-zdroj/","",null,"4","NIE","współczesna","SPK","","",2,0,0,0,"",false,false,false],["Testowo","https://td2.info.pl/scenerie/testowo-3581","","ISDR","6","NIE","współczesna","SPK","Sl","Sl",1,1,1,0,"",true,false,false],["Tłoki","https://td2.info.pl/scenerie/podg-tloki","",null,"4","NIE","współczesna","SCS-SPK","","Kl, Kp",1,0,2,0,"",false,false,false],["Witaszyczki","https://td2.info.pl/scenerie/witaszyczki/","",null,"4","NIE","współczesna","SCS","","TAK",0,0,2,0,"",true,false,false],["Bydgowo","https://td2.info.pl/scenerie/bydgowo/","",null,"2","NIE","współczesna","SPK","SK","TAK",0,0,2,0,"",false,false,true],["Głębce","https://td2.info.pl/scenerie/glebce","",null,"2","NIE","współczesna","ręczne+SPK","","",1,0,0,0,"",true,false,false],["Hel","https://td2.info.pl/scenerie/hel/","213",null,"2","NIE","współczesna","SPK","","",0,1,0,0,"",false,false,true],["Kcynia","https://td2.info.pl/scenerie/kcynia","281, 356",null,"2","NIE","kształtowa","mechaniczne","","",0,4,0,0,"",false,false,false],["Lewków","https://td2.info.pl/scenerie/lewkow/","",null,"2","NIE","mieszana","mechaniczne+SCS","","Ks",0,0,2,0,"",false,false,false],["Cis 2013","https://td2.info.pl/scenerie/cis2","",null,"0","NIE","kształtowa","mechaniczne","","",2,0,0,0,"",false,false,false],["Cis 2018","https://td2.info.pl/scenerie/cis2","",null,"0","NIE","współczesna","SCS-SPK","","",2,0,0,0,"",false,false,false],["Glinnik","https://td2.info.pl/scenerie/glinnik-(projekt-lka)/","15","ŁKA","0","NIE","współczesna","SPK","","",2,0,0,0,"",true,false,false],["Głogowo","https://td2.info.pl/scenerie/glogowo","",null,"0","NIE","współczesna","SCS","","",0,2,0,0,"",true,false,false],["Karszynek","https://td2.info.pl/scenerie/karszynek/","",null,"0","NIE","historyczna","mechaniczne","","",0,0,2,0,"",true,false,false],["Imielin 2015","https://td2.info.pl/scenerie/imielin-2015","138",null,"0","NIE","współczesna","mechaniczne+SCS","","TAK",0,0,2,0,"",true,false,false],["Kolsko","https://td2.info.pl/scenerie/kolsko/","",null,"0","NIE","kształtowa","mechaniczne","","",0,3,0,0,"",false,false,false],["LCS Bucz Wileński","https://td2.info.pl/scenerie/bucz-wilenski/","",null,"0","NIE","współczesna","SCS","WW","",0,0,1,0,"",false,false,true],["Lisiczki","https://td2.info.pl/scenerie/lisiczki","",null,"6","NIE","współczesna","SCS-SPK","","",2,0,0,0,"",true,false,false],["Łęczyca","https://td2.info.pl/scenerie/leczyca-projekt-lka/","16","ŁKA","0","NIE","współczesna","SPK","","",2,0,0,0,"",true,false,false],["Poreńsk","https://td2.info.pl/scenerie/porensk/","",null,"0","NIE","współczesna","SPK","","",2,0,0,0,"",true,false,false],["Radowice","https://td2.info.pl/scenerie/radowice","",null,"0","NIE","kształtowa","mechaniczne","","",0,2,0,0,"",false,false,false],["Witonia","https://td2.info.pl/scenerie/witonia-(projekt-lka)/","16","ŁKA","0","NIE","współczesna","SCS","","",2,0,0,0,"",true,false,false],["Wola","https://td2.info.pl/scenerie/wola/","",null,"0","NIE","mieszana","mechaniczne","","",0,0,2,0,"",true,false,false],["Zgierz Kontrewers","https://td2.info.pl/scenerie/zgierz-kontrewers-6172/","16","ŁKA","0","NIE","współczesna","SPK","","",2,0,0,0,"",true,false,false],["Bargowice","https://td2.info.pl/scenerie/bargowice-4441/","",null,"10","NIE","współczesna","SCS-SPK","","Gk, Cz",1,0,2,0,"Bargowice;Bargowice Zachód;Horz Zdrój",false,false,false],["Szklana Poręba","https://td2.info.pl/scenerie/szklana-poreba-gorna/","",null,"8","TAK","współczesna","mechaniczne","","",1,0,0,0,"",false,false,true],["Wschodna","https://td2.info.pl/scenerie/wschodna/","",null,"8","NIE","kształtowa","mechaniczne","","",1,0,2,0,"",false,false,false],["Zabłocie","https://td2.info.pl/scenerie/zablocie-3896","",null,"8","NIE","współczesna","SCS","","WB",2,0,1,0,"",false,false,true],["Zdroje","https://td2.info.pl/scenerie/zdroje","",null,"8","NIE","kształtowa","mechaniczne","","",0,1,0,0,"",false,false,false],["Grzybowo","https://td2.info.pl/scenerie/grzybowo","",null,"6","NIE","kształtowa","mechaniczne","","",0,0,2,0,"",false,false,true],["Zwardoń","https://td2.info.pl/scenerie/zwardon-4161","139",null,"2","NIE","współczesna","SCS","","",2,0,0,0,"",true,false,false],["Piaskowo","https://td2.info.pl/scenerie/piaskowo/","",null,"4","NIE","współczesna","SCS","OkL, CzP","TAK",0,0,2,0,"",false,false,false],["Rajcza","https://td2.info.pl/scenerie/rajcza/","139",null,"2","NIE","współczesna","SPK","","",2,0,0,0,"",true,false,false],["Torzyn","https://td2.info.pl/scenerie/torzyn-7170/","",null,"0","NIE","współczesna","SPK","Sw, Bo","Sw, Bo",1,0,2,0,"",false,false,false],["Wola Nowska","https://td2.info.pl/scenerie/wola-nowska//","",null,"3","NIE","współczesna","SPK","","Ra, Dm",1,0,2,0,"",false,false,false],["Chełmik Wołowski","https://td2.info.pl/scenerie/chelmik-wolowski//","",null,"2","NIE","współczesna","SPK","","RG, SC",1,0,2,0,"",false,false,false],["Drzewko","https://td2.info.pl/w-trakcie-prac/drzewko/","",null,"2","NIE","współczesna","SCS","","TAK",0,0,2,0,"",false,false,false],["Krzemienice","https://td2.info.pl/scenerie/krzemienice-(po-poprawkach)","",null,"2","NIE","współczesna","SPE","","WD",2,1,1,0,"",true,false,false],["Milówka","https://td2.info.pl/scenerie/milowka/","139",null,"2","NIE","współczesna","SPK","","",2,0,0,0,"",true,false,false],["Orniki","https://td2.info.pl/scenerie/orniki/","",null,"2","NIE","współczesna","SPK","","Op, Wm",1,1,2,0,"",false,false,false],["Otwocko","https://td2.info.pl/scenerie/otwocko/","",null,"2","NIE","współczesna","SCS","","TAK",0,0,2,0,"",false,false,false],["Skostomłoty","https://td2.info.pl/w-trakcie-prac/skostomloty/","",null,"2","NIE","współczesna","mechaniczne","","TAK",0,0,2,0,"",false,false,false],["Babimost","https://td2.info.pl/scenerie/babimost","358",null,"0","NIE","współczesna","mechaniczne","","",2,0,0,0,"",false,false,false],["Czerepy","https://td2.info.pl/scenerie/czerepy/","",null,"0","NIE","współczesna","SPK","BO","TAK",0,0,2,0,"",false,false,false],["Grabiny","https://td2.info.pl/scenerie/grabiny","",null,"0","NIE","współczesna","mechaniczne","","",2,0,0,0,"",false,false,false],["Kieły","https://td2.info.pl/scenerie/kiely-6224/","",null,"0","NIE","kształtowa","mechaniczne","","",0,1,0,0,"",false,false,false],["Lutol Suchy","https://td2.info.pl/scenerie/lutol-suchy/","367",null,"0","NIE","współczesna","mechaniczne","","",0,2,0,0,"",false,false,false],["Raki","https://td2.info.pl/scenerie/raki/","",null,"0","NIE","kształtowa","mechaniczne","","",0,1,0,0,"",false,false,true],["Sieniawka","https://td2.info.pl/scenerie/sieniawka/","",null,"4","NIE","współczesna","mechaniczne","","",1,0,1,0,"",false,false,false],["Stefanowo","https://td2.info.pl/scenerie/stefanowo/","359",null,"0","NIE","kształtowa","mechaniczne","","",0,2,0,0,"",false,false,false],["Szlichtyngowa","https://td2.info.pl/scenerie/szlichtyngowa//","",null,"0","NIE","współczesna","SPK","","TAK",0,0,2,0,"",false,false,false],["Tarnowo Górne","https://td2.info.pl/scenerie/tarnowo-gorne/","",null,"0","NIE","kształtowa","mechaniczne","","",0,2,0,0,"",false,false,false],["Tartakowo 2013","https://td2.info.pl/w-trakcie-prac/tartakowo/","",null,"0","NIE","mieszana","mechaniczne","","",0,2,0,0,"",false,false,false],["Wielgowo","https://td2.info.pl/scenerie/wielgowo/","",null,"0","NIE","współczesna","SPK","","",0,2,0,0,"",false,false,false],["Sulechów","https://td2.info.pl/scenerie/sulechow/","358",null,"0","NIE","mieszana","mechaniczne","","",2,1,0,0,"",true,false,false],["Wilczyca","https://td2.info.pl/scenerie/wilczyca/","",null,"0","NIE","współczesna","SCS","","",0,2,0,0,"",false,false,false],["Sowi Bór","https://td2.info.pl/scenerie/sowi-bor/","",null,"3","NIE","współczesna","SPK","","TAK",0,0,2,0,"",true,false,false],["Sól","https://td2.info.pl/scenerie/sol/","139",null,"2","NIE","współczesna","SPK","","",2,0,0,0,"",true,false,false],["Hetmanice","https://td2.info.pl/scenerie/hetmanice-stacja-dla-poczatkujacych/","",null,"0","NIE","współczesna","SCS","","TAK",0,0,2,0,"",false,false,true],["Starzynki","https://td2.info.pl/scenerie/starzynki/","",null,"5","NIE","współczesna","SPK","Ps","Sp",2,0,1,0,"",false,false,false],["Głęboszów","https://td2.info.pl/scenerie/gleboszow/","",null,"3","NIE","współczesna","SCS","Br, GO, Gb-Tr","Br, GO",1,0,2,0,"Głęboszów;Torków, podg.",false,false,false],["Skawce","https://td2.info.pl/scenerie/skawce-(projekt-zakopianka)/","97",null,"6","NIE","współczesna","SPK","","",2,0,0,0,"",true,false,false],["Sroka","https://td2.info.pl/scenerie/sroka-projekt-1001/","","Projekt 1001","7","NIE","współczesna","SCS","","LT, Kr, An",1,0,3,0,"Sroka, podg.;Sroka Południe, podg.",false,false,false],["Luzino","https://td2.info.pl/scenerie/luzino-6501/","202",null,"3","NIE","współczesna","mechaniczne","","",2,0,0,0,"",false,false,false],["Kudowa-Zdrój","https://td2.info.pl/scenerie/kudowa-zdroj-6616/","309",null,"4","NIE","współczesna","mechaniczne","","",0,1,0,0,"",false,false,false],["Ciechany","https://td2.info.pl/w-trakcie-prac/ciechany/","",null,"3","NIE","współczesna","SPK","","",1,0,0,0,"",false,false,false],["Czermin","https://td2.info.pl/scenerie/czermin/","",null,"8","NIE","współczesna","SCS","Lk, Fw","Lk, Fw",2,0,2,0,"",false,false,false],["Rebrowo Dolne","https://td2.info.pl/scenerie/rebrowo-dolne/","",null,"2","NIE","współczesna","SPK","","",3,0,0,0,"",false,false,false],["Lublinek","https://td2.info.pl/scenerie/lublinek-projekt-lka/","14",null,"0","NIE","współczesna","mechaniczne","","",0,0,2,0,"",true,false,false],["Stryków","https://td2.info.pl/scenerie/strykow-projekt-lka/","14",null,"0","NIE","współczesna","mechaniczne","","",2,0,0,0,"",true,false,false],["Strączki","https://td2.info.pl/scenerie/straczki/","",null,"4","NIE","współczesna","mechaniczne","","",1,0,1,0,"",false,false,false],["Niedoradz","https://td2.info.pl/scenerie/niedoradz","",null,"0","NIE","współczesna","SPK","","TAK",0,0,2,0,"",false,false,false],["Zgierz","https://td2.info.pl/scenerie/zgierz/","15,16",null,"12","TAK","współczesna","mechaniczne","","",3,0,1,0,"",true,false,false],["Łebnino","https://td2.info.pl/scenerie/lebnino-4511/","",null,"0","NIE","kształtowa","mechaniczne","","",0,1,0,0,"",false,false,false],["Legno","https://td2.info.pl/scenerie/legno/","",null,"0","NIE","współczesna","SCS","Mr","TAK",0,0,2,0,"",false,false,false],["Buczek","https://td2.info.pl/scenerie/buczek/","",null,"0","NIE","współczesna","SCS","Pa, Op","TAK",0,0,2,0,"",false,false,false],["Dziewoszyce","https://td2.info.pl/scenerie/dziewoszyce/","",null,"4","NIE","współczesna","SPK","","TAK",0,0,2,0,"Dziewoszyce;Jasienice, podg.",false,false,false],["Razemsko 2012","https://td2.info.pl/scenerie/razemsko-2012/","",null,"4","NIE","mieszana","mechaniczne","","",0,1,0,1,"",false,false,false],["Buskowo Zdrój","https://td2.info.pl/scenerie/buskowo-zdroj/","",null,"4","NIE","mieszana","mechaniczne","","",1,0,0,0,"",false,false,false],["Bełchów","https://td2.info.pl/scenerie/belchow-projekt-lka/","11","ŁKA","2","NIE","współczesna","SPK","","TAK",0,0,2,0,"",true,false,false],["Modlinków","https://td2.info.pl/scenerie/podg-modlinkow/","",null,"6","NIE","współczesna","SPK","","Kw, Pk",3,0,2,0,"",false,false,false],["Arkadia Zdrój 2019","https://td2.info.pl/scenerie/arkadia-zdroj-2016/","",null,"","NIE","współczesna","SPE","Arkadia-Nawia","MA, ES",1,0,2,0,"Arkadia Zdrój;Nawia, podg.",false,true,false],["Łaskarzew","https://td2.info.pl/scenerie/laskarzew-6516/","7",null,"0","NIE","współczesna","SPK","","TAK",0,0,2,0,"",false,false,false],["Wielicz Park","https://td2.info.pl/scenerie/wielicz-park/","",null,"2","NIE","współczesna","SCS","","",1,0,0,0,"",false,false,true],["Mołża","https://td2.info.pl/scenerie/molza/","",null,"4","NIE","współczesna","mechaniczne","","",1,0,0,0,"",false,false,false],["Stare Lipowo","https://td2.info.pl/scenerie/stare-lipowo/","",null,"10","NIE","współczesna","SCS","Dw, Pk, Pr-SL","TAK",0,0,4,0,"Stare Lipowo;Przęsy",false,false,true],["Okoń Główny","https://td2.info.pl/scenerie/okon-glowny/8","",null,"8","NIE","współczesna","SCS","","Nw, Wz, Ps",0,1,0,3,"",false,false,false],["Nysowiec","https://td2.info.pl/scenerie/nysowiec/","",null,"0","NIE","współczesna","SPK","","Kd",1,0,1,0,"",false,false,false],["Kochanowiec","https://td2.info.pl/scenerie/kochanowiec-6935/","",null,"0","NIE","współczesna","mechaniczne","","",2,0,0,0,"",false,false,false],["Wijewo","https://td2.info.pl/dzial-trenerski/wijewo-stacja-dla-poczatkujacych/","",null,"0","NIE","mieszana","mechaniczne","","",0,0,2,0,"",false,false,false]] \ No newline at end of file +[["Krzęcz","https://td2.info.pl/scenerie/krzecz/","",null,"0","NIE","kształtowa","mechaniczne","","",0,2,0,0,"",false,false,false],["Wełtawa","https://td2.info.pl/scenerie/weltawa/","",null,"","NIE","współczesna","SPK","","TAK",0,0,2,0,"Wełtawa;Most, podg.",false,true,false],["Dobrzyca Towarowa","https://td2.info.pl/scenerie/dobrzyca-towarowa/","",null,"","NIE","współczesna","SCS","","DZ, DW, Tr",1,0,3,0,"Dobrzyca DTA;Dobrzyca DTB;Dobrzyca DTC",false,true,false],["Parów","https://td2.info.pl/scenerie/parow/","",null,"0","NIE","współczesna","SCS","","TAK",0,0,2,0,"",false,false,false],["Lisków","https://td2.info.pl/scenerie/liskow/","","ISDR","8","NIE","współczesna","SPK","","Bk, Wi",1,1,2,0,"Lisków;TEFAMA",true,false,false],["Lisków Miasto","https://td2.info.pl/scenerie/liskow-miasto/","","ISDR","6","NIE","współczesna","SPK","","",0,1,0,0,"Lisków Miasto;Lisków Rynek, podg.",true,false,false],["Żory","https://td2.info.pl/scenerie/zory/","148, 159",null,"","NIE","współczesna","SCS","","Rb, Wa",1,0,2,0,"Żory;Ciepłownia, podg.;Kleszczów, podg.;Ryb. Gotartowice, podg.",false,true,false],["Cenorzyce Nowe","https://td2.info.pl/scenerie/cenorzyce-nowe/","",null,"","NIE","współczesna","SCS","","TAK",1,0,2,0,"",false,true,false],["Wielichowo","https://td2.info.pl/scenerie/wielichowo/","",null,"10","NIE","mieszana","SPK","","Sj, Rk",1,0,2,0,"Wielichowo Główne;Wielichowo Główne gt;Wielichowo Wieś;Borowiki, podg.",true,false,false],["Winiary","https://td2.info.pl/scenerie/winiary/","",null,"","NIE","mieszana","mechaniczne","","",0,1,2,0,"Winiary;Winiary Towarowa",false,true,false],["Bystra Woda","https://td2.info.pl/scenerie/bystra-woda","",null,"0","NIE","współczesna","SPK","","",2,0,0,0,"",false,false,false],["Tarkowo","https://td2.info.pl/scenerie/tarkowo","",null,"0","NIE","współczesna","mechaniczne","","",2,0,0,0,"",false,false,false],["Kowalewo","https://td2.info.pl/scenerie/kowalewo/","",null,"8","NIE","kształtowa","mechaniczne","","",0,0,3,0,"",false,false,false],["Radzikowo","https://td2.info.pl/scenerie/radzikowo/","",null,"0","NIE","współczesna","SPK","","TAK",0,0,2,0,"",false,false,false],["Radostowice","https://td2.info.pl/scenerie/radostowice/msg71530/?topicseen#msg71530","148",null,"0","NIE","współczesna","SPK","","",2,0,0,0,"",true,false,false],["Trawniczki","https://td2.info.pl/scenerie/trawniczki/","",null,"2","NIE","współczesna","SPK","","TAK",0,0,2,0,"",false,false,false],["Motławy","https://td2.info.pl/scenerie/motlawy/","",null,"0","NIE","współczesna","SCS","","",2,0,0,0,"",false,false,false],["Nakło","https://td2.info.pl/scenerie/naklo/","",null,"0","NIE","współczesna","SCS","","TAK",0,0,2,0,"",false,false,false],["LCS Żywiec","https://td2.info.pl/scenerie/lcs-zywiec/","139",null,"10","NIE","współczesna","SCS","","",3,0,0,0,"Żywiec;Węgierska Górka;Łodygowice;BB Leszczyny;BB Lipnik, podg.",true,false,false],["Pilichowice","https://td2.info.pl/scenerie/pilichowice-projekt-cmk/","4","CMK","5","NIE","współczesna","SCS","Op, Ol","TAK",0,0,2,0,"",false,false,false],["Góra Włodowska","https://td2.info.pl/scenerie/gora-wlodowska-projekt-cmk/","4","CMK","0","NIE","współczesna","SCS","Zw, Ps","TAK",0,0,2,0,"",false,false,false],["Borki","https://td2.info.pl/scenerie/borki","",null,"5","NIE","współczesna","SCS","","Dw, Bn",2,0,2,0,"",false,false,false],["Kszęty","https://td2.info.pl/scenerie/kszety-7118/","",null,"0","NIE","współczesna","SPK","","TAK",0,0,2,0,"",false,false,false],["Żerniki","https://td2.info.pl/scenerie/zerniki/","",null,"3","NIE","współczesna","SCS","Ol","TAK",0,0,3,0,"",false,false,false],["Ligota Grabowska","https://td2.info.pl/scenerie/ligota-grabowska-projekt-1001/","","Projekt 1001","","NIE","współczesna","SPK","","Sr",1,0,1,0,"Ligota Grabowska;Ligota Trzeszcze",false,true,false],["Blaszki","https://td2.info.pl/scenerie/blaszki/","",null,"10","NIE","współczesna","SPK","","",1,1,2,0,"Blaszki;Prawylas, podg.",false,false,false],["LCS Borowe","https://td2.info.pl/scenerie/lcs-borowe/","",null,"10","NIE","współczesna","SCS","Br-Np","La, Pmi, KzA",1,0,3,0,"Borowe, podg.;Wysoka, podg.;Naprawa, podg.;Borowe Towarowe",false,false,true],["LCS Gdańsk","https://td2.info.pl/scenerie/lcs-gdansk/","9, 202, 227, 249, 250",null,"10","NIE","współczesna","SCS","Wr, Wr-SKM, PrG","Wr, PrG",3,0,3,0,"Gdańsk Główny;Gdańsk Południowy;SKM Śródmieście",false,false,true],["Lębork","https://td2.info.pl/scenerie/lebork-5834/","202, 229, 237",null,"8","NIE","współczesna","mechaniczne","","",2,2,0,0,"",true,false,false],["Grabów Miasto","https://td2.info.pl/scenerie/grabow-miasto-v2/","",null,"6","NIE","współczesna","SCS","","Ki",2,1,1,0,"Grabów Miasto;Grabów Wieś",false,false,false],["Parzęczewo","https://td2.info.pl/scenerie/parzeczewo/","",null,"6","NIE","mieszana","SCS","ZWk, SBk","ZWk",1,0,2,0,"Parzęczewo;Parzęczewo Miasto;Parzęczewo gt",false,false,true],["Aleksandrów Kujawski","https://td2.info.pl/scenerie/aleksandrow-kujawski/","18, 245",null,"4","NIE","współczesna","SPK","","Oc, NsWg",1,0,2,0,"",true,false,false],["Arkadia Zdrój 2012","https://td2.info.pl/scenerie/arkadia-zdroj/","",null,"4","NIE","mieszana","mechaniczne+SPK","","",1,0,2,0,"",true,false,false],["Buk 2018","https://td2.info.pl/scenerie/buk2/","",null,"4","NIE","współczesna","SCS-SPK","","B",2,0,1,0,"",false,false,false],["Jordanowo","https://td2.info.pl/scenerie/jordanowo/","",null,"4","NIE","mieszana","mechaniczne","","",3,2,0,0,"",false,false,false],["LCS Głowno","https://td2.info.pl/scenerie/glowno-(linia-nr-15-lka)/","15","ŁKA","4","NIE","współczesna","SCS","","",2,0,0,0,"Głowno;Domaniewice",true,false,false],["LCS Ozorków","https://td2.info.pl/scenerie/lcs-ozorkow/","16","ŁKA","4","NIE","współczesna","SPE","","",2,0,0,0,"Ozorków;Chociszew",true,false,false],["LCS Skrzynki","https://td2.info.pl/scenerie/lcs-skrzynki/","25","ŁKA","4","NIE","współczesna","SCS","","TAK",0,0,2,0,"Skrzynki;Wykno",false,false,false],["Łask","https://td2.info.pl/scenerie/lask-w-ramach-lka/","14","ŁKA","4","NIE","współczesna","mechaniczne","","",0,0,2,0,"",false,false,false],["Naterki","https://td2.info.pl/scenerie/naterki/","353",null,"4","NIE","kształtowa","mechaniczne+SCS","","",0,0,2,0,"",false,false,false],["Santok Zdrój","https://td2.info.pl/scenerie/santok-zdroj/","",null,"4","NIE","współczesna","SPK","","",2,0,0,0,"",false,false,false],["Testowo","https://td2.info.pl/scenerie/testowo-3581","","ISDR","6","NIE","współczesna","SPK","Sl","Sl",1,1,1,0,"",true,false,false],["Tłoki","https://td2.info.pl/scenerie/podg-tloki","",null,"4","NIE","współczesna","SCS-SPK","","Kl, Kp",1,0,2,0,"",false,false,false],["Witaszyczki","https://td2.info.pl/scenerie/witaszyczki/","",null,"4","NIE","współczesna","SCS","","TAK",0,0,2,0,"",true,false,false],["Bydgowo","https://td2.info.pl/scenerie/bydgowo/","",null,"2","NIE","współczesna","SPK","SK","TAK",0,0,2,0,"",false,false,true],["Głębce","https://td2.info.pl/scenerie/glebce","",null,"2","NIE","współczesna","ręczne+SPK","","",1,0,0,0,"",true,false,false],["Hel","https://td2.info.pl/scenerie/hel/","213",null,"2","NIE","współczesna","SPK","","",0,1,0,0,"",false,false,true],["Kcynia","https://td2.info.pl/scenerie/kcynia","281, 356",null,"2","NIE","kształtowa","mechaniczne","","",0,4,0,0,"",false,false,false],["Lewków","https://td2.info.pl/scenerie/lewkow/","",null,"2","NIE","mieszana","mechaniczne+SCS","","Ks",0,0,2,0,"",false,false,false],["Cis 2013","https://td2.info.pl/scenerie/cis2","",null,"0","NIE","kształtowa","mechaniczne","","",2,0,0,0,"",false,false,false],["Cis 2018","https://td2.info.pl/scenerie/cis2","",null,"0","NIE","współczesna","SCS-SPK","","",2,0,0,0,"",false,false,false],["Glinnik","https://td2.info.pl/scenerie/glinnik-(projekt-lka)/","15","ŁKA","0","NIE","współczesna","SPK","","",2,0,0,0,"",true,false,false],["Głogowo","https://td2.info.pl/scenerie/glogowo","",null,"0","NIE","współczesna","SCS","","",0,2,0,0,"",true,false,false],["Karszynek","https://td2.info.pl/scenerie/karszynek/","",null,"0","NIE","historyczna","mechaniczne","","",0,0,2,0,"",true,false,false],["Imielin 2015","https://td2.info.pl/scenerie/imielin-2015","138",null,"0","NIE","współczesna","mechaniczne","","TAK",0,0,2,0,"",true,false,false],["Kolsko","https://td2.info.pl/scenerie/kolsko/","",null,"0","NIE","kształtowa","mechaniczne","","",0,3,0,0,"",false,false,false],["LCS Bucz Wileński","https://td2.info.pl/scenerie/bucz-wilenski/","",null,"0","NIE","współczesna","SCS","WW","",0,0,1,0,"",false,false,true],["Lisiczki","https://td2.info.pl/scenerie/lisiczki","",null,"6","NIE","współczesna","SPE","","",2,0,0,0,"",true,false,false],["Łęczyca","https://td2.info.pl/scenerie/leczyca-projekt-lka/","16","ŁKA","0","NIE","współczesna","SPK","","",2,0,0,0,"",true,false,false],["Poreńsk","https://td2.info.pl/scenerie/porensk/","",null,"0","NIE","współczesna","SPK","","",2,0,0,0,"",true,false,false],["Radowice","https://td2.info.pl/scenerie/radowice","",null,"0","NIE","kształtowa","mechaniczne","","",0,2,0,0,"",false,false,false],["Witonia","https://td2.info.pl/scenerie/witonia-(projekt-lka)/","16","ŁKA","0","NIE","współczesna","SCS","","",2,0,0,0,"",true,false,false],["Wola","https://td2.info.pl/scenerie/wola/","",null,"0","NIE","mieszana","mechaniczne","","",0,0,2,0,"",true,false,false],["Zgierz Kontrewers","https://td2.info.pl/scenerie/zgierz-kontrewers-6172/","16","ŁKA","0","NIE","współczesna","SPK","","",2,0,0,0,"",true,false,false],["Bargowice","https://td2.info.pl/scenerie/bargowice-4441/","",null,"10","NIE","współczesna","SCS-SPK","","Gk, Cz",1,0,2,0,"Bargowice;Bargowice Zachód;Horz Zdrój",false,false,false],["Szklana Poręba","https://td2.info.pl/scenerie/szklana-poreba-gorna/","",null,"8","TAK","współczesna","mechaniczne","","",1,0,0,0,"",false,false,true],["Wschodna","https://td2.info.pl/scenerie/wschodna/","",null,"8","NIE","kształtowa","mechaniczne","","",1,0,2,0,"",false,false,false],["Zabłocie","https://td2.info.pl/scenerie/zablocie-3896","",null,"8","NIE","współczesna","SCS","","WB",2,0,1,0,"",false,false,true],["Zdroje","https://td2.info.pl/scenerie/zdroje","",null,"8","NIE","kształtowa","mechaniczne","","",0,1,0,0,"",false,false,false],["Grzybowo","https://td2.info.pl/scenerie/grzybowo","",null,"6","NIE","kształtowa","mechaniczne","","",0,0,2,0,"",false,false,true],["Zwardoń","https://td2.info.pl/scenerie/zwardon-4161","139",null,"2","NIE","współczesna","SCS","","",2,0,0,0,"",true,false,false],["Piaskowo","https://td2.info.pl/scenerie/piaskowo/","",null,"4","NIE","współczesna","SCS","OkL, CzP","TAK",0,0,2,0,"",false,false,false],["Rajcza","https://td2.info.pl/scenerie/rajcza/","139",null,"2","NIE","współczesna","SPK","","",2,0,0,0,"",true,false,false],["Torzyn","https://td2.info.pl/scenerie/torzyn-7170/","",null,"0","NIE","współczesna","SPK","Sw, Bo","Sw, Bo",1,0,2,0,"",false,false,false],["Wola Nowska","https://td2.info.pl/scenerie/wola-nowska//","",null,"3","NIE","współczesna","SPK","","Ra, Dm",1,0,2,0,"",false,false,false],["Chełmik Wołowski","https://td2.info.pl/scenerie/chelmik-wolowski//","",null,"2","NIE","współczesna","SPK","","RG, SC",1,0,2,0,"",false,false,false],["Drzewko","https://td2.info.pl/w-trakcie-prac/drzewko/","",null,"2","NIE","współczesna","SCS","","TAK",0,0,2,0,"",false,false,false],["Krzemienice","https://td2.info.pl/scenerie/krzemienice-(po-poprawkach)","",null,"2","NIE","współczesna","SPE","","WD",2,1,1,0,"",true,false,false],["Milówka","https://td2.info.pl/scenerie/milowka/","139",null,"2","NIE","współczesna","SPK","","",2,0,0,0,"",true,false,false],["Orniki","https://td2.info.pl/scenerie/orniki/","",null,"2","NIE","współczesna","SPK","","Op, Wm",1,1,2,0,"",false,false,false],["Otwocko","https://td2.info.pl/scenerie/otwocko/","",null,"2","NIE","współczesna","SCS","","TAK",0,0,2,0,"",false,false,false],["Skostomłoty","https://td2.info.pl/w-trakcie-prac/skostomloty/","",null,"2","NIE","współczesna","mechaniczne","","TAK",0,0,2,0,"",false,false,false],["Babimost","https://td2.info.pl/scenerie/babimost","358",null,"0","NIE","współczesna","mechaniczne","","",2,0,0,0,"",false,false,false],["Czerepy","https://td2.info.pl/scenerie/czerepy/","",null,"0","NIE","współczesna","SPK","BO","TAK",0,0,2,0,"",false,false,false],["Grabiny","https://td2.info.pl/scenerie/grabiny","",null,"0","NIE","współczesna","mechaniczne","","",2,0,0,0,"",false,false,false],["Kieły","https://td2.info.pl/scenerie/kiely-6224/","",null,"0","NIE","kształtowa","mechaniczne","","",0,1,0,0,"",false,false,false],["Lutol Suchy","https://td2.info.pl/scenerie/lutol-suchy/","367",null,"0","NIE","współczesna","mechaniczne","","",0,2,0,0,"",false,false,false],["Raki","https://td2.info.pl/scenerie/raki/","",null,"0","NIE","kształtowa","mechaniczne","","",0,1,0,0,"",false,false,true],["Sieniawka","https://td2.info.pl/scenerie/sieniawka/","",null,"4","NIE","współczesna","mechaniczne","","",1,0,1,0,"",false,false,false],["Stefanowo","https://td2.info.pl/scenerie/stefanowo/","359",null,"0","NIE","kształtowa","mechaniczne","","",0,2,0,0,"",false,false,false],["Szlichtyngowa","https://td2.info.pl/scenerie/szlichtyngowa//","",null,"0","NIE","współczesna","SPK","","TAK",0,0,2,0,"",false,false,false],["Tarnowo Górne","https://td2.info.pl/scenerie/tarnowo-gorne/","",null,"0","NIE","kształtowa","mechaniczne","","",0,2,0,0,"",false,false,false],["Tartakowo 2013","https://td2.info.pl/w-trakcie-prac/tartakowo/","",null,"0","NIE","mieszana","mechaniczne","","",0,2,0,0,"",false,false,false],["Wielgowo","https://td2.info.pl/scenerie/wielgowo/","",null,"0","NIE","współczesna","SPK","","",0,2,0,0,"",false,false,false],["Sulechów","https://td2.info.pl/scenerie/sulechow/","358",null,"0","NIE","mieszana","mechaniczne","","",2,1,0,0,"",true,false,false],["Wilczyca","https://td2.info.pl/scenerie/wilczyca/","",null,"0","NIE","współczesna","SCS","","",0,2,0,0,"",false,false,false],["Sowi Bór","https://td2.info.pl/scenerie/sowi-bor/","",null,"3","NIE","współczesna","SPK","","TAK",0,0,2,0,"",true,false,false],["Sól","https://td2.info.pl/scenerie/sol/","139",null,"2","NIE","współczesna","SPK","","",2,0,0,0,"",true,false,false],["Hetmanice","https://td2.info.pl/scenerie/hetmanice-stacja-dla-poczatkujacych/","",null,"0","NIE","współczesna","SCS","","TAK",0,0,2,0,"",false,false,true],["Starzynki","https://td2.info.pl/scenerie/starzynki/","",null,"5","NIE","współczesna","SPK","Ps","Sp",2,0,1,0,"",false,false,false],["Głęboszów","https://td2.info.pl/scenerie/gleboszow/","",null,"3","NIE","współczesna","SCS","Br, GO, Gb-Tr","Br, GO",1,0,2,0,"Głęboszów;Torków, podg.",false,false,false],["Skawce","https://td2.info.pl/scenerie/skawce-(projekt-zakopianka)/","97",null,"6","NIE","współczesna","SPK","","",2,0,0,0,"",true,false,false],["Sroka","https://td2.info.pl/scenerie/sroka-projekt-1001/","","Projekt 1001","7","NIE","współczesna","SCS","","LT, Kr, An",1,0,3,0,"Sroka, podg.;Sroka Południe, podg.",false,false,false],["Luzino","https://td2.info.pl/scenerie/luzino-6501/","202",null,"3","NIE","współczesna","mechaniczne","","",2,0,0,0,"",false,false,false],["Kudowa-Zdrój","https://td2.info.pl/scenerie/kudowa-zdroj-6616/","309",null,"4","NIE","współczesna","mechaniczne","","",0,1,0,0,"",false,false,false],["Ciechany","https://td2.info.pl/w-trakcie-prac/ciechany/","",null,"3","NIE","współczesna","SPK","","",1,0,0,0,"",false,false,false],["Czermin","https://td2.info.pl/scenerie/czermin/","",null,"8","NIE","współczesna","SCS","Lk, Fw","Lk, Fw",2,0,2,0,"",false,false,false],["Rebrowo Dolne","https://td2.info.pl/scenerie/rebrowo-dolne/","",null,"2","NIE","współczesna","SPK","","",3,0,0,0,"",false,false,false],["Lublinek","https://td2.info.pl/scenerie/lublinek-projekt-lka/","14",null,"0","NIE","współczesna","mechaniczne","","",0,0,2,0,"",true,false,false],["Stryków","https://td2.info.pl/scenerie/strykow-projekt-lka/","14",null,"0","NIE","współczesna","mechaniczne","","",2,0,0,0,"",true,false,false],["Strączki","https://td2.info.pl/scenerie/straczki/","",null,"4","NIE","współczesna","mechaniczne","","",1,0,1,0,"",false,false,false],["Niedoradz","https://td2.info.pl/scenerie/niedoradz","",null,"0","NIE","współczesna","SPK","","TAK",0,0,2,0,"",false,false,false],["Zgierz","https://td2.info.pl/scenerie/zgierz/","15,16",null,"12","TAK","współczesna","mechaniczne","","",3,0,1,0,"",true,false,false],["Łebnino","https://td2.info.pl/scenerie/lebnino-4511/","",null,"0","NIE","kształtowa","mechaniczne","","",0,1,0,0,"",false,false,false],["Legno","https://td2.info.pl/scenerie/legno/","",null,"0","NIE","współczesna","SCS","Mr","TAK",0,0,2,0,"",false,false,false],["Buczek","https://td2.info.pl/scenerie/buczek/","",null,"0","NIE","współczesna","SCS","Pa, Op","TAK",0,0,2,0,"",false,false,false],["Dziewoszyce","https://td2.info.pl/scenerie/dziewoszyce/","",null,"4","NIE","współczesna","SPK","","TAK",0,0,2,0,"Dziewoszyce;Jasienice, podg.",false,false,false],["Razemsko 2012","https://td2.info.pl/scenerie/razemsko-2012/","",null,"4","NIE","mieszana","mechaniczne","","",0,1,0,1,"",false,false,false],["Buskowo Zdrój","https://td2.info.pl/scenerie/buskowo-zdroj/","",null,"4","NIE","mieszana","mechaniczne","","",1,0,0,0,"",false,false,false],["Bełchów","https://td2.info.pl/scenerie/belchow-projekt-lka/","11","ŁKA","2","NIE","współczesna","SPK","","TAK",0,0,2,0,"",true,false,false],["Modlinków","https://td2.info.pl/scenerie/podg-modlinkow/","",null,"6","NIE","współczesna","SPK","","Kw, Pk",3,0,2,0,"",false,false,false],["Arkadia Zdrój 2019","https://td2.info.pl/scenerie/arkadia-zdroj-2016/","",null,"","NIE","współczesna","SPE","Arkadia-Nawia","MA, ES",1,0,2,0,"Arkadia Zdrój;Nawia, podg.",false,true,false],["Łaskarzew","https://td2.info.pl/scenerie/laskarzew-6516/","7",null,"0","NIE","współczesna","SPK","","TAK",0,0,2,0,"",false,false,false],["Wielicz Park","https://td2.info.pl/scenerie/wielicz-park/","",null,"2","NIE","współczesna","SCS","","",1,0,0,0,"",false,false,true],["Mołża","https://td2.info.pl/scenerie/molza/","",null,"4","NIE","współczesna","mechaniczne","","",1,0,0,0,"",false,false,false],["Stare Lipowo","https://td2.info.pl/scenerie/stare-lipowo/","",null,"10","NIE","współczesna","SCS","Dw, Pk, Pr-SL","TAK",0,0,4,0,"Stare Lipowo;Przęsy",false,false,true],["Okoń Główny","https://td2.info.pl/scenerie/okon-glowny/8","",null,"8","NIE","współczesna","SCS","","Nw, Wz, Ps",0,1,0,3,"",false,false,false],["Nysowiec","https://td2.info.pl/scenerie/nysowiec/","",null,"0","NIE","współczesna","SPK","","Kd",1,0,1,0,"",false,false,false],["Kochanowiec","https://td2.info.pl/scenerie/kochanowiec-6935/","",null,"0","NIE","współczesna","mechaniczne","","",2,0,0,0,"",false,false,false],["Wijewo","https://td2.info.pl/dzial-trenerski/wijewo-stacja-dla-poczatkujacych/","",null,"0","NIE","mieszana","mechaniczne","","",0,0,2,0,"",false,false,false]] \ No newline at end of file diff --git a/src/locales/en.json b/src/locales/en.json index a59f7db..2d6a3eb 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -61,6 +61,7 @@ "real": "REAL", "fictional": "FICTIONAL", "unavailable": "UNSUPPORTED", + "non-public": "NON-PUBLIC", "SPK": "SPK", "SCS": "SCS", @@ -82,6 +83,10 @@ "routes-2t-cat": "MIN. CATENARY DOUBLE TRACK ROUTES", "routes-2t-other": "MIN. OTHER DOUBLE TRACK ROUTES" }, + "minimum-hours-title": "SHOW ONLY SCENERIES UNTIL:", + "now": "NOW", + "hour": "h", + "no-limit": "NO LIMIT", "include-selected": "INCLUDE SELECTED", "save": "SAVE FILTERS", "reset": "RESET FILTERS", diff --git a/src/locales/pl.json b/src/locales/pl.json index 9348807..78cb225 100644 --- a/src/locales/pl.json +++ b/src/locales/pl.json @@ -61,6 +61,8 @@ "real": "REALNA", "fictional": "FIKCYJNA", "unavailable": "NIEDOSTĘPNA", + "non-public": "NIEPUBLICZNA", + "SPK": "SPK", "SCS": "SCS", "SPE": "SPE", @@ -81,6 +83,10 @@ "routes-2t-cat": "SZLAKI DWUTOROWE ZELEKTR. (MINIMUM)", "routes-2t-other": "SZLAKI DWUTOROWE NIEZELEKTR. (MINIMUM)" }, + "minimum-hours-title": "POKAŻ TYLKO SCENERIE DOSTĘPNE MINIMUM DO:", + "now": "TERAZ", + "hour": " godz.", + "no-limit": "BEZ LIMITU", "include-selected": "POKAŻ ZAZNACZONE", "save": "ZAPISZ FILTRY", "reset": "RESETUJ FILTRY", diff --git a/src/scripts/interfaces/Filter.ts b/src/scripts/interfaces/Filter.ts index 11d1d72..94c8619 100644 --- a/src/scripts/interfaces/Filter.ts +++ b/src/scripts/interfaces/Filter.ts @@ -34,5 +34,5 @@ export default interface Filter { unavailableStatus: boolean; unsignedStatus: boolean; - onlineToTimestamp: number; + onlineFromHours: number; } diff --git a/src/scripts/managers/stationFilterManager.ts b/src/scripts/managers/stationFilterManager.ts index 7c741c8..dcb3ee9 100644 --- a/src/scripts/managers/stationFilterManager.ts +++ b/src/scripts/managers/stationFilterManager.ts @@ -1,5 +1,6 @@ import Station from '@/scripts/interfaces/Station'; import Filter from '@/scripts/interfaces/Filter'; +import StorageManager from './storageManager'; const sortStations = (a: Station, b: Station, sorter: { index: number; dir: number }) => { switch (sorter.index) { @@ -60,7 +61,14 @@ const filterStations = (station: Station, filters: Filter) => { if (station.online && station.statusID == 'ending' && filters['ending']) return returnMode; - if (filters['onlineToTimestamp'] != -1 && station.online && station.statusTimestamp <= filters['onlineToTimestamp']) return returnMode; + if (station.online + && station.statusTimestamp != 0 + && filters['onlineFromHours'] < 8 + && station.statusTimestamp <= Date.now() + filters['onlineFromHours'] * 3600000) + return returnMode; + + if (filters['onlineFromHours'] > 0 && station.statusTimestamp == 0) return returnMode; + if (filters['onlineFromHours'] == 8 && station.statusID != 'no-limit') return returnMode; if (station.statusID == 'ending' && filters['endingStatus']) return returnMode; if ((station.statusID == 'not-signed' || station.statusID == 'unavailable') && filters['unavailableStatus']) return returnMode; @@ -105,7 +113,6 @@ const filterStations = (station: Station, filters: Filter) => { if (filters['SBL'] && station.SBL) return returnMode; - return true; } @@ -145,13 +152,29 @@ export default class StationFilterManager { unavailableStatus: false, unsignedStatus: false, - onlineToTimestamp: -1 + onlineFromHours: 0 }; private filters: Filter = { ...this.filterInitStates }; private sorter: { index: number; dir: number } = { index: 0, dir: 1 }; + checkFilters() { + if (!StorageManager.isRegistered("options_saved")) return; + + Object.keys(this.filterInitStates).forEach(filterKey => { + if (StorageManager.isRegistered(filterKey)) return; + + const filterType = typeof this.filterInitStates[filterKey]; + + if (filterType === "boolean") + StorageManager.setBooleanValue(filterKey, !this.filterInitStates[filterKey] as boolean); + + if (filterType === "number") + StorageManager.setNumericValue(filterKey, this.filterInitStates[filterKey] as number); + }); + } + getFilteredStationList(stationList: Station[]): Station[] { return stationList .filter(station => filterStations(station, this.filters)) diff --git a/src/views/StationsView.vue b/src/views/StationsView.vue index b5a6b69..6295a83 100644 --- a/src/views/StationsView.vue +++ b/src/views/StationsView.vue @@ -35,22 +35,22 @@