Merge pull request #40 from Spythere/development

v1.8.13

.github/workflows/firebase-hosting-merge.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - run: npm ci && npm run build
+      - run: yarn && yarn build
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
           repoToken: '${{ secrets.GITHUB_TOKEN }}'

.github/workflows/firebase-hosting-pull-request.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - run: npm ci && npm run build
+      - run: yarn && yarn build
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
           repoToken: '${{ secrets.GITHUB_TOKEN }}'

.gitignore

@@ -25,7 +25,4 @@ pnpm-debug.log*
 node_modules
 
 # Dev files
-stockInfoDev.json
+stockInfoDev.json
-
-# Lock files
-yarn.lock

package.json

@@ -1,12 +1,12 @@
 {
   "name": "pojazdownik",
-  "version": "1.8.7",
+  "version": "1.8.13",
   "private": true,
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "vue-tsc --noEmit && vite build",
-    "preview": "yarn build && vite preview --port 4174",
+    "preview": "yarn build && vite preview",
     "type-check": "vue-tsc --noEmit -p tsconfig.app.json --composite false",
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
     "format": "prettier --write src/"
@@ -16,7 +16,8 @@
     "pinia": "^2.0.17",
     "prettier": "^3.0.3",
     "vue": "^3.2.37",
-    "vue-i18n": "9.11.0"
+    "vue-i18n": "9.11.0",
+    "vue-router": "4"
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "^1.3.3",

src/App.vue

@@ -1,7 +1,8 @@
 <template>
   <AppModals />
   <ImageFullscreenPreview v-if="store.vehiclePreviewSrc" />
-  <AppContainerView />
+ 
+  <router-view></router-view>
 </template>
 
 <script lang="ts">

src/components/app/Footer.vue

@@ -9,7 +9,7 @@
     </i18n-t>
 
     <div class="text--grayed" v-if="store.vehiclesData">
-      {{ $t('footer.version-check', { version: store.vehiclesData.simulatorVersion }) }}
+      {{ $t('footer.version-check', { version: store.compatibleSimulatorVersion }) }}
     </div>
 
     <div>

src/components/cards/RealStockCard.vue

@@ -23,7 +23,7 @@
 
           <datalist id="readyStockDataList">
             <option
-              v-for="stock in store.realCompositionList"
+              v-for="stock in filteredCompositionList"
               :value="stock.stockId"
               :key="stock.name"
             >
@@ -39,7 +39,7 @@
 
           <datalist id="readyStockStringList">
             <option
-              v-for="stockType in computedAvailableStockTypes"
+              v-for="stockType in availableCompositionTypes"
               :value="stockType"
               :key="stockType"
             >
@@ -54,7 +54,7 @@
       </div>
 
       <ul class="card_list" ref="list" @scroll="onListScroll">
-        <li v-for="rStock in computedReadyStockList" :key="rStock.stockId">
+        <li v-for="rStock in filteredCompositionList" :key="rStock.stockId">
           <!-- :data-last-selected="store.ch === rStock.stockId" -->
           <div
             class="stock-title"
@@ -76,7 +76,7 @@
               <div class="thumbnail-container">
                 <div>{{ stockType }}</div>
                 <img
-                  :src="`https://rj.td2.info.pl/dist/img/thumbnails/${stockType}.png`"
+                  :src="`https://stacjownik.spythere.eu/static/thumbnails/${stockType}.png`"
                   :title="stockType"
                   style="opacity: 0"
                   @error="(e) => onStockItemError(e, stockType)"
@@ -100,7 +100,7 @@ import { useStore } from '../../store';
 import imageMixin from '../../mixins/imageMixin';
 import stockMixin from '../../mixins/stockMixin';
 
-import { IRealComposition, VehicleGroupType } from '../../types';
+import { IRealComposition, VehicleGroupType } from '../../types/common.types';
 
 function getVehicleType(stockType: string): VehicleGroupType {
   if (/^E/.test(stockType)) return 'loco-electric';
@@ -141,7 +141,7 @@ export default defineComponent({
   },
 
   computed: {
-    computedReadyStockList(): IRealComposition[] {
+    filteredCompositionList() {
       return this.store.realCompositionList
         .filter(
           (rc) =>
@@ -155,7 +155,7 @@ export default defineComponent({
         .filter((_, i) => i <= this.visibleIndexesTo);
     },
 
-    computedAvailableStockTypes() {
+    availableCompositionTypes() {
       return this.store.realCompositionList
         .reduce((acc, rs) => {
           rs.stockString.split(';').forEach((s) => {
@@ -169,7 +169,7 @@ export default defineComponent({
   },
 
   watch: {
-    computedReadyStockList(curr, prev) {
+    filteredCompositionList(curr, prev) {
       if (curr.length < prev.length) {
         this.visibleIndexesTo = 20;
         (this.$refs['list'] as HTMLElement).scrollTo({

src/components/sections/InputsSection.vue

@@ -126,7 +126,7 @@ import imageMixin from '../../mixins/imageMixin';
 import { useStore } from '../../store';
 import stockPreviewMixin from '../../mixins/stockPreviewMixin';
 import stockMixin from '../../mixins/stockMixin';
-import { LocoGroupType, WagonGroupType } from '../../types';
+import { LocoGroupType, WagonGroupType } from '../../types/common.types';
 
 export default defineComponent({
   mixins: [imageMixin, stockPreviewMixin, stockMixin],

src/components/sections/StockSection.vue

@@ -1,45 +1,46 @@
 <template>
   <section class="stock-section">
     <div class="section_modes">
-      <button
+      <router-link v-for="(route, i) in routes" :key="route.name" class="link-btn" :to="route.href">
-        v-for="(id, i) in sectionModes"
+        <span class="text--accent">{{ i + 1 }}.</span> {{ $t(`topbar.${route.name}`) }}
-        :key="id"
+        <span class="text--grayed" v-if="route.name == 'stock'">({{ store.stockList.length }})</span>
-        class="btn"
+      </router-link>
-        ref="sectionButtonRefs"
-        @click="chooseSection(id)"
-        :data-selected="store.stockSectionMode == id"
-      >
-        <span class="text--accent">{{ i + 1 }}.</span> {{ $t(`topbar.${id}`) }}
-        <span v-if="id == 'stock-list'">({{ store.stockList.length }})</span>
-      </button>
     </div>
 
     <transition name="tab-change" mode="out-in">
       <keep-alive>
-        <component :is="chosenSectionComponent"></component>
+        <component :is="route.meta.viewMode"></component>
       </keep-alive>
     </transition>
   </section>
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, ref } from 'vue';
+import { onMounted } from 'vue';
 import { useStore } from '../../store';
-import StockListTab from '../tabs/StockListTab.vue';
+import { useRoute, useRouter } from 'vue-router';
-import StockGeneratorTab from '../tabs/StockGeneratorTab.vue';
-import NumberGeneratorTab from '../tabs/NumberGeneratorTab.vue';
-import WikiListTab from '../tabs/WikiListTab.vue';
-
-const sectionButtonRefs = ref([]);
 
 const store = useStore();
-type SectionMode = typeof store.stockSectionMode;
+const route = useRoute();
+const router = useRouter();
 
-const sectionModes: SectionMode[] = [
+const routes = [
-  'stock-list',
+  {
-  'wiki-list',
+    name: 'stock',
-  'number-generator',
+    href: '/',
-  'stock-generator',
+  },
+  {
+    name: 'wiki',
+    href: '/wiki',
+  },
+  {
+    name: 'numgen',
+    href: '/numgen',
+  },
+  {
+    name: 'stockgen',
+    href: '/stockgen',
+  },
 ];
 
 onMounted(() => {
@@ -49,34 +50,10 @@ onMounted(() => {
     if (/^[1234]$/.test(e.key)) {
       const keyNum = Number(e.key);
 
-      store.stockSectionMode = sectionModes[keyNum - 1];
+      router.push(routes[keyNum - 1].href);
-      (sectionButtonRefs.value[keyNum - 1] as HTMLButtonElement)?.focus();
     }
   });
 });
-
-const chosenSectionComponent = computed(() => {
-  switch (store.stockSectionMode) {
-    case 'stock-list':
-      return StockListTab;
-
-    case 'wiki-list':
-      return WikiListTab;
-
-    case 'stock-generator':
-      return StockGeneratorTab;
-
-    case 'number-generator':
-      return NumberGeneratorTab;
-
-    default:
-      return StockListTab;
-  }
-});
-
-function chooseSection(sectionId: SectionMode) {
-  store.stockSectionMode = sectionId;
-}
 </script>
 
 <style lang="scss">
@@ -107,32 +84,11 @@ function chooseSection(sectionId: SectionMode) {
 .section_modes {
   display: grid;
   grid-template-columns: repeat(4, 1fr);
+  padding: 1px;
 
   gap: 0.5em;
 
   margin-bottom: 1em;
-
-  button {
-    position: relative;
-    border-radius: 0.5em 0.5em 0 0;
-
-    &::after {
-      position: absolute;
-      bottom: 0;
-      left: 50%;
-      transform: translateX(-50%);
-
-      content: '';
-      width: 0;
-      height: 2px;
-      transition: all 100ms;
-      background-color: $accentColor;
-    }
-
-    &[data-selected='true']::after {
-      width: 100%;
-    }
-  }
 }
 
 @media screen and (max-width: 650px) {

src/components/tabs/StockGeneratorTab.vue

@@ -118,9 +118,11 @@ import { defineComponent } from 'vue';
 import { useStore } from '../../store';
 
 import stockMixin from '../../mixins/stockMixin';
-import { ICargo, ICarWagon, IStock } from '../../types';
+import { ICargo, ICarWagon, IStock } from '../../types/common.types';
 import { isTractionUnit } from '../../utils/vehicleUtils';
 
+import generatorDataJSON from '../../data/generatorData.json';
+
 export default defineComponent({
   name: 'stock-generator',
   mixins: [stockMixin],
@@ -150,15 +152,13 @@ export default defineComponent({
     },
 
     computedCargoData() {
-      if (!this.store.vehiclesData?.generator.cargo) return [];
+      const cargoGeneratorData = generatorDataJSON.cargo;
-
-      const cargoGeneratorData = this.store.vehiclesData.generator.cargo;
 
       return Object.keys(cargoGeneratorData)
         .sort((v1, v2) => this.$t(`cargo.${v1}`).localeCompare(this.$t(`cargo.${v2}`)))
         .map((v) => ({
           name: v,
-          cargoList: cargoGeneratorData[v],
+          cargoList: cargoGeneratorData[v as keyof typeof generatorDataJSON.cargo],
         }));
     },
   },
@@ -196,7 +196,7 @@ export default defineComponent({
     generateStock(empty = false) {
       const generatedChosenStockList = this.chosenCargoTypes.reduce(
         (acc, type) => {
-          this.store.vehiclesData?.generator.cargo[type]
+          generatorDataJSON.cargo[type as keyof typeof generatorDataJSON.cargo]
             .filter((c) => !this.excludedCarTypes.includes(c.split(':')[0]))
             .forEach((c) => {
               const [type, cargoType] = c.split(':');
@@ -280,10 +280,9 @@ export default defineComponent({
 
       const bestStockList = bestGeneration.stockList;
 
-      this.groupStock(bestStockList);
-
       this.store.stockList = bestGeneration.stockList;
-      this.store.stockSectionMode = 'stock-list';
+      this.groupStock(bestStockList);
+      this.$router.push('/');
     },
 
     previewCar(type: string) {

src/components/tabs/StockListTab.vue

@@ -146,7 +146,7 @@
             <template #href>
               <a
                 target="_blank"
-                href="https://docs.google.com/spreadsheets/d/1KVa5vn2d8XGkXQFwbavVudwKqUQxbLOucHWs2VYqAUE"
+                href="https://docs.google.com/spreadsheets/d/1BvTU-U7huIaEheov22TrhTtROUM4MwVfdbq03GVAEM8"
               >
                 {{ $t('stocklist.acceptable-mass-docs') }}
               </a>

src/components/tabs/WikiListTab.vue

@@ -6,41 +6,48 @@
 
     <div class="tab_content">
       <div class="actions">
-        <label>
+        <div class="action action-input">
-          <span>{{ $t('wiki.labels.search-vehicle') }}</span>
+          <label for="search-vehicle">
+            {{ $t('wiki.labels.search-vehicle') }}
+            <button class="reset-btn" @click="resetSearchInput">
+              <img src="/images/icon-exit.svg" alt="reset vehicle input icon" />
+            </button>
+          </label>
           <input
             type="text"
+            id="search-vehicle"
+            name="search-vehicle"
             :placeholder="$t('wiki.labels.search-vehicle-placeholder')"
             v-model="searchedVehicleTypeName"
           />
-        </label>
+        </div>
 
-        <label>
+        <div class="action action-select">
-          <span>{{ $t('wiki.labels.vehicles') }}</span>
+          <label for="filter-type">{{ $t('wiki.labels.vehicles') }}</label>
           <select name="filter-type" id="filter-type" v-model="filterType">
             <option v-for="filter in filters" :key="filter" :value="filter">
               {{ $t(`wiki.filters.${filter}`) }}
             </option>
           </select>
-        </label>
+        </div>
 
-        <label>
+        <div class="action action-select">
-          <span>{{ $t('wiki.labels.sort-by') }}</span>
+          <label for="sorter-type">{{ $t('wiki.labels.sort-by') }}</label>
           <select name="sorter-type" id="sorter-type" v-model="sorterType">
             <option v-for="sorter in sorters" :key="sorter" :value="sorter">
               {{ $t(`wiki.sort-by.${sorter}`) }}
             </option>
           </select>
-        </label>
+        </div>
 
-        <label>
+        <div class="action action-select">
-          <span>{{ $t('wiki.labels.sort-direction') }}</span>
+          <label for="sorter-direction">{{ $t('wiki.labels.sort-direction') }}</label>
 
           <select name="sorter-direction" id="sorter-direction" v-model="sorterDirection">
             <option value="asc">{{ $t('wiki.sort-direction.asc') }}</option>
             <option value="desc">{{ $t('wiki.sort-direction.desc') }}</option>
           </select>
-        </label>
+        </div>
       </div>
 
       <ul class="vehicles" ref="vehicles">
@@ -79,6 +86,10 @@
           </span>
         </li>
       </ul>
+
+      <div class="no-vehicles-warning" v-if="computedVehicles.length == 0">
+        {{ $t('wiki.no-vehicles') }}
+      </div>
     </div>
   </section>
 </template>
@@ -87,19 +98,28 @@
 import { defineComponent } from 'vue';
 import { useStore } from '../../store';
 import stockPreviewMixin from '../../mixins/stockPreviewMixin';
-import { IVehicle } from '../../types';
+import { IVehicle } from '../../types/common.types';
 import { isTractionUnit } from '../../utils/vehicleUtils';
 import stockMixin from '../../mixins/stockMixin';
 import imageMixin from '../../mixins/imageMixin';
 
 const sorters = ['type', 'group', 'length', 'weight', 'maxSpeed'] as const;
-const filters = ['vehicles-all', 'vehicles-traction', 'vehicles-wagon'] as const;
+
+enum VehicleFilter {
+  AllVehicles = 'vehicles-all',
+  AllTractions = 'vehicles-tractions-all',
+  ElectricTraction = 'vehicles-tractions-electric',
+  DieselTraction = 'vehicles-tractions-diesel',
+  EmuTraction = 'vehicles-tractions-emu',
+  DmuTraction = 'vehicles-tractions-dmu',
+  AllWagons = 'vehicles-wagons-all',
+  PassengerWagons = 'vehicles-wagons-passenger',
+  FreightWagons = 'vehicles-wagons-freight',
+}
 
 type SorterType = (typeof sorters)[number];
 type SorterDirection = 'asc' | 'desc';
 
-type FilterType = (typeof filters)[number];
-
 export default defineComponent({
   mixins: [stockPreviewMixin, stockMixin, imageMixin],
 
@@ -109,14 +129,14 @@ export default defineComponent({
       observer: null as IntersectionObserver | null,
 
       sorters: sorters,
-      filters: filters,
+      filters: Object.values(VehicleFilter),
 
       searchedVehicleTypeName: '',
 
       sorterType: 'type' as SorterType,
       sorterDirection: 'asc' as SorterDirection,
 
-      filterType: 'vehicles-all' as FilterType,
+      filterType: VehicleFilter.AllVehicles,
 
       lastScrollTop: 0,
     };
@@ -148,23 +168,44 @@ export default defineComponent({
       this.previewVehicle(vehicle);
     },
 
+    resetSearchInput() {
+      this.searchedVehicleTypeName = '';
+    },
+
     filterVehicles(v: IVehicle) {
-      if (this.searchedVehicleTypeName)
+      if (
-        return v.type
+        this.searchedVehicleTypeName != '' &&
-          .toLocaleLowerCase()
+        !v.type.toLocaleLowerCase().includes(this.searchedVehicleTypeName.toLocaleLowerCase())
-          .includes(this.searchedVehicleTypeName.toLocaleLowerCase());
+      )
+        return false;
 
       switch (this.filterType) {
-        case 'vehicles-all':
+        case VehicleFilter.AllTractions:
-          return true;
-        case 'vehicles-traction':
           return isTractionUnit(v);
-        case 'vehicles-wagon':
+
+        case VehicleFilter.ElectricTraction:
+          return isTractionUnit(v) && v.group == 'loco-electric';
+
+        case VehicleFilter.DieselTraction:
+          return isTractionUnit(v) && v.group == 'loco-diesel';
+
+        case VehicleFilter.EmuTraction:
+          return isTractionUnit(v) && v.group == 'unit-electric';
+
+        case VehicleFilter.DmuTraction:
+          return isTractionUnit(v) && v.group == 'unit-diesel';
+
+        case VehicleFilter.AllWagons:
           return !isTractionUnit(v);
 
-        default:
+        case VehicleFilter.PassengerWagons:
-          return false;
+          return !isTractionUnit(v) && v.group == 'wagon-passenger';
+
+        case VehicleFilter.FreightWagons:
+          return !isTractionUnit(v) && v.group == 'wagon-freight';
       }
+
+      return true;
     },
 
     sortVehicles(v1: IVehicle, v2: IVehicle) {
@@ -180,21 +221,6 @@ export default defineComponent({
         case 'maxSpeed':
           return Math.sign(v1[this.sorterType] - v2[this.sorterType]) * direction;
 
-        // case 'cargoCount':
-        //   return (
-        //     Math.sign(
-        //       (!isTractionUnit(v1) ? v1.cargoTypes.length || -1 : -1) -
-        //         (!isTractionUnit(row2.vehicle) ? row2.vehicle.cargoTypes.length || -1 : -1)
-        //     ) * direction
-        //   );
-
-        // case 'coldStart':
-        //   return (
-        //     ((isTractionUnit(v1) && v1.coldStart ? 1 : -1) -
-        //       (isTractionUnit(row2.vehicle) && row2.vehicle.coldStart ? 1 : -1)) *
-        //     direction
-        //   );
-
         default:
           return v1.type.localeCompare(v2.type) * direction;
       }
@@ -220,16 +246,29 @@ export default defineComponent({
   gap: 0.5em;
 }
 
-.actions > label {
+.action {
   display: flex;
   flex-direction: column;
-  gap: 0.25em;
+  gap: 0.5em;
 
-  span {
+  label {
     color: #ccc;
+    position: relative;
   }
 }
 
+.action.action-input label {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.reset-btn {
+  display: flex;
+  background-color: #161c2e;
+  border-radius: 0.25em;
+}
+
 .vehicles {
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(320px, 1fr));
@@ -290,6 +329,12 @@ export default defineComponent({
   color: #ccc;
 }
 
+.no-vehicles-warning {
+  text-align: center;
+  padding: 1em;
+  background-color: #161c2e;
+}
+
 @media screen and (max-width: $breakpointSm) {
   .actions-panel {
     align-items: stretch;

src/components/utils/StockThumbnails.vue

@@ -1,39 +1,52 @@
 <template>
   <div class="stock-thumbnails" ref="thumbnailsRef">
-    <div
+    <ul>
-      class="thumbnail-item"
+      <li
-      v-for="(stock, stockIndex) in store.stockList"
+        class="thumbnail-item"
-      :key="stockIndex"
+        v-for="(stock, stockIndex) in store.stockList"
-      :data-selected="store.chosenStockListIndex == stockIndex"
+        :key="stockIndex"
-      :data-sponsor-only="
+        :data-selected="store.chosenStockListIndex == stockIndex"
-        stock.vehicleRef.sponsorOnlyTimestamp && stock.vehicleRef.sponsorOnlyTimestamp > Date.now()
+        :data-sponsor-only="
-      "
+          stock.vehicleRef.sponsorOnlyTimestamp &&
-      :data-team-only="stock.vehicleRef.teamOnly"
+          stock.vehicleRef.sponsorOnlyTimestamp > Date.now()
-      draggable="true"
+        "
-      @dragstart="onDragStart(stockIndex)"
+        :data-team-only="stock.vehicleRef.teamOnly"
-      @drop="onDrop($event, stockIndex)"
+        draggable="true"
-      @dragover="allowDrop"
+        @dragstart="onDragStart(stockIndex)"
-      @click="onListItemClick(stockIndex)"
+        @drop="onDrop($event, stockIndex)"
-    >
+        @dragover="allowDrop"
-      <b>
+        @click="onListItemClick(stockIndex)"
-        {{ stock.vehicleRef.type }}
+      >
-      </b>
+        <div class="stock-text">
+          <p>
+            {{ stock.vehicleRef.type.replace(/_/g, ' ') }}
+          </p>
+        </div>
 
-      <img
+        <span>
-        draggable="false"
+          <img
-        :src="`https://rj.td2.info.pl/dist/img/thumbnails/${stock.vehicleRef.type}.png`"
+            v-for="thumbnail in getVehicleThumbnails(stock.vehicleRef.type)"
-        :alt="stock.vehicleRef.type"
+            draggable="false"
-        :title="stock.vehicleRef.type"
+            style="min-width: 200px"
-        @error="stockImageError($event, stock)"
+            :src="`https://stacjownik.spythere.eu/static/thumbnails/${thumbnail.src}.png`"
-      />
+            :alt="stock.vehicleRef.type"
-    </div>
+            :title="stock.vehicleRef.type"
+            @load="($event) => (($event.target as HTMLImageElement).style.minWidth = 'auto')"
+            @error="
+              ($event) =>
+                (($event.target as HTMLImageElement).src = `/images/${thumbnail.fallbackSrc}.png`)
+            "
+            height="70"
+          />
+        </span>
+      </li>
+    </ul>
   </div>
 </template>
 
 <script setup lang="ts">
 import { Ref, computed, nextTick, ref, watch } from 'vue';
 import { useStore } from '../../store';
-import { IStock } from '../../types';
 
 const store = useStore();
 const emit = defineEmits(['listItemClick']);
@@ -45,10 +58,6 @@ const onListItemClick = (index: number) => {
   emit('listItemClick', index);
 };
 
-const stockImageError = (e: Event, stock: IStock) => {
-  (e.target as HTMLImageElement).src = `images/${stock.vehicleRef.group}-unknown.png`;
-};
-
 watch(
   computed(() => store.chosenStockListIndex),
   (index) => {
@@ -56,7 +65,7 @@ watch(
 
     nextTick(() => {
       (thumbnailsRef.value as HTMLElement)
-        .querySelector(`div:nth-child(${index + 1})`)
+        .querySelector(`li:nth-child(${index + 1})`)
         ?.scrollIntoView({
           block: 'nearest',
           inline: 'start',
@@ -74,7 +83,7 @@ const onDragStart = (vehicleIndex: number) => {
 const onDrop = (e: DragEvent, vehicleIndex: number) => {
   e.preventDefault();
 
-  let targetEl = thumbnailsRef.value.querySelector(`div:nth-child(${vehicleIndex + 1})`);
+  let targetEl = thumbnailsRef.value.querySelector(`li:nth-child(${vehicleIndex + 1})`);
 
   if (!targetEl && draggedIndex.value != -1) return;
 
@@ -88,31 +97,100 @@ const onDrop = (e: DragEvent, vehicleIndex: number) => {
 const allowDrop = (e: DragEvent) => {
   e.preventDefault();
 };
+
+const getVehicleThumbnails = (vehicleString: string) => {
+  const [vehicleName, vehicleCargo] = vehicleString.split(':');
+
+  const thumbnails: { src: string; fallbackSrc: string }[] = [];
+
+  // Generowanie członów EN57
+  if (vehicleName.startsWith('EN57')) {
+    thumbnails.push(
+      { src: vehicleName + 'ra', fallbackSrc: 'unknown_ezt-ra' },
+      { src: vehicleName + 's', fallbackSrc: 'unknown_ezt-s' },
+      { src: vehicleName + 'rb', fallbackSrc: 'unknown_ezt-rb' }
+    );
+  }
+
+  // Generowanie członów EN71
+  else if (vehicleName.startsWith('EN71')) {
+    thumbnails.push(
+      { src: vehicleName + 'ra', fallbackSrc: 'unknown_ezt-ra' },
+      { src: vehicleName + 'sa', fallbackSrc: 'unknown_ezt-sa' },
+      { src: vehicleName + 'sb', fallbackSrc: 'unknown_ezt-sb' },
+      { src: vehicleName + 'rb', fallbackSrc: 'unknown_ezt-rb' }
+    );
+  }
+
+  // Generowanie pojazdów i członów 2EN57
+  else if (vehicleString.startsWith('2EN57')) {
+    const [firstVehicleNumber, secondVehicleNumber] = vehicleString
+      .replace('2EN57-', '')
+      .split('+');
+
+    thumbnails.push(
+      { src: `EN57-${firstVehicleNumber}ra`, fallbackSrc: 'unknown_ezt-ra' },
+      { src: `EN57-${firstVehicleNumber}s`, fallbackSrc: 'unknown_ezt-s' },
+      { src: `EN57-${firstVehicleNumber}rb`, fallbackSrc: 'unknown_ezt-rb' },
+      { src: `EN57-${secondVehicleNumber}ra`, fallbackSrc: 'unknown_ezt-ra' },
+      { src: `EN57-${secondVehicleNumber}s`, fallbackSrc: 'unknown_ezt-s' },
+      { src: `EN57-${secondVehicleNumber}rb`, fallbackSrc: 'unknown_ezt-rb' }
+    );
+  }
+
+  // Generowanie członów Gor77
+  else if (vehicleString.startsWith('Gor77')) {
+    thumbnails.push(
+      { src: vehicleName + '-A', fallbackSrc: 'unknown_Gor77-A' },
+      { src: vehicleName + '-B', fallbackSrc: 'unknown_Gor77-B' },
+      { src: vehicleName + '-C', fallbackSrc: 'unknown_Gor77-C' },
+      { src: vehicleName + '-D', fallbackSrc: 'unknown_Gor77-D' }
+    );
+  }
+
+  // Generowanie członów ET41
+  else if (vehicleString.startsWith('ET41')) {
+    thumbnails.push(
+      { src: vehicleName + '-A', fallbackSrc: 'unknown_ET41-A' },
+      { src: vehicleName + '-B', fallbackSrc: 'unknown_ET41-B' }
+    );
+  }
+
+  // Generowanie pozostałych pojazdów
+  else {
+    let fallbackVehicleImage = 'unknown_cargo';
+
+    if (/^(EP|EU)/.test(vehicleName)) fallbackVehicleImage = 'unknown_train';
+    else if (/^(SM42)/.test(vehicleName)) fallbackVehicleImage = 'unknown_SM42';
+    else if (/(\d{3}a|(Bau|Gor)\d{2}|304C)_/.test(vehicleName))
+      fallbackVehicleImage = 'unknown_passenger';
+
+    thumbnails.push({ src: vehicleName, fallbackSrc: fallbackVehicleImage });
+  }
+
+  return thumbnails;
+};
 </script>
 
 <style lang="scss" scoped>
 @import '../../styles/global.scss';
 
 .stock-thumbnails {
-  display: flex;
   overflow: auto;
   background-color: #353a57;
-  min-height: 100px;
+  height: auto;
+}
+
+ul {
+  display: flex;
+  align-items: flex-end;
+  min-height: 110px;
 }
 
 .thumbnail-item {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-
-  flex-direction: column;
-  gap: 0.5em;
-
-  padding-top: 0.5em;
-
   cursor: pointer;
-  min-height: 100px;
   font-size: 0.85em;
+  text-align: center;
 
   user-select: none;
   -moz-user-select: none;
@@ -122,11 +200,6 @@ const allowDrop = (e: DragEvent) => {
     background-color: rebeccapurple;
   }
 
-  b {
-    color: #ccc;
-    margin: 0 1em;
-  }
-
   &[data-sponsor-only='true'] > b {
     color: $sponsorColor;
   }
@@ -136,7 +209,22 @@ const allowDrop = (e: DragEvent) => {
   }
 
   img {
-    max-height: 60px;
+    max-height: 70px;
+    width: auto;
+    height: auto;
   }
 }
+
+.stock-text {
+  font-weight: bold;
+  color: #ccc;
+  font-size: 0.9em;
+}
+
+.thumbnail-item > span {
+  display: flex;
+  justify-content: center;
+  align-items: flex-end;
+  cursor: crosshair;
+}
 </style>

src/constants/numberGeneratorData.json

@@ -43,19 +43,22 @@
     "PW": ["6", "000", "899"],
     "PX": ["6", "000", "899"],
 
-    "TC": ["0", "000", "899"],
+    "TM": ["4", "000", "899"],
+    "TN": ["3", "000", "899"],
+    "TK": ["3", "000", "899"],
+    "TD": ["2", "000", "899"],
     "TG": ["1", "000", "899"],
     "TR": ["1", "000", "899"],
-    "TD": ["2", "000", "899"],
+    "TC": ["0", "000", "899"],
-    "TK": ["3", "000", "899"],
-    "TN": ["3", "000", "899"],
-    "TM": ["4", "000", "899"],
     "TS": ["5", "000", "899"],
+    "TH": ["5", "000", "899"],
 
     "LT": ["5", "000", "899"],
     "LP": ["6", "000", "899"],
     "LS": ["9", "000", "899"],
+    "LZ": ["9", "000", "899"],
 
-    "ZN": ["9", "000", "899"]
+    "ZN": ["9", "000", "899"],
+    "ZU": ["9", "000", "899"]
   }
 }

src/constants/speedLimits.json

@@ -47,6 +47,26 @@
     "cargo": null,
     "none": 160
   },
+  "ET22": {
+    "passenger": {
+      "650000": 125
+    },
+    "cargo": {
+      "1200000": 100,
+      "3100000": 70
+    },
+    "none": 125
+  },
+  "201E": {
+    "passenger": {
+      "650000": 125
+    },
+    "cargo": {
+      "1200000": 100,
+      "3100000": 70
+    },
+    "none": 125
+  },
   "ET41": {
     "passenger": {
       "700000": 125

src/data/generatorData.json

@@ -0,0 +1,57 @@
+{
+  "cargo": {
+    "kontenery": ["627Z:all", "412Z:all"],
+    "chłodnia": ["202Lc:all"],
+    "drobnica": ["426S:all", "208Kf:all", "401Ka_PKP_Gags:all", "401Ka_PKPC_Gags:all"],
+    "węgiel": ["412W:coal_01", "413S:coal_413S", "429W:coal_01", "401Zb:coal_02"],
+    "ruda": ["412W:ore_01", "401Zl:ore_35", "429W:ore_01"],
+    "piasek": [
+      "412W:sand_01",
+      "412W:sand_02",
+      "413S:sand_413S",
+      "401Zl:sand_30",
+      "429W:sand_01",
+      "429W:sand_02",
+      "401Zb:sand_03",
+      "418Va:sand_418V",
+      "418Vb:sand_418V"
+    ],
+    "kreda": ["413S:chalk_413S"],
+    "kamień": [
+      "412W:stone_01",
+      "412W:stone_50",
+      "401Zl:stone_25",
+      "429W:stone_01",
+      "401Zb:stone_02",
+      "418Va:stone_418V",
+      "418Vb:stone_418V"
+    ],
+    "złom": ["412W:scrap_01", "412W:scrap_02", "429W:scrap_01", "429W:scrap_02"],
+    "paliwo": ["29R_CTLL:all", "29R_PKP:all", "445Rb:all"],
+    "melasa": ["29R_PLPOL:all"],
+    "żwir": ["441V"],
+    "koła": ["424Z:wheels_01"],
+    "drewno": ["424Z:woods_01", "424Z:woods_02"],
+    "szyny": ["424Z:rails_01"],
+    "kable": ["424Z:cables_01", "24Z:cables_Ks", "401Ze:cables_02"],
+    "kruszywo": ["59WS:all"],
+    "techniczne": ["209c", "304Ca", "102a_PKPE", "401Ka_PKP_XGa:all"],
+    "poczta": ["211K:all"],
+    "cement": [
+      "408S:cement_4",
+      "206S_CEMET:cement_3",
+      "206S_SPEED:cement_3",
+      "220S_CEMET:cement_3"
+    ],
+    "wapno": ["408S:lime_4", "206S_CEMET:lime_3", "206S_SPEED:lime_3", "220S_CEMET:lime_3"],
+    "soda": ["408S:soda_4", "206S_CEMET:soda_3", "206S_SPEED:soda_3", "220S_CEMET:soda_3"],
+    "pszenica": ["206Sh_PKP_Ugpps:wheat_3", "206Sh_PKPC_Ugpps:wheat_3"],
+    "kukurydza": ["206Sh_PKP_Ugpps:corn_3", "206Sh_PKPC_Ugpps:corn_3"],
+    "pasza": ["206Sh_PKP_Ugpps:forage_3", "206Sh_PKPC_Ugpps:forage_3"],
+    "pojazdy": ["426Z:tank_01", "426Z:truck_01", "426Z:vehicles_01"],
+    "karbid": ["421S:carbide_01"],
+    "wrażliwe": ["425S:all", "421S:carbide_01"],
+    "stal": ["401Ze:steel_01", "401Ze:steel_02"],
+    "gaz": ["WB117:all"]
+  }
+}

src/data/realCompositions.json

@@ -0,0 +1,272 @@
+{
+  "EIC 45_71006_71007 Sprewa": "EP08-006v2;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;113a_PKPIC_WRbd_01;158a_PKPIC_A9mnopuz_01",
+  "IC 15100_15101 Słowiniec": "EP08-006v2;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;158a_PKPIC_A9mnopuz_01;113a_PKPIC_WRbd_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 15103 Podlasiak": "EP07-1039;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
+  "IC 15106_15107 Brda": "EP08-006v2;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_01",
+  "IC 15155_15154 Lazur": "EP08-006v2;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02",
+  "IC 16150_16151 Śnieżka": "EP08-006v2;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;113a_PKPIC_WRbd_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02",
+  "IC 17100_17101 Zamenhof": "EP08-006v2;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01",
+  "IC 17102_17103 Zielonogórzanin": "EP08-006v2;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 17104_17105 Warta": "EP08-006v2;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 18100_18101 Gałczyński": "EP08-006v2;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
+  "IC 18102_18103 Podlasiak": "EP08-006v2;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 18104_18105 Rybak": "EP07-1043;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01",
+  "IC 18106_18107 Mewa": "EP08-006v2;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 18112_18113 Noteć": "EP08-006v2;111a_PKPIC_B9nopuvz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 18153_18152 Parsęta": "EP08-006v2;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 19100_19101 Łodzianin": "EP08-006v2;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_01",
+  "IC 20100_20101 Hetman": "EP08-006v2;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01",
+  "IC 21100_21101 Chełmianin": "EP08-006v2;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 22100_22101 Hetman": "EP08-006v2;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01",
+  "IC 23100_23101 Jagiełło": "EP07-544;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 24100_24101 Sztygar": "EP07-1009;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01",
+  "IC 24105 Morcinek": "EP07-1025;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_01",
+  "IC 25100_25101 Kochanowski": "EP08-006v2;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 26100_26101 Hetman": "EP08-006v2;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 26102_26103 Bolko": "EP07-1054;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 26104_26105 Morcinek": "EP07-1039;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 27100_27101 Lubuszanin": "EP08-006v2;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 31104_31105 Witos": "EP07-356;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
+  "IC 31106_31107 San": "EP07-1056;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 31110_31111 Marszałek Piłsudski": "EP08-006v2;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 32100_32101 Jagiełło": "EP07-1054;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B10ou_01",
+  "IC 35102_35103 Kochanowski": "EP08-006v2;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 35150_35151 Halny": "EP07-391;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01",
+  "IC 35202_35203 Przebojowy pociąg RMF FM": "EP08-006v2;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;113a_PKPIC_WRbd_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01",
+  "IC 36104_36105 Kossak": "EP07-1043;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;113a_PKPIC_WRbd_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 38100_38101 Górski": "EP08-006v2;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 38102_38103 Osterwa": "EP07-1025;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;113a_PKPIC_WRbd_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B10ou_01",
+  "IC 38104_38105 Mehoffer": "EP08-006v2;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 38172_38173 Przemyślanin": "EP08-006v2;110a_PKPIC_Bcdu_01;110a_PKPIC_Bcdu_02;110a_PKPIC_Bcdu_02;110a_PKPIC_Bcdu_02;158a_PKPIC_A9mnopuz_01;113a_PKPIC_WRbd_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 38192_38193 Podhalanin": "EP07-1043;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;110a_PKPIC_Bcdu_02;110a_PKPIC_Bcdu_02",
+  "IC 42100_42101 Sztygar": "EP07-544;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01",
+  "IC 42104 Morcinek": "EP07-1002;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 48150_48151 Gwarek": "EP07-384;111a_PKPIC_B9nopuvz_02;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02",
+  "IC 50104_50105 Niegocin": "EP07-391;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B10ou_01",
+  "IC 51100_51101 Słowiniec": "EP08-006v2;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;113a_PKPIC_WRbd_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 51102 Podlasiak": "EP07-335;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 51106_51107 Brda": "EP08-006v2;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01",
+  "IC 51155_51154 Lazur": "EP08-006v2;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01",
+  "IC 52100_52101 Kochanowski": "EP08-006v2;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01\n",
+  "IC 53102_53103 Kochanowski": "EP08-006v2;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 53150_53151 Halny": "EP07-1043;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01",
+  "IC 55104_55105 Niegocin": "EP07-1031;111a_PKPIC_B10ou_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
+  "IC 56102_56103 Mamry": "EP07-1043;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;112a_PKPIC_A9ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01",
+  "IC 56104_56105 Jeziorak": "EP07-1038;112a_PKPIC_A9ou_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;154a_PKPIC_B10mnouz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 57100_57101 Ukiel": "EP07-1048;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;154a_PKPIC_B10mnouz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 57102_57103 Drwęca": "EP07-1043;159a_PKPIC_B9mnopuz_01;154a_PKPIC_B10mnouz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02\n",
+  "IC 57104_57105 Bachus": "EP07-174;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 57106_57107 Lednica": "EP07-1025;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 57108_57109 Stoczniowiec": "EP07-335;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;154a_PKPIC_B10mnouz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 58100_58101 Albatros": "EP07-1039;154a_PKPIC_B10mnouz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
+  "IC 58102_58103 Żuławy": "EP07-1038;154a_PKPIC_B10mnouz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
+  "IC 58104_58105 Bryza": "EP07-1009;111a_PKPIC_B9nopuvz_02;154a_PKPIC_B10mnouz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01\n",
+  "IC 58106_58107 Gryf": "EP07-1009;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01",
+  "IC 58108_58109 Stańczyk": "EP07-444;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 60101 Mehoffer": "EP07-1025;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01",
+  "IC 60151 Śnieżka": "SM42-506;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
+  "IC 61150_61151 Śnieżka": "EP08-006v2;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;113a_PKPIC_WRbd_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 62100_62101 Hetman": "EP08-006;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01",
+  "IC 62102_62103 Bolko": "EP07-391;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 62104_62105 Morcinek": "EP07-1043;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 63104_63105 Kossak": "EU07-015;111a_PKPIC_B10ou_01;158a_PKPIC_A9mnopuz_01;113a_PKPIC_WRbd_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 65102_65103 Mamry": "EP07-1031;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 65104_65105 Jeziorak": "EP07-1043;159a_PKPIC_B9mnopuz_01;154a_PKPIC_B10mnouz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;158a_PKPIC_A9mnopuz_01",
+  "IC 66100 Mehoffer": "EP07-1025;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01",
+  "IC 66150 Śnieżka": "SM42-506;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
+  "IC 68100_68101 Bosman": "EP07-1002;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;113a_PKPIC_WRbd_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01",
+  "IC 68102_68103 Szkuner": "EP07-1056;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;113a_PKPIC_WRbd_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 68104_68105 Swarożyc": "EP07-1025;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 71100_71101 Zamenhof": "EP08-006v2;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01",
+  "IC 71102_71103 Zielonogórzanin": "EP08-006v2;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 71104_71105 Warta": "EP08-006v2;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01",
+  "IC 72100_72101 Lubuszanin": "EP08-006v2;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "IC 75100_75101 Ukiel": "EP07-1043;159a_PKPIC_B9mnopuz_01;154a_PKPIC_B10mnouz_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01",
+  "IC 75102_75103 Drwęca": "EP07-1025;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;154a_PKPIC_B10mnouz_01;111a_PKPIC_B10ou_01",
+  "IC 75104_75105 Bachus": "EP07-335;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 75106_75107 Lednica": "EP07-1031;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 75108_75109 Stoczniowiec": "EP07-1025;111a_PKPIC_B9nopuvz_02;154a_PKPIC_B10mnouz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01",
+  "IC 78101 Gałczyński": "SM42-506;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
+  "IC 78103 Lubuszanin": "SM42-506;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
+  "IC 78103 Mewa": "SM42-506;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 80150 Rowokół": "EP07-1038;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;113a_PKPIC_WRbd_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02",
+  "IC 81100_81101 Gałczyński": "EP08-006v2;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 81102_81103 Podlasiak": "EP08-006v2;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 81104_81105 Rybak": "EP07-480;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;154a_PKPIC_B10mnouz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 81106_81107 Mewa": "EP08-006v2;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 81112_81113 Noteć": "EP08-006v2;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
+  "IC 81152_81153 Parsęta": "EP08-006v2;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
+  "IC 83100_83101 Górski": "EP08-006v2;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 83102_83103 Osterwa": "EP07-444;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;113a_PKPIC_WRbd_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02",
+  "IC 83104_83105 Mehoffer": "EP08-006v2;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
+  "IC 83192_83193 Podhalanin": "EP07-1056;110a_PKPIC_Bcdu_01;110a_PKPIC_Bcdu_02;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01",
+  "IC 84150_84151 Gwarek": "EP07-1043;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 85100_85101 Albatros": "EP07-1038;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 85102_85103 Żuławy": "EP07-335;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;154a_PKPIC_B10mnouz_01",
+  "IC 85104_85105 Bryza": "EP07-480;159a_PKPIC_B9mnopuz_01;154a_PKPIC_B10mnouz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 85106_85107 Gryf": "EP07-444;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01",
+  "IC 85108_85109 Stańczyk": "EU07-077;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 86100_86101 Bosman": "EP07-544;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;113a_PKPIC_WRbd_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01",
+  "IC 86102_86103 Szkuner": "EP07-174;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;113a_PKPIC_WRbd_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 86104_86105 Swarożyc": "EP07-1056;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 87100 Gałczyński": "SM42-506;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 87102 Lubuszanin": "SM42-506;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01",
+  "IC 87172_87173 Przemyślanin": "EP07-1054;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02",
+  "IC 88151 Rowokół": "EP07-444;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;113a_PKPIC_WRbd_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "IC 91100_91101 Lodzianin": "EP08-006v2;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "TLK 10100_10101 Żubr": "EP07-1009;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01",
+  "TLK 10110_10111 Żubr": "EP07-355;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01",
+  "TLK 12110_12111 Nida": "EP07-444;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01",
+  "TLK 301_43004_43005 Galicja (PKPIC) R 301 Galicja (ČD) ": "EP07-480;112a_PKPIC_A9ou_01;Bau84_CD_B249_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01",
+  "TLK 310_24000_24001 Roztocze (PKPIC) R 310 Roztocze (ČD)": "EP07-480;Bau84_CD_B249_01;Bau84_CD_B249_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01",
+  "TLK 31100_31101 Malinowski": "EP07-1025;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;112a_PKPIC_A9ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 31102_31103 Hańcza": "EP07-480;612a_PKPIC_BD4osuv_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B9nopuvz_02;612a_PKPIC_BD4osuv_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01",
+  "TLK 31106_31107 San": "EP07-444;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 31110_31111 Wit Stwosz": "EP08-006;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;158a_PKPIC_A9mnopuz_01;111a_PKPIC_B10ou_01",
+  "TLK 31150_31151 Karłowicz": "EP07-391;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01",
+  "TLK 311_42000_42001 Roztocze (PKPIC) R 311 Roztocze (ČD) ": "EP07-480;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B249_01;Bau84_CD_B249_01",
+  "TLK 33100_33101 Malinowski": "EU07-324;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B9nopuvz_02",
+  "TLK 33104_33105 Łukasiewicz": "EP07-544;112a_PKPIC_A9ou_01;Bau84_CD_B249_01;Bau84_CD_B249_01;Bau84_CD_B249_01",
+  "TLK 35100_35101 Małopolska": "EP08-006v2;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01",
+  "TLK 35106_35107 Artus": "EP07-444;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01\n",
+  "TLK 35106_35107 ArtusV2": "EP08-006v2;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01\n",
+  "TLK 35170_35171 Karpaty": "EP08-006v2;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 35190_35191 Korsarz": "SM42-506;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;110a_PKPIC_Bcdu_02",
+  "TLK 36102_36103 Sudety": "SM42-506;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B9nopuvz_02",
+  "TLK 36170_36171 Pogórze": "EP07-1025;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;110a_PKPIC_Bcdu_02\n",
+  "TLK 37100_37101 Pułaski": "EU07-334;Bau84_CD_B249_01;Bau84_CD_B10nou_01;Bau84_CD_B249_01",
+  "TLK 37102_37103 Wybicki": "EP07-444;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01",
+  "TLK 37170_37171 Pogórze": "EP07-544;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;110a_PKPIC_Bcdu_02;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02",
+  "TLK 38106_38107 Zefir": "EU07-334;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 38154_38155 Lubomirski": "EP08-006;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01",
+  "TLK 38170_38171 Ustronie": "EP07-444;110a_PKPIC_Bcdu_01;110a_PKPIC_Bcdu_02;111a_PKPIC_B9nopuvz_02;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 38190_38191 Bursztyn": "EP07-1031;110a_PKPIC_Bcdu_02;112a_PKPIC_A9ou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B249_01;110a_PKPIC_Bcdu_02",
+  "TLK 400_84070_84071 Wolin (PKPIC) R 400 Wolin (ČD)": "EU07-334;110a_PKPIC_Bcdu_02;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;612a_PKPIC_BD4osuv_01;Bau84_CD_B249_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01",
+  "TLK 40160_40161 Pirat": "EP07-544;612a_PKPIC_BD4osuv_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;110a_PKPIC_Bcdu_02",
+  "TLK 401_48070_48071 Wolin (PKPIC) R 401 Wolin (ČD) ": "EP07-544;Bau84_CD_B249_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;612a_PKPIC_BD4osuv_01;110a_PKPIC_Bcdu_02",
+  "TLK 402_54070_54071 Wydmy (PKPIC) R 402 Wydmy (ČD)": "EP07-1009;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B249_01;612a_PKPIC_BD4osuv_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;110a_PKPIC_Bcdu_02",
+  "TLK 403_45070_45071 Wydmy (PKPIC) R 403 Wydmy (ČD) ": "EP07-1009;110a_PKPIC_Bcdu_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;612a_PKPIC_BD4osuv_01;Bau84_CD_B249_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01",
+  "TLK 405_48072_48073 Pirat (PKPIC) R 405 Pirat (ČD) ": "EP07-391;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B249_01;612a_PKPIC_BD4osuv_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B249_01;Bau84_CD_B10nou_01;110a_PKPIC_Bcdu_02",
+  "TLK 41100_41101 Chemik": "EP07-355;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01\n",
+  "TLK 41102_41103 Wysocki": "EP07-444;111a_PKPIC_B9nopuvz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_01",
+  "TLK 41104_41105 Kmicic": "EP07-1056;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01",
+  "TLK 44160_44161 Pirat": "EU07-334;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;612a_PKPIC_BD4osuv_01;110a_PKPIC_Bcdu_02",
+  "TLK 45100_45101 Doker ": "EP07-1056;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 45150_45151 Halny ": "EP07-1054;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 45170_45171 Rozewie ": "EP07-391;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;110a_PKPIC_Bcdu_02;110a_PKPIC_Bcdu_02",
+  "TLK 45190_45191 Rozewie ": "EP07-544;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;110a_PKPIC_Bcdu_02",
+  "TLK 47100_47101 Spodek ": "EP07-1038;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01",
+  "TLK 50150_50151 Gardno": "SM42-506;110a_PKPIC_Bcdu_02;Bau84_CD_B249_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01",
+  "TLK 50160_50161 Korsarz": "EP07-1038;110a_PKPIC_Bcdu_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 50170_50171 Mierzeja": "SM42-506;110a_PKPIC_Bcdu_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01",
+  "TLK 51104_51105 Biebrza": "EP07-1025;111a_PKPIC_Bnouz_01;111a_PKPIC_B9nopuvz_02;112a_PKPIC_A9ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_Bnouz_01",
+  "TLK 51112_51113 Kociewie": "EP07-1002;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01",
+  "TLK 51150_51151 Delfin": "EP07-335;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01\n",
+  "TLK 51152_51153 Wybrzeże": "EP07-444;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 53100_53101 Małopolska": "EU07-545;EU07-015;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;Bau84_PKPIC_B10nou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 53104_53105 Lubomirski": "EP08-006v2;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 53106_53107 Artus V2": "EP07-335;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01",
+  "TLK 53170_53171 Karpaty": "EP08-006v2;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 53190_53191 Korsarz": "EP07-1054;110a_PKPIC_Bcdu_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;110a_PKPIC_Bcdu_02",
+  "TLK 54100_54101 Doker": "EP07-1038;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 54150_54151 Halny": "EP07-174;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 54170_54171 Rozewie": "EP07-1025;110a_PKPIC_Bcdu_02;110a_PKPIC_Bcdu_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02",
+  "TLK 55154 Wydmy": "EU07-545;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;110a_PKPIC_Bcdu_02",
+  "TLK 55160_55161 Korsarz": "EU07-545;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;110a_PKPIC_Bcdu_02",
+  "TLK 55162_55163 Rozewie": "SM42-506;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;612a_PKPIC_BD4osuv_01",
+  "TLK 55170_55171 Mierzeja": "SM42-506;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;110a_PKPIC_Bcdu_02",
+  "TLK 56100_56101 Kormoran": "EP07-355;EP07-1038;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01",
+  "TLK 58104_58105 Bryza": "EP07-1038;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02",
+  "TLK 58110_58111 Bory Tucholskie": "SM42-506;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01",
+  "TLK 64160_64161 Wolin": "EU07-015;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B249_01;612a_PKPIC_BD4osuv_01;110a_PKPIC_Bcdu_02",
+  "TLK 65100_65101 Kormoran": "EP07-444;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02",
+  "TLK 66166_66167 Rozewie": "EP07-391;612a_PKPIC_BD4osuv_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B249_01;110a_PKPIC_Bcdu_02",
+  "TLK 71106_71107 Konopnicka": "EP08-006v2;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B9nopuvz_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 73100_73101 Pułaski": "EP07-1054;Bau84_CD_B249_01;Bau84_CD_B249_01;Bau84_CD_B249_01",
+  "TLK 73102_73103 Wybicki V2": "EP07-1056;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 73102_73103 Wybicki": "EP07-1025;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;Bau84_PKPIC_B10nou_01",
+  "TLK 73170_73171 Pogórze": "EP07-444;110a_PKPIC_Bcdu_02;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02",
+  "TLK 74100_74101 Spodek": "EP07-544;Bau84_CD_B249_01;Bau84_CD_B249_01;Bau84_CD_B249_01",
+  "TLK 76106_76107 Konopnicka": "SM42-506;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 81114_81115 Pobrzeże": "EP08-006;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B9nopuvz_02;Bau84_PKPIC_B10nou_01;111a_PKPIC_B10ou_01",
+  "TLK 81150_81151 Słupia": "EU07-015;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 81170_81171 Uznam": "EP07-480;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;110a_PKPIC_Bcdu_02;110a_PKPIC_Bcdu_02",
+  "TLK 82100_82101 Staszic": "EP08-006v2;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 82102_82103 Wyczółkowski": "EP07-391;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 82104_82105 Zamoyski": "EP07-480;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 82170_82171 Mierzeja": "EP07-1009;110a_PKPIC_Bcdu_02;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;110a_PKPIC_Bcdu_02",
+  "TLK 83100_83101 Górski": "EP08-006v2;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;158a_PKPIC_A9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01;159a_PKPIC_B9mnopuz_01",
+  "TLK 83106_83107 Zefir": "EP07-1054;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 83154_83155 Lubomirski": "EP08-006;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;159a_PKPIC_B9mnopuz_01;111a_PKPIC_B10ou_01;Bau84_PKPIC_B10nou_01;Bau84_PKPIC_B10nou_01",
+  "TLK 83170_83171 Ustronie V2": "EP07-391;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;159a_PKPIC_B9mnopuz_01;110a_PKPIC_Bcdu_02;110a_PKPIC_Bcdu_02;110a_PKPIC_Bcdu_02",
+  "TLK 83190_83191 Bursztyn": "EP07-1031;110a_PKPIC_Bcdu_02;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;Bau84_CD_B10nou_01;112a_PKPIC_A9ou_01;110a_PKPIC_Bcdu_02",
+  "TLK 85104_85105 Bryza": "EP07-1038;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01",
+  "TLK 86116_86117 Jamno": "EP07-1025;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01",
+  "TLK 88160_88161 Ustronie": "EU07-015;110a_PKPIC_Bcdu_02;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01",
+  "TLK 91130_91131 Zosia": "EP07-544;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "TLK 91132_91133 Korczak": "EP07-1002;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B9nopuvz_02;159a_PKPIC_B9mnopuz_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;112a_PKPIC_A9ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01;111a_PKPIC_B10ou_01",
+  "iR 11121 Żubr": "EN57-1953",
+  "iR 11130 Żubr": "EN57-1953",
+  "iR 12121 Bystrzyca": "EN71-028",
+  "iR 12125 Cisy": "EN71-028",
+  "iR 13126 Jan Matejko": "EP07-370;111a_PKP_Bdnu_02;111a_PKP_Bdnu_02;111a_PKP_Bdnu_02;111a_PKP_Bdnu_02;111a_PKP_Bdnu_02;111a_PKP_Bdnu_02",
+  "iR 31130 Semafor": "EN57-1953",
+  "iR 36120 Galicja V2": "EN57-1914",
+  "iR 36120 Galicja": "EN71-010",
+  "iR 36122 Łużyce": "EN57-1747",
+  "iR 40110 Torunianin": "EN71-028",
+  "iR 43127_6 Giewont": "EN57-1542",
+  "iR 43421 Orlik": "EN57-1542",
+  "iR 46121 Spodek": "EN57-1542",
+  "iR 46123 Ostrów Tumski": "EN57-1542",
+  "iR 46125 Oleńka": "EN57-1542",
+  "iR 46140 Szyndzielnia": "EN57-1542",
+  "iR 46142 Szyndzielnia": "EN57-1542",
+  "iR 48102 Pirania": "EP07-338;111a_PRREG_B10_01;112a_PKP_A9nou_01;111a_PRREG_B10_01;112a_PKP_A9nou_01",
+  "iR 51110 Flisak": "EP07-338;111a_PKPIC_B9ouv_01;111a_PKP_Bdnu_02;111a_PKP_Bdnu_02;111a_PRREG_B10_01",
+  "iR 51204 Szczeliniec": "EP07-135;111a_PRREG_B10_01;111a_PRREG_B10_01",
+  "iR 56110 Sokoliki": "EP07-424;111a_PRREG_B10_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_A9ou_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_A9ou_01",
+  "iR 57110 Mamry": "EN57-1542",
+  "iR 57112 Drwęca": "EN57-1542",
+  "iR 57112 Niegocin": "SM42-329;Gor89_PKP_B16mnopux_04;Gor89_PKP_B16mnopux_04;Gor89_PKP_B16mnopux_04",
+  "iR 57120 Lednica": "EN57-1542",
+  "iR 61122 Prosna": "EN57-1542",
+  "iR 61126 Piast": "EP07-338;111a_PKPIC_B9ouv_01;120a_PRREG_B51p_02;120a_PRREG_B51p_02;111a_PRREG_B10_01",
+  "iR 61128 Rudawy": "EP07-242;111a_PRREG_A9ou_01;111a_PRREG_A9ou_01;111a_PKPIC_B9ouv_01;111a_PRREG_B10_01;111a_PRREG_B10_01;111a_PKP_Bnouz_01",
+  "iR 62120 Łysica": "EN57-1747",
+  "iR 63120 Łużyce": "EN57-1542",
+  "iR 64102 Szyndzielnia": "EN57-1542",
+  "iR 64122 Oleńka": "EN57-1542",
+  "iR 64124 Lompa": "EN57-1953",
+  "iR 64126 Spodek": "EN57-1542",
+  "iR 65114 Mamry": "EP07-1008;111a_PRREG_B10_01;112a_PKP_A9nou_01;111a_PKPIC_B9ouv_01;111a_PRREG_B10_01;111a_PRREG_B10_01",
+  "iR 70111 Rusałka": "EN57-1542",
+  "iR 71110 Wielkopolska": "EN57-1747",
+  "iR 71120 Ner": "EU07-475;111a_PKPIC_B9ouv_01;111a_PRREG_B10_01;111a_PRREG_B10_01;Gor89_PKP_B16mnopux_05",
+  "iR 72112 Koziołek": "EN57-1542",
+  "iR 75110 Drwęca": "EN57-1542",
+  "iR 75112 Niegocin": "EU07-222;Gor89_PKP_B16mnopux_05;Gor89_PKP_B16mnopux_05;Gor89_PKP_B16mnopux_05",
+  "iR 75116 Lednica": "EN57-1542",
+  "iR 77111 Rusałka": "EN57-1542",
+  "iR 78111 Delfin": "EN57-1542",
+  "iR 78113 Merkury": "EU07-368;Gor89_PKP_B16mnopux_05;Gor89_PKP_B16mnopux_05;Gor89_PKP_B16mnopux_05",
+  "iR 78115 Wały Chrobrego": "EN57-1542",
+  "iR 78117 Wilda": "EU07-475;Gor89_PKP_B16mnopux_05;Gor89_PKP_B16mnopux_05",
+  "iR 78510 Wolin": "EN57-1747",
+  "iR 81122 Portowiec": "EU07-222;111a_PKPIC_B9ouv_01;111a_Grafitti_1;111a_PRREG_B10_01;111a_PRREG_B10_01;111a_PRREG_A9ouy_01;111a_PKP_Brdu_01;111a_PKP_Brdu_01",
+  "iR 81522 Bosman": "EU07-222;111a_PKPIC_B9ouv_01;111a_PKPIC_B9ouv_01;111a_PRREG_B10_01;111a_PKP_Bdnu_02",
+  "iR 84522 Pirania": "EU07-222;120a_PRREG_B51p_02;111a_PRREG_B10_01;111a_PRREG_A9ou_01;111a_PKPIC_B9ouv_01",
+  "iR 87110 Merkury": "EU07-368;111a_PKPIC_B9ouv_01;111a_PRREG_B10_01;111a_PKPIC_B9ouv_01;111a_PKPIC_B9ouv_01",
+  "iR 87112 Wały Chrobrego": "EN57-1542",
+  "iR 87114 Delfin": "EN57-1542",
+  "iR 87116 Wilda": "SM42-302;Gor89_PKP_B16mnopux_01;Gor89_PKP_B16mnopux_01",
+  "iR 87512 Wolin": "2EN57-1542+1747",
+  "RE 14120 Chemik": "EN57-1747",
+  "RE 18122 Mewa": "EU07-222;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_02;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01;112a_PKP_Adu_01;112a_PKP_Adu_01;112a_PKP_Adu_01",
+  "RE 26122 Bolko": "EU07-222;111a_PRREG_A9ou_02;112a_PKP_A9nou_01;111a_PRREG_A9ou_01;111a_PRREG_B10_01",
+  "RE 27120 Warta": "EU06-18;111a_PRREG_A9ou_02;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_02",
+  "RE 41120 Chemik": "EU07-222;111a_PKPIC_B9ouv_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_02",
+  "RE 62122 Bolko": "EP07-1055;Gor89_PKP_B16mnopux_04;111a_PRREG_A9ou_02;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01",
+  "RE 72110 Warta": "EU07-222;111a_PRREG_A9ou_02;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_02",
+  "RE 81120 Mewa": "EU07-222;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_02;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01;111a_PRREG_Bbnopuvz_01"
+}

src/locales/en.json

@@ -41,10 +41,10 @@
     "construction": "Construction type:"
   },
   "topbar": {
-    "stock-list": "STOCK",
+    "stock": "STOCK",
-    "wiki-list": "VEHICLES",
+    "wiki": "VEHICLES",
-    "number-generator": "NUMBER GEN.",
+    "numgen": "NUMBER GEN.",
-    "stock-generator": "STOCK GEN."
+    "stockgen": "STOCK GEN."
   },
   "stocklist": {
     "title": "STOCK EDITOR",
@@ -130,38 +130,40 @@
       "EN": "EN - domestic night express",
 
       "MP": "MP - intervoivodeship bullet",
-      "RP": "RP - voivodeship bullet",
       "MO": "MO - intervoivodeship regio",
-      "RO": "RO - voivodeship regio",
-
       "MM": "MM - international bullet",
-      "MH": "MH - intervoivodeship bullet (night / hotel)",
+      "MH": "MH - intervoivodeship night bullet",
+
+      "RP": "RP - voivodeship bullet",
       "RM": "RM - international voivodeship regio",
+      "RO": "RO - voivodeship regio",
       "RA": "RA - voivodeship regio (urban)",
 
       "PW": "PW - empty passenger",
       "PX": "PX - empty passenger test drive",
 
       "TC": "TC - international freight (intermodal)",
-      "TG": "TG - international freight (cargo)",
+      "TG": "TG - international freight (organized cargo)",
-      "TR": "TR - international freight (no cargo)",
+      "TR": "TR - international freight (unorganized cargo)",
       "TD": "TD - domestic freight (intermodal)",
-      "TM": "TM - domestic freight (cargo)",
+      "TM": "TM - domestic freight (organized cargo)",
-      "TN": "TN - domestic freight (no cargo)",
+      "TN": "TN - domestic freight (unorganized cargo)",
-      "TK": "TK - freight (stations & sidings)",
+      "TK": "TK - freight (for stations & sidings)",
       "TS": "TS - empty freight test drive",
+      "TH": "TH - locomotive rolling stock (over 3 vehicles)",
 
-      "LT": "LT - locomotive only",
+      "LT": "LT - freight locomotive only",
-      "LT-new": "LT - freight locomotive only",
-
       "LP": "LP - passenger locomotive only",
-      "LS": "LS - shunting locomotive",
+      "LS": "LS - shunting locomotive only",
+      "LZ": "LS - shunting locomotive only",
 
-      "ZN": "ZN - inspection / diagnostic"
+      "ZN": "ZN - inspection / diagnostic type",
+      "ZU": "ZU - other maintenance type"
     }
   },
   "wiki": {
     "title": "LIST OF AVAILABLE VEHICLES",
+    "no-vehicles": "No vehicles to show with the selected filters!",
     "labels": {
       "vehicles": "Vehicles",
       "sort-by": "Sort by",
@@ -171,8 +173,14 @@
     },
     "filters": {
       "vehicles-all": "all",
-      "vehicles-traction": "traction units",
+      "vehicles-tractions-all": "traction units - all",
-      "vehicles-wagon": "wagons"
+      "vehicles-tractions-electric": "electric locomotives",
+      "vehicles-tractions-diesel": "diesel locomotives",
+      "vehicles-tractions-emu": "electric units",
+      "vehicles-tractions-dmu": "diesel units",
+      "vehicles-wagons-all": "wagons - all",
+      "vehicles-wagons-passenger": "wagons - passenger",
+      "vehicles-wagons-freight": "wagons - freight"
     },
     "sort-by": {
       "type": "name",
@@ -199,5 +207,110 @@
     "search-name": "Search by name",
     "search-stock": "Search by vehicles",
     "action-reset": "RESET"
+  },
+  "cargo": {
+    "kontenery": "containers",
+    "chłodnia": "refrigerator",
+    "drobnica": "loose cargo",
+    "węgiel": "coal",
+    "ruda": "ore",
+    "piasek": "sand",
+    "kreda": "chalk",
+    "kamień": "stone",
+    "złom": "scrap",
+    "paliwo": "fuel",
+    "melasa": "molasses",
+    "żwir": "gravel",
+    "koła": "wheels",
+    "drewno": "wood",
+    "szyny": "rails",
+    "kable": "cables",
+    "kruszywo": "aggregate",
+    "techniczne": "technical",
+    "poczta": "mail",
+    "cement": "concrete",
+    "wapno": "lime",
+    "soda": "soda",
+    "pszenica": "wheat",
+    "kukurydza": "corn",
+    "pasza": "fodder",
+    "karbid": "carbide",
+    "pojazdy": "vehicles",
+    "wrażliwe": "sensitive",
+    "stal": "steel",
+    "gaz": "gas"
+  },
+  "usage": {
+    "Gor89": "passenger carriage",
+    "Gor77": "passenger carriage",
+    "Bau84": "passenger carriage",
+    "Bau84_CD": "passenger carriage",
+    "612a": "passenger carriage",
+    "504a": "passenger carriage",
+    "304c": "passenger carriage",
+    "159a": "passenger carriage",
+    "158a": "passenger carriage",
+    "154a": "passenger carriage",
+    "120a_PRREG": "passenger carriage",
+    "113a": "passenger carriage",
+    "113a_1": "passenger carriage",
+    "112a": "passenger carriage",
+    "112a_1": "passenger carriage",
+    "111a_PKP": "passenger carriage",
+    "111a_PKPIC": "passenger carriage",
+    "111a_PRREG": "passenger carriage",
+    "111a_Grafitti": "passenger carriage",
+    "110a": "passenger carriage",
+    "110a_PKP": "passenger carriage",
+    "110a_PKPIC": "passenger carriage",
+    "101a": "passenger carriage",
+    "102a": "passenger carriage",
+    "102A": "technical car",
+    "24Z": "copper wiring reels",
+    "202Lc": "refrigerator car",
+    "206S_CEMET": "cement, lime, soda",
+    "206S_SPEED": "cement, lime, soda",
+    "206Sh_PKP": "wheat, corn, fodder",
+    "206Sh_PKPC": "wheat, corn, fodder",
+    "220S_CEMET": "cement, lime, soda",
+    "211K": "express parcel car",
+    "220S": "cement, lime, soda",
+    "59WS": "loose cargo, limestone, mine waste",
+    "208Kf": "loose cargo, LCL",
+    "209c": "technical car",
+    "29R": "liquid paraffin products",
+    "29R_PLPOL": "molasses",
+    "304Ca": "special vehicle",
+    "401Ka": "loose cargo, LCL",
+    "401Ka_XGa": "utility car",
+    "401Zb_PKESA": "coal, stone, sand",
+    "401Zb_PKPC": "coal, stone, sand",
+    "401Ze_KLP": "concrete panels, cable reels, steel",
+    "401Ze_PNUIK": "concrete panels, cable reels, steel",
+    "401Ze_PKESA": "concrete panels, cable reels, steel",
+    "401Zl": "heavy loose cargo",
+    "408S": "cement, lime, fly ash, slag",
+    "412W": "loose cargo, coal",
+    "412Z": "containers",
+    "413S": "coal, chalk, sand",
+    "421S": "carbide, weather-sensitive loads",
+    "424Z": "vehicles, logs, rough timber",
+    "425S": "weather-sensitive loads",
+    "426Z": "solid cargo, vehicles",
+    "426S": "loose cargo",
+    "429W": "weatherproof cargo (coal, ore)",
+    "441V": "hard coal, gravel",
+    "627Z": "containers",
+    "WB117": "gas, gas mixtures",
+    "445Rb": "liquid paraffin products",
+    "418Va_AWT": "loose cargo (sand, stone)",
+    "418Va_BENET": "loose cargo (sand, stone)",
+    "418Va_TSS": "loose cargo (sand, stone)",
+    "418Vb_DB": "loose cargo (sand, stone)",
+    "418Vb_DOLWR": "loose cargo (sand, stone)",
+    "418Vb_PKPC": "loose cargo (sand, stone)",
+    "418Vb_WIEBE": "loose cargo (sand, stone)",
+    "418Vb_ZOS": "loose cargo (sand, stone)",
+    "418Vb_ZUE": "loose cargo (sand, stone)"
   }
 }

src/locales/pl.json

@@ -41,10 +41,10 @@
     "construction": "Typ konstrukcji:"
   },
   "topbar": {
-    "stock-list": "SKŁAD",
+    "stock": "SKŁAD",
-    "wiki-list": "POJAZDY",
+    "wiki": "POJAZDY",
-    "number-generator": "GNR NUMERU",
+    "numgen": "GNR NUMERU",
-    "stock-generator": "GNR SKŁADU"
+    "stockgen": "GNR SKŁADU"
   },
   "stocklist": {
     "title": "EDYTOR SKŁADU",
@@ -137,7 +137,7 @@
       "MM": "MM - międzynar. pośpieszny",
       "MH": "MH - międzywoj. pośpieszny hotelowy",
       "RM": "RM - woj. osobowy międzynarodowy",
-      "RA": "RA - woj. osobowy algomeracyjny",
+      "RA": "RA - woj. osobowy aglomeracyjny",
 
       "PW": "PW - pasażerski próżny - służbowy",
       "PX": "PX - pasażerski próżny próbny",
@@ -150,18 +150,20 @@
       "TN": "TN - towarowy krajowy niemasowy",
       "TK": "TK - towarowy (stacje i bocznice)",
       "TS": "TS - towarowy próżny próbny",
+      "TH": "TH - skład lokomotyw (powyżej 3 pojazdów)",
 
-      "LT": "LT - lokomotywa luzem",
+      "LT": "LT - lokomotywa towarowa luzem",
-      "LT-new": "LT - lokomotywa towarowa luzem",
-
       "LP": "LP - lokomotywa pasażerska luzem",
-      "LS": "LS - lokomotywa manewrowa",
+      "LS": "LS - lokomotywa manewrowa luzem",
+      "LZ": "LZ - lokomotywa dla poc. utrzymaniowo-naprawczych",
 
-      "ZN": "ZN - inspekcyjny / diagnostyczny"
+      "ZN": "ZN - inspekcyjny / diagnostyczny",
+      "ZU": "ZU - inny utrzymaniowy"
     }
   },
   "wiki": {
     "title": "LISTA DOSTĘPNYCH POJAZDÓW",
+    "no-vehicles": "Brak pojazdów do pokazania przy obecnych filtrach!",
     "labels": {
       "vehicles": "Pojazdy",
       "sort-by": "Sortuj wg",
@@ -171,8 +173,14 @@
     },
     "filters": {
       "vehicles-all": "wszystkie",
-      "vehicles-traction": "trakcyjne",
+      "vehicles-tractions-all": "trakcyjne - wszystkie",
-      "vehicles-wagon": "wagony"
+      "vehicles-tractions-electric": "elektrowozy",
+      "vehicles-tractions-diesel": "spalinowozy",
+      "vehicles-tractions-emu": "EZT",
+      "vehicles-tractions-dmu": "SZT",
+      "vehicles-wagons-all": "wagony - wszystkie",
+      "vehicles-wagons-passenger": "wagony pasażerskie",
+      "vehicles-wagons-freight": "wagony towarowe"
     },
     "sort-by": {
       "type": "nazwa",
@@ -199,5 +207,109 @@
     "search-name": "Szukaj po nazwie",
     "search-stock": "Szukaj po pojazdach",
     "action-reset": "RESETUJ"
+  },
+  "cargo": {
+    "kontenery": "kontenery",
+    "chłodnia": "chłodnia",
+    "drobnica": "drobnica",
+    "węgiel": "węgiel",
+    "ruda": "ruda",
+    "piasek": "piasek",
+    "kreda": "kreda",
+    "kamień": "kamień",
+    "złom": "złom",
+    "paliwo": "paliwo",
+    "melasa": "melasa",
+    "żwir": "żwir",
+    "koła": "koła",
+    "drewno": "drewno",
+    "szyny": "szyny",
+    "kable": "kable",
+    "kruszywo": "kruszywo",
+    "techniczne": "techniczne",
+    "poczta": "poczta",
+    "cement": "cement",
+    "wapno": "wapno",
+    "soda": "soda",
+    "pszenica": "pszenica",
+    "kukurydza": "kukurydza",
+    "pasza": "pasza",
+    "karbid": "karbid",
+    "pojazdy": "pojazdy",
+    "wrażliwe": "wrażliwe",
+    "stal": "stal",
+    "gaz": "gaz"
+  },
+  "usage": {
+    "Gor89": "wagon pasażerski",
+    "Gor77": "wagon pasażerski",
+    "Bau84": "wagon pasażerski",
+    "Bau84_CD": "wagon pasażerski",
+    "612a": "wagon pasażerski",
+    "504a": "wagon pasażerski",
+    "304c": "wagon pasażerski",
+    "159a": "wagon pasażerski",
+    "158a": "wagon pasażerski",
+    "154a": "wagon pasażerski",
+    "120a_PRREG": "wagon pasażerski",
+    "113a": "wagon pasażerski",
+    "113a_1": "wagon pasażerski",
+    "112a": "wagon pasażerski",
+    "112a_1": "wagon pasażerski",
+    "111a_PKP": "wagon pasażerski",
+    "111a_PKPIC": "wagon pasażerski",
+    "111a_PRREG": "wagon pasażerski",
+    "111a_Grafitti": "wagon pasażerski",
+    "110a": "wagon pasażerski",
+    "110a_PKP": "wagon pasażerski",
+    "110a_PKPIC": "wagon pasażerski",
+    "101a": "wagon pasażerski",
+    "102a": "wagon pasażerski",
+    "102A": "wagon techniczny (sieciowy)",
+    "24Z": "bębny z drutami miedzianymi",
+    "202Lc": "wagon chłodnia",
+    "206S_CEMET": "cement, wapno, soda",
+    "206S_SPEED": "cement, wapno, soda",
+    "206Sh_PKP": "pszenica, kukurydza, pasza",
+    "206Sh_PKPC": "pszenica, kukurydza, pasza",
+    "220S_CEMET": "cement, wapno, soda",
+    "211K": "wagon do przesyłek ekspresowych",
+    "59WS": "kruszywo, kamień wapienny, odpady kopalniane",
+    "208Kf": "drobnica, ładunki sypkie, ładunki sztukowe",
+    "209c": "wagon techniczny",
+    "29R": "produkty naftowe",
+    "29R_PLPOL": "melasa",
+    "304Ca": "pojazd specjalny",
+    "401Ka": "drobnica, ładunki sypkie, ładunki sztukowe",
+    "401Ka_XGa": "wagon gospodarczy",
+    "401Zb_PKESA": "węgiel, kamień, piasek",
+    "401Zb_PKPC": "węgiel, kamień, piasek",
+    "401Ze_KLP": "płyty betonowe, bębny kablowe, stal",
+    "401Ze_PNUIK": "płyty betonowe, bębny kablowe, stal",
+    "401Ze_PKESA": "płyty betonowe, bębny kablowe, stal",
+    "401Zl": "ładunki sypkie o dużej masie usypowej",
+    "408S": "cement, wapno, popioły lotne, żużel",
+    "412W": "drobnica, kruszywo, węgiel",
+    "412Z": "kontenery",
+    "413S": "węgiel, kreda, piasek",
+    "421S": "karbid, ładunki wrażliwe na czynniki atm.",
+    "424Z": "ładunki skupione, pojazdy, dłużyca",
+    "425S": "ładunki wrażliwe na czynniki atm.",
+    "426S": "drobnica",
+    "426Z": "ładunki skupione, pojazdy",
+    "429W": "towary masowe odporne na warunki atmosferyczne (węgiel, ruda)",
+    "441V": "węgiel kamienny, żwir",
+    "627Z": "kontenery",
+    "WB117": "gaz, mieszaniny gazów",
+    "445Rb": "produkty naftowe",
+    "418Va_AWT": "drobnica, ładunki sypkie (piasek, kamień)",
+    "418Va_BENET": "drobnica, ładunki sypkie (piasek, kamień)",
+    "418Va_TSS": "drobnica, ładunki sypkie (piasek, kamień)",
+    "418Vb_DB": "drobnica, ładunki sypkie (piasek, kamień)",
+    "418Vb_DOLWR": "drobnica, ładunki sypkie (piasek, kamień)",
+    "418Vb_PKPC": "drobnica, ładunki sypkie (piasek, kamień)",
+    "418Vb_WIEBE": "drobnica, ładunki sypkie (piasek, kamień)",
+    "418Vb_ZOS": "drobnica, ładunki sypkie (piasek, kamień)",
+    "418Vb_ZUE": "drobnica, ładunki sypkie (piasek, kamień)"
   }
 }

src/main.ts

@@ -3,6 +3,7 @@ import { createPinia } from 'pinia';
 
 import App from './App.vue';
 import i18n from './i18n-setup';
+import router from './router';
 const pinia = createPinia();
 
-createApp(App).use(pinia).use(i18n).mount('#app');
+createApp(App).use(pinia).use(i18n).use(router).mount('#app');

src/managers/apiManager.ts

@@ -0,0 +1,16 @@
+import http from '../http';
+import { API } from '../types/api.types';
+
+export class ApiManager {
+  static async fetchActiveData() {
+    try {
+      const responseData = (await http.get<API.ActiveData>('/api/getActiveData')).data;
+
+      return responseData;
+    } catch (error) {
+      console.error('Nie udało się pobrać zdalnej zawartości', error);
+    }
+
+    return null;
+  }
+}

src/mixins/imageMixin.ts

@@ -7,7 +7,7 @@ export default defineComponent({
     },
 
     getThumbnailURL(vehicleType: string, size: 'small' | 'large') {
-      return `https://static.spythere.eu/images/${vehicleType}--${size == 'small' ? 300 : 800}px.jpg`;
+      return `https://stacjownik.spythere.eu/static/images/${vehicleType}--${size == 'small' ? 300 : 800}px.jpg`;
     },
   },
 });

src/mixins/stockMixin.ts

@@ -1,6 +1,6 @@
 import { defineComponent } from 'vue';
 import { useStore } from '../store';
-import { ICarWagon, ILocomotive, IStock, ICargo, IVehicle } from '../types';
+import { ICarWagon, ILocomotive, IStock, ICargo, IVehicle } from '../types/common.types';
 import { isTractionUnit } from '../utils/vehicleUtils';
 
 export default defineComponent({
@@ -69,8 +69,6 @@ export default defineComponent({
 
         const isTractionUnit = /^([a-zA-Z\d]{0,}-\d{0,})/.test(type);
 
-        console.log(type, isTractionUnit);
-
         if (isTractionUnit) {
           const [locoType, spawnProps] = type.split(',');
           vehicle = this.store.locoDataList.find((loco) => loco.type == locoType) || null;

src/mixins/stockPreviewMixin.ts

@@ -1,6 +1,6 @@
 import { defineComponent } from 'vue';
 import { useStore } from '../store';
-import { ICarWagon, ILocomotive, IStock, IVehicle, LocoGroupType, WagonGroupType } from '../types';
+import { ICarWagon, ILocomotive, IStock, IVehicle, LocoGroupType, WagonGroupType } from '../types/common.types';
 import { isTractionUnit } from '../utils/vehicleUtils';
 
 export default defineComponent({

src/router.ts

@@ -0,0 +1,53 @@
+import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router';
+import AppContainerView from './views/AppContainerView.vue';
+import WikiListTab from './components/tabs/WikiListTab.vue';
+import StockListTab from './components/tabs/StockListTab.vue';
+import NumberGeneratorTab from './components/tabs/NumberGeneratorTab.vue';
+import StockGeneratorTab from './components/tabs/StockGeneratorTab.vue';
+
+const routes: RouteRecordRaw[] = [
+  {
+    path: '/',
+    component: AppContainerView,
+    meta: {
+      viewMode: StockListTab,
+    },
+    children: [
+      {
+        path: 'stock',
+        redirect: '/',
+        meta: {
+          viewMode: StockListTab,
+        },
+      },
+      {
+        path: 'wiki',
+        component: AppContainerView,
+        meta: {
+          viewMode: WikiListTab,
+        },
+      },
+      {
+        path: 'numgen',
+        component: AppContainerView,
+        meta: {
+          viewMode: NumberGeneratorTab,
+        },
+      },
+      {
+        path: 'stockgen',
+        component: AppContainerView,
+        meta: {
+          viewMode: StockGeneratorTab,
+        },
+      },
+    ],
+  },
+];
+
+const router = createRouter({
+  history: createWebHistory(),
+  routes,
+});
+
+export default router;

src/store.ts

@@ -1,5 +1,5 @@
 import {
-  IVehiclesData,
+  IVehiclesAPIResponse,
   ICarWagon,
   ILocomotive,
   ICargo,
@@ -8,7 +8,8 @@ import {
   IRealComposition,
   LocoGroupType,
   WagonGroupType,
-} from './types';
+  IVehicleData,
+} from './types/common.types';
 import { defineStore } from 'pinia';
 import {
   acceptableWeight,
@@ -24,6 +25,8 @@ import {
 import i18n from './i18n-setup';
 import http from './http';
 
+import realCompositionsJSON from './data/realCompositions.json';
+
 export const useStore = defineStore({
   id: 'store',
   state: () => ({
@@ -47,14 +50,14 @@ export const useStore = defineStore({
 
     vehiclePreviewSrc: '',
 
-    stockSectionMode: 'stock-list',
-
     isRandomizerCardOpen: false,
     isRealStockListCardOpen: false,
 
-    vehiclesData: undefined as IVehiclesData | undefined,
+    vehiclesData: undefined as IVehicleData[] | undefined,
 
     lastFocusedElement: null as HTMLElement | null,
+
+    compatibleSimulatorVersion: '2024.2.1',
   }),
 
   getters: {
@@ -73,26 +76,23 @@ export const useStore = defineStore({
     realCompositionList: (state) => {
       if (!state.vehiclesData) return [];
 
-      return Object.keys(state.vehiclesData.realCompositions).reduce<IRealComposition[]>(
+      return Object.keys(realCompositionsJSON).reduce<IRealComposition[]>((acc, key) => {
-        (acc, key) => {
+        const [type, number, ...name] = key.split(' ');
-          const [type, number, ...name] = key.split(' ');
 
-          const obj = {
+        const obj = {
-            number: number.replace(/_/g, '/'),
+          number: number.replace(/_/g, '/'),
-            name: name.join(' '),
+          name: name.join(' '),
-            stockString: state.vehiclesData!.realCompositions[key],
+          stockString: realCompositionsJSON[key as keyof typeof realCompositionsJSON],
-            type,
+          type,
-          };
+        };
 
-          acc.push({
+        acc.push({
-            stockId: `${obj.type} ${obj.number} ${obj.name}`,
+          stockId: `${obj.type} ${obj.number} ${obj.name}`,
-            ...obj,
+          ...obj,
-          });
+        });
 
-          return acc;
+        return acc;
-        },
+      }, []);
-        []
-      );
     },
 
     stockSupportsColdStart: (state) => {
@@ -104,9 +104,8 @@ export const useStore = defineStore({
       const headingLoco = state.stockList[0];
 
       return (
-        state.vehiclesData?.vehicleProps.find(
+        state.vehiclesData?.find((vehicle) => vehicle.name == headingLoco.vehicleRef.type)?.group
-          (stock) => stock.type == headingLoco.vehicleRef.constructionType
+          .locoProps?.coldStart ?? false
-        )?.coldStart ?? false
       );
     },
 
@@ -117,9 +116,8 @@ export const useStore = defineStore({
       const headingLoco = state.stockList[0];
 
       return (
-        state.vehiclesData?.vehicleProps.find(
+        state.vehiclesData?.find((vehicle) => vehicle.name == headingLoco.vehicleRef.type)?.group
-          (stock) => stock.type == headingLoco.vehicleRef.constructionType
+          .locoProps?.doubleManned ?? false
-        )?.doubleManned ?? false
       );
     },
   },
@@ -127,7 +125,7 @@ export const useStore = defineStore({
   actions: {
     async fetchVehiclesAPI() {
       try {
-        const vehiclesData = (await http.get<IVehiclesData>('/vehicles')).data;
+        const vehiclesData = (await http.get<IVehiclesAPIResponse>('/api/getVehicles')).data;
         this.vehiclesData = vehiclesData;
       } catch (error) {
         console.error(error);
@@ -136,29 +134,11 @@ export const useStore = defineStore({
 
     async setupAPIData() {
       await this.fetchVehiclesAPI();
-      this.mergeBackendTranslations();
-    },
-
-    async mergeBackendTranslations() {
-      if (!this.vehiclesData) return;
-
-      i18n.global.mergeLocaleMessage('pl', this.vehiclesData.vehicleLocales.pl);
-      i18n.global.mergeLocaleMessage('en', this.vehiclesData.vehicleLocales.en);
     },
 
     handleRouting() {
-      switch (window.location.pathname) {
+      if (window.location.search.includes('trainId=')) {
-        case '/numgnr':
+        const trainId = window.location.search;
-          this.stockSectionMode = 'number-generator';
-          break;
-        case '/stockgnr':
-          this.stockSectionMode = 'stock-generator';
-          break;
-        case '/vehicles':
-          this.stockSectionMode = 'wiki-list';
-          break;
-        default:
-          break;
       }
     },
   },

src/styles/global.scss

@@ -115,6 +115,10 @@ button {
   &:hover {
     color: $accentColor;
   }
+
+  &:focus-visible {
+    outline: 1px solid $accentColor;
+  }
 }
 
 [data-tooltip]:hover::after,
@@ -134,7 +138,8 @@ button {
   cursor: pointer;
 }
 
-.btn {
+.btn,
+.link-btn {
   padding: 0.4em 0.75em;
 
   outline: none;
@@ -202,6 +207,10 @@ button {
   }
 }
 
+.link-btn.router-link-exact-active {
+  color: $accentColor;
+}
+
 select,
 input[type='text'],
 input[type='number'] {

src/types/api.types.ts

@@ -0,0 +1,87 @@
+// API namespace
+export namespace API {
+  export interface ActiveData {
+    trains: Train[];
+    activeSceneries: ActiveScenery[];
+  }
+}
+
+export interface ActiveScenery {
+  dispatcherId: number;
+  dispatcherName: string;
+  dispatcherIsSupporter: boolean;
+  stationName: string;
+  stationHash: string;
+  region: string;
+  maxUsers: number;
+  currentUsers: number;
+  spawn: number;
+  lastSeen: number;
+  dispatcherExp: number;
+  nameFromHeader: string;
+  spawnString?: string;
+  networkConnectionString: string;
+  isOnline: number;
+  dispatcherRate: number;
+  dispatcherStatus: number;
+}
+
+export interface Train {
+  id: string;
+  trainNo: number;
+  mass: number;
+  speed: number;
+  length: number;
+  distance: number;
+  stockString: string;
+  driverName: string;
+  driverId: number;
+  driverIsSupporter: boolean;
+  driverLevel: number;
+  currentStationHash: string;
+  currentStationName: string;
+  signal: string;
+  connectedTrack: string;
+  online: number;
+  lastSeen: number;
+  region: string;
+  isTimeout: boolean;
+  timetable?: Timetable;
+}
+
+export interface Timetable {
+  SKR: boolean;
+  TWR: boolean;
+  hasDangerousCargo: boolean;
+  hasExtraDeliveries: boolean;
+  warningNotes: string;
+  category: string;
+  stopList: TimetableStop[];
+  route: string;
+  timetableId: number;
+  sceneries: string[];
+  path: string;
+}
+
+export interface TimetableStop {
+  stopName: string;
+  stopNameRAW: string;
+  stopType: string;
+  stopDistance: number;
+  pointId: string;
+  comments?: (null | string)[];
+  mainStop: boolean;
+  arrivalLine?: string;
+  arrivalTimestamp: number;
+  arrivalRealTimestamp: number;
+  arrivalDelay: number;
+  departureLine?: string;
+  departureTimestamp: number;
+  departureRealTimestamp: number;
+  departureDelay: number;
+  beginsHere: boolean;
+  terminatesHere: boolean;
+  confirmed: number;
+  stopped: number;
+  stopTime?: number;
+}

src/types/common.types.ts

@@ -1,5 +1,4 @@
 export type IVehicle = ILocomotive | ICarWagon;
-export type StockSectionMode = 'STOCK_LIST' | 'STOCK_GENERATOR';
 
 export type LocoGroupType = 'loco-electric' | 'loco-diesel' | 'unit-electric' | 'unit-diesel';
 export type WagonGroupType = 'wagon-passenger' | 'wagon-freight';
@@ -21,32 +20,7 @@ export interface ICargo {
   weight: number;
 }
 
-export interface IVehiclesData {
+export type IVehiclesAPIResponse = IVehicleData[];
-  simulatorVersion: string;
-
-  generator: {
-    cargo: {
-      [key: string]: string[];
-    };
-  };
-
-  vehicleList: any[][];
-
-  vehicleProps: IVehicleProps[];
-
-  vehicleLocales: {
-    pl: {
-      cargo: Record<string, string>;
-      usage: Record<string, string>;
-    };
-    en: {
-      cargo: Record<string, string>;
-      usage: Record<string, string>;
-    };
-  };
-
-  realCompositions: Record<string, string>;
-}
 
 export interface ILocomotive {
   type: string;
@@ -88,3 +62,38 @@ export interface IRealComposition {
   number: string;
   name: string;
 }
+
+export interface IVehicleData {
+  id: number;
+  name: string;
+  type: string;
+  cabinName: string | null;
+  restrictions: IVehicleRestrictions | null;
+  vehicleGroupsId: number;
+  group: IVehicleGroup;
+}
+
+export interface IVehicleRestrictions {
+  sponsorOnly: number | null;
+  teamOnly: boolean | null;
+}
+
+export interface IVehicleGroup {
+  id: number;
+  name: string;
+  speed: number;
+  length: number;
+  weight: number;
+  cargoTypes: IVehicleCargoType[] | null;
+  locoProps: IVehicleLocoProps | null;
+}
+
+export interface IVehicleCargoType {
+  id: string;
+  weight: number;
+}
+
+export interface IVehicleLocoProps {
+  coldStart: boolean;
+  doubleManned: boolean;
+}

src/utils/vehicleUtils.ts

@@ -2,10 +2,11 @@ import {
   ICarWagon,
   ILocomotive,
   IStock,
-  IVehiclesData,
+  IVehicleData,
+  IVehiclesAPIResponse,
   LocoGroupType,
   WagonGroupType,
-} from '../types';
+} from '../types/common.types';
 import {
   MassLimitLocoType,
   SpeedLimitLocoType,
@@ -17,71 +18,53 @@ export function isTractionUnit(vehicle: ILocomotive | ICarWagon): vehicle is ILo
   return (vehicle as ILocomotive).cabinType !== undefined;
 }
 
-export function locoDataList(vehiclesData: IVehiclesData | undefined) {
+export function locoDataList(vehiclesData: IVehicleData[] | undefined) {
   if (!vehiclesData) return [];
 
-  return vehiclesData.vehicleList.reduce<ILocomotive[]>((acc, vehicleInfoArray) => {
+  return vehiclesData.reduce<ILocomotive[]>((acc, data) => {
-    // check if data array has 5 elements (locos & units only)
+    if (!data.cabinName) return acc;
-    if (vehicleInfoArray.length != 5) return acc;
-
-    const [type, constructionType, cabinType, group, restrictions] = vehicleInfoArray;
-    const locoProps = vehiclesData.vehicleProps.find((prop) => constructionType == prop.type);
-
-    if (!locoProps) {
-      console.warn('Brak atrybutów dla pojazdu:', type);
-      return acc;
-    }
 
     acc.push({
-      group: group as LocoGroupType,
+      group: data.type as LocoGroupType,
+      type: data.name,
 
-      type,
+      constructionType: data.group.name,
-      constructionType,
+      cabinType: data.cabinName,
-      cabinType,
 
-      sponsorOnlyTimestamp: restrictions?.sponsorOnly ?? 0,
+      sponsorOnlyTimestamp: data.restrictions?.sponsorOnly ?? 0,
-      teamOnly: restrictions?.teamOnly ?? false,
+      teamOnly: data.restrictions?.teamOnly ?? false,
 
-      maxSpeed: locoProps.speed,
+      maxSpeed: data.group.speed,
-      length: locoProps.length,
+      length: data.group.length,
-      weight: locoProps.weight,
+      weight: data.group.weight,
 
-      coldStart: locoProps.coldStart ?? false,
+      coldStart: data.group.locoProps?.coldStart ?? false,
-      doubleManned: locoProps.doubleManned ?? false,
+      doubleManned: data.group.locoProps?.doubleManned ?? false,
     });
 
     return acc;
   }, []);
 }
 
-export function carDataList(vehiclesData: IVehiclesData | undefined) {
+export function carDataList(vehiclesData: IVehicleData[] | undefined) {
   if (!vehiclesData) return [];
 
-  return vehiclesData.vehicleList.reduce<ICarWagon[]>((acc, vehicleInfoArray) => {
+  return vehiclesData.reduce<ICarWagon[]>((acc, data) => {
-    // check if data array has 4 elements (wagons only)
+    if (data.cabinName !== null) return acc;
-    if (vehicleInfoArray.length != 4) return acc;
-
-    const [type, constructionType, group, restrictions] = vehicleInfoArray;
-    const wagonProps = vehiclesData.vehicleProps.find((prop) => constructionType == prop.type);
-
-    if (!wagonProps) {
-      console.warn('Brak atrybutów dla pojazdu:', type);
-      return acc;
-    }
 
     acc.push({
-      group: group as WagonGroupType,
+      group: data.type as WagonGroupType,
-      type,
+      type: data.name,
-      constructionType,
+      constructionType: data.group.name,
-      loadable: wagonProps.cargoTypes ? wagonProps.cargoTypes.length > 0 : false,
+      loadable: data.group.cargoTypes !== null && data.group.cargoTypes.length > 0,
-      cargoTypes: wagonProps?.cargoTypes ?? [],
+      cargoTypes: data.group?.cargoTypes ?? [],
 
-      sponsorOnlyTimestamp: restrictions?.sponsorOnly ?? 0,
+      sponsorOnlyTimestamp: data.restrictions?.sponsorOnly ?? 0,
-      teamOnly: restrictions?.teamOnly ?? false,
+      teamOnly: data.restrictions?.teamOnly ?? false,
 
-      maxSpeed: wagonProps.speed,
+      maxSpeed: data.group.speed,
-      weight: wagonProps?.weight || 0,
+      length: data.group.length,
-      length: wagonProps?.length || 0,
+      weight: data.group.weight,
     });
 
     return acc;

vite.config.ts

@@ -8,6 +8,9 @@ export default defineConfig({
   server: {
     port: 2138,
   },
+  preview: {
+    port: 4138,
+  },
   plugins: [
     vue(),
     VitePWA({
@@ -21,29 +24,15 @@ export default defineConfig({
       },
 
       workbox: {
+        cleanupOutdatedCaches: true,
         globPatterns: ['**/*.{js,css,html,jpg,png,svg,img,woff,woff2}'],
 
         runtimeCaching: [
           {
-            urlPattern: new RegExp('^https://rj.td2.info.pl/dist/img/thumbnails/*', 'i'),
+            urlPattern: /^https:\/\/.*\.spythere\.eu\/.*/i,
-            handler: 'CacheFirst',
+            handler: 'StaleWhileRevalidate',
             options: {
-              cacheName: 'swdr-images-cache',
+              cacheName: 'spythere-cache',
-              expiration: {
-                maxEntries: 50,
-                maxAgeSeconds: 60 * 60 * 24, // <== 1 day
-              },
-              cacheableResponse: {
-                statuses: [200],
-              },
-            },
-          },
-
-          {
-            urlPattern: new RegExp('^https://stacjownik.spythere.eu/vehicles', 'i'),
-            handler: 'NetworkFirst',
-            options: {
-              cacheName: 'vehicles-cache',
             },
           },
         ],