Skip to content

Commit 1758745

Browse files
kasmar00kasmar00
authored
Fix urls for zbiorkom.live RT and add new feeds (#2321)
1 parent 47a6165 commit 1758745

2 files changed

Lines changed: 96 additions & 22 deletions

File tree

‎feeds/pl.json‎

Lines changed: 95 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@
7272
}
7373
},
7474
{
75-
"name": "Koleje-Mazowieckie-ZL",
75+
"name": "Kolejki-Wąskotorowe",
7676
"type": "http",
7777
"spec": "gtfs",
78-
"url": "https://gtfs.kasznia.net/static/km-zl.zip",
78+
"url": "https://gtfs.kasznia.net/static/narrow-gauge.zip",
7979
"license": {
8080
"spdx-identifier": "CC-BY-4.0"
8181
}
@@ -175,7 +175,18 @@
175175
{
176176
"name": "Toruń",
177177
"type": "transitland-atlas",
178-
"transitland-atlas-id": "f-u3mj-torun"
178+
"transitland-atlas-id": "f-u3mj-torun",
179+
"url-override": "https://api.zbiorkom.live/api6-open/torun/gtfs/default"
180+
},
181+
{
182+
"name": "Toruń",
183+
"type": "url",
184+
"spec": "gtfs-rt",
185+
"url": "https://api.zbiorkom.live/api6-open/torun/gtfsRealtime/default/tripUpdates,vehiclePositions",
186+
"license": {
187+
"spdx-identifier": "MIT"
188+
},
189+
"use-feed-proxy": true
179190
},
180191
{
181192
"name": "Kielce",
@@ -375,8 +386,22 @@
375386
},
376387
{
377388
"name": "Koleje-Małopolskie-ald",
378-
"type": "transitland-atlas",
379-
"transitland-atlas-id": "f-u2y-koleje~małopolskie~ald"
389+
"type": "http",
390+
"spec": "gtfs",
391+
"url": "https://api.zbiorkom.live/api6-open/mld/gtfs/MLD",
392+
"license": {
393+
"spdx-identifier": "MIT"
394+
}
395+
},
396+
{
397+
"name": "Koleje-Małopolskie-ald",
398+
"type": "url",
399+
"spec": "gtfs-rt",
400+
"url": "https://api.zbiorkom.live/api6-open/mld/gtfsRealtime/MLD/tripUpdates,serviceAlerts",
401+
"license": {
402+
"spdx-identifier": "MIT"
403+
},
404+
"use-feed-proxy": true
380405
},
381406
{
382407
"name": "ZTP-Kraków-T",
@@ -456,6 +481,7 @@
456481
"type": "http",
457482
"spec": "gtfs",
458483
"url": "https://gtfs.kasznia.net/static/kalisz.zip",
484+
"url-override": "https://api.zbiorkom.live/api6-open/kalisz/gtfs/default",
459485
"license": {
460486
"spdx-identifier": "CC0-1.0"
461487
},
@@ -465,7 +491,7 @@
465491
"name": "KLA-Kalisz",
466492
"type": "url",
467493
"spec": "gtfs-rt",
468-
"url": "https://api.zbiorkom.live/api6-open/kalisz/gtfsRealtime/tripUpdates",
494+
"url": "https://api.zbiorkom.live/api6-open/kalisz/gtfsRealtime/default/tripUpdates,serviceAlerts",
469495
"license": {
470496
"spdx-identifier": "MIT"
471497
},
@@ -495,6 +521,16 @@
495521
},
496522
"fix": true
497523
},
524+
{
525+
"name": "MPK-Wrocław",
526+
"type": "url",
527+
"spec": "gtfs-rt",
528+
"url": "https://api.zbiorkom.live/api6-open/wroclaw/gtfsRealtime/default/tripUpdates,serviceAlerts",
529+
"license": {
530+
"spdx-identifier": "MIT"
531+
},
532+
"use-feed-proxy": true
533+
},
498534
{
499535
"name": "Łódź",
500536
"type": "http",
@@ -529,6 +565,7 @@
529565
"type": "http",
530566
"spec": "gtfs",
531567
"url": "https://files.girlc.at/gtfs/wschod_express.zip",
568+
"url-override": "https://api.zbiorkom.live/api6-open/bialystok/gtfs/WSCHODEXPRESS",
532569
"license": {
533570
"spdx-identifier": "CC0-1.0"
534571
},
@@ -568,9 +605,10 @@
568605
"name": "Sochaczew",
569606
"type": "http",
570607
"spec": "gtfs",
571-
"url": "https://api.zbiorkom.live/api6-open/warsaw/gtfs/SOCHACZEW",
608+
"url": "https://files.girlc.at/gtfs/sochaczew.zip",
609+
"url-override": "https://api.zbiorkom.live/api6-open/warsaw/gtfs/SOCHACZEW",
572610
"license": {
573-
"spdx-identifier": "MIT"
611+
"spdx-identifier": "CC0-1.0"
574612
},
575613
"fix": true
576614
},
@@ -588,9 +626,10 @@
588626
"name": "Otwock",
589627
"type": "http",
590628
"spec": "gtfs",
591-
"url": "https://api.zbiorkom.live/api6-open/warsaw/gtfs/OTWOCK",
629+
"url": "https://files.girlc.at/gtfs/otwock.zip",
630+
"url-override": "https://api.zbiorkom.live/api6-open/warsaw/gtfs/OTWOCK",
592631
"license": {
593-
"spdx-identifier": "MIT"
632+
"spdx-identifier": "CC0-1.0"
594633
},
595634
"fix": true
596635
},
@@ -608,9 +647,10 @@
608647
"name": "Opole",
609648
"type": "http",
610649
"spec": "gtfs",
611-
"url": "https://api.zbiorkom.live/api6-open/opole/gtfs/default",
650+
"url": "https://files.girlc.at/gtfs/opole.zip",
651+
"url-override": "https://api.zbiorkom.live/api6-open/opole/gtfs/default",
612652
"license": {
613-
"spdx-identifier": "MIT"
653+
"spdx-identifier": "CC0-1.0"
614654
},
615655
"fix": true
616656
},
@@ -738,6 +778,7 @@
738778
"type": "http",
739779
"spec": "gtfs",
740780
"url": "https://kasmar00.github.io/gtfs-warsaw-custom/feeds/warsaw-ferries/latest.zip",
781+
"url-override": "https://api.zbiorkom.live/api6-open/warsaw/gtfs/FERRIES/",
741782
"license": {
742783
"spdx-identifier": "CC-BY-4.0"
743784
}
@@ -746,7 +787,7 @@
746787
"name": "Warsaw-Ferries",
747788
"type": "url",
748789
"spec": "gtfs-rt",
749-
"url": "https://api.zbiorkom.live/api6-open/warsaw/gtfsRealtime/FERRIES/tripUpdates,serviceAlerts+json",
790+
"url": "https://api.zbiorkom.live/api6-open/warsaw/gtfsRealtime/FERRIES/tripUpdates,serviceAlerts",
750791
"license": {
751792
"spdx-identifier": "MIT"
752793
},
@@ -756,9 +797,10 @@
756797
"name": "Ząbki",
757798
"type": "http",
758799
"spec": "gtfs",
759-
"url": "https://api.zbiorkom.live/api6-open/warsaw/gtfs/ZABKI",
800+
"url": "https://files.girlc.at/gtfs/zabki.zip",
801+
"url-override": "https://api.zbiorkom.live/api6-open/warsaw/gtfs/ZABKI",
760802
"license": {
761-
"spdx-identifier": "MIT"
803+
"spdx-identifier": "CC0-1.0"
762804
}
763805
},
764806
{
@@ -1038,7 +1080,8 @@
10381080
"url": "https://files.girlc.at/gtfs/tribus.zip",
10391081
"license": {
10401082
"spdx-identifier": "CC0-1.0"
1041-
}
1083+
},
1084+
"fix":true
10421085
},
10431086
{
10441087
"name": "PKS-Opoczno",
@@ -1165,9 +1208,10 @@
11651208
"name": "Radzymin",
11661209
"type": "http",
11671210
"spec": "gtfs",
1168-
"url": "https://api.zbiorkom.live/api6-open/warsaw/gtfs/RADZYMIN",
1211+
"url": "https://files.girlc.at/gtfs/radzymin.zip",
1212+
"url-override": "https://api.zbiorkom.live/api6-open/warsaw/gtfs/RADZYMIN",
11691213
"license": {
1170-
"spdx-identifier": "MIT"
1214+
"spdx-identifier": "CC0-1.0"
11711215
}
11721216
},
11731217
{
@@ -1184,9 +1228,10 @@
11841228
"name": "Łomianki",
11851229
"type": "http",
11861230
"spec": "gtfs",
1187-
"url": "https://api.zbiorkom.live/api6-open/warsaw/gtfs/LOMIANKI",
1231+
"url": "https://files.girlc.at/gtfs/lomianki.zip",
1232+
"url-override": "https://api.zbiorkom.live/api6-open/warsaw/gtfs/LOMIANKI",
11881233
"license": {
1189-
"spdx-identifier": "MIT"
1234+
"spdx-identifier": "CC0-1.0"
11901235
}
11911236
},
11921237
{
@@ -1409,7 +1454,9 @@
14091454
"url": "https://github.com/pawlinski07/pawlinski-gtfs/raw/refs/heads/main/KolejPleszewska.zip",
14101455
"license": {
14111456
"spdx-identifier": "CC-BY-4.0"
1412-
}
1457+
},
1458+
"skip": true,
1459+
"skip-reason":"Expired feed, see https://github.com/pawlinski07/pawlinski-gtfs/issues/1"
14131460
},
14141461
{
14151462
"name": "Koszalin",
@@ -1441,6 +1488,33 @@
14411488
"spdx-identifier": "CC0-1.0"
14421489
}
14431490
},
1491+
{
1492+
"name": "Powiat-Wodzisławski",
1493+
"type": "http",
1494+
"spec": "gtfs",
1495+
"url": "https://files.girlc.at/gtfs/powiat_wodzislawski.zip",
1496+
"license": {
1497+
"spdx-identifier": "CC0-1.0"
1498+
}
1499+
},
1500+
{
1501+
"name": "Wieliszew",
1502+
"type": "http",
1503+
"spec": "gtfs",
1504+
"url": "https://files.girlc.at/gtfs/wieliszew.zip",
1505+
"license": {
1506+
"spdx-identifier": "CC0-1.0"
1507+
}
1508+
},
1509+
{
1510+
"name": "Zamość",
1511+
"type": "http",
1512+
"spec": "gtfs",
1513+
"url": "https://files.girlc.at/gtfs/zamosc.zip",
1514+
"license": {
1515+
"spdx-identifier": "CC0-1.0"
1516+
}
1517+
},
14441518
{
14451519
"name": "Chełmski-Rower",
14461520
"type": "transitland-atlas",

‎src/region_helpers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def data_zielona_gora_latest_resource(source: HttpSource) -> HttpSource:
6363
)
6464

6565
base_url = source.url.rsplit("/", 1)[0]
66-
source.url = f"{base_url}/{gtfs_link}"
66+
source.url = f"{base_url}{gtfs_link}"
6767

6868
return source
6969

0 commit comments

Comments
 (0)