From 4ebfd0dc9c97952c3dd0d905e3e52c64116ab880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= <67809513+joaodcp@users.noreply.github.com> Date: Fri, 14 Jun 2024 15:19:01 +0000 Subject: [PATCH 1/5] Add Comboios de Portugal GTFS feed and CARRIS GTFS-RT VP --- .../pt-lisboa-carris-gtfs-rt-v-p-2032.json | 12 +++++++++++ ...boa-comboios-de-portugal-cp-gtfs-1037.json | 9 ++++++++- ...n-cp---comboios-de-portugal-gtfs-2031.json | 20 +++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 catalogs/sources/gtfs/realtime/pt-lisboa-carris-gtfs-rt-v-p-2032.json create mode 100644 catalogs/sources/gtfs/schedule/pt-unknown-cp---comboios-de-portugal-gtfs-2031.json diff --git a/catalogs/sources/gtfs/realtime/pt-lisboa-carris-gtfs-rt-v-p-2032.json b/catalogs/sources/gtfs/realtime/pt-lisboa-carris-gtfs-rt-v-p-2032.json new file mode 100644 index 00000000..ae91f057 --- /dev/null +++ b/catalogs/sources/gtfs/realtime/pt-lisboa-carris-gtfs-rt-v-p-2032.json @@ -0,0 +1,12 @@ +{ + "mdb_source_id": 2032, + "data_type": "gtfs-rt", + "entity_type": "vp", + "provider": "CARRIS", + "static_reference": [ + 1032 + ], + "urls": { + "direct_download": "https://gateway.carris.pt/gateway/gtfs/api/v2.8/GTFS/realtime/vehiclepositions" + } +} \ No newline at end of file diff --git a/catalogs/sources/gtfs/schedule/pt-lisboa-comboios-de-portugal-cp-gtfs-1037.json b/catalogs/sources/gtfs/schedule/pt-lisboa-comboios-de-portugal-cp-gtfs-1037.json index 87e585d3..99a075cf 100644 --- a/catalogs/sources/gtfs/schedule/pt-lisboa-comboios-de-portugal-cp-gtfs-1037.json +++ b/catalogs/sources/gtfs/schedule/pt-lisboa-comboios-de-portugal-cp-gtfs-1037.json @@ -2,6 +2,7 @@ "mdb_source_id": 1037, "data_type": "gtfs", "provider": "Comboios de Portugal (CP)", + "status": "deprecated", "location": { "country_code": "PT", "subdivision_name": "Lisboa", @@ -16,5 +17,11 @@ "urls": { "direct_download": "http://www.transporlis.pt/Portals/0/OpenData/gtfs/zip/3/gtfs_3.zip", "latest": "https://storage.googleapis.com/storage/v1/b/mdb-latest/o/pt-lisboa-comboios-de-portugal-cp-gtfs-1037.zip?alt=media" - } + }, + "redirect": [ + { + "id": 2031, + "comment": null + } + ] } \ No newline at end of file diff --git a/catalogs/sources/gtfs/schedule/pt-unknown-cp---comboios-de-portugal-gtfs-2031.json b/catalogs/sources/gtfs/schedule/pt-unknown-cp---comboios-de-portugal-gtfs-2031.json new file mode 100644 index 00000000..d3480e98 --- /dev/null +++ b/catalogs/sources/gtfs/schedule/pt-unknown-cp---comboios-de-portugal-gtfs-2031.json @@ -0,0 +1,20 @@ +{ + "mdb_source_id": 2031, + "data_type": "gtfs", + "provider": "CP - Comboios de Portugal", + "location": { + "country_code": "PT", + "bounding_box": { + "minimum_latitude": 37.014101, + "maximum_latitude": 42.024982, + "minimum_longitude": -9.418564, + "maximum_longitude": -6.829114, + "extracted_on": "2024-06-14T14:59:55+00:00" + } + }, + "urls": { + "direct_download": "https://publico.cp.pt/gtfs/gtfs.zip", + "latest": "https://storage.googleapis.com/storage/v1/b/mdb-latest/o/pt-unknown-cp---comboios-de-portugal-gtfs-2031.zip?alt=media" + }, + "redirect": [] +} \ No newline at end of file From 8052cd32e49502da2c2a3c61127acdac61ea87a5 Mon Sep 17 00:00:00 2001 From: Emma Blue <90632321+emmambd@users.noreply.github.com> Date: Mon, 5 Aug 2024 09:52:44 -0400 Subject: [PATCH 2/5] Updating transit provider to match other Carris feeds --- .../gtfs/realtime/pt-lisboa-carris-gtfs-rt-v-p-2032.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catalogs/sources/gtfs/realtime/pt-lisboa-carris-gtfs-rt-v-p-2032.json b/catalogs/sources/gtfs/realtime/pt-lisboa-carris-gtfs-rt-v-p-2032.json index ae91f057..c766c524 100644 --- a/catalogs/sources/gtfs/realtime/pt-lisboa-carris-gtfs-rt-v-p-2032.json +++ b/catalogs/sources/gtfs/realtime/pt-lisboa-carris-gtfs-rt-v-p-2032.json @@ -2,11 +2,11 @@ "mdb_source_id": 2032, "data_type": "gtfs-rt", "entity_type": "vp", - "provider": "CARRIS", + "provider": "Carris Metropolitana", "static_reference": [ 1032 ], "urls": { "direct_download": "https://gateway.carris.pt/gateway/gtfs/api/v2.8/GTFS/realtime/vehiclepositions" } -} \ No newline at end of file +} From 15d63648e822c7275cc3f60076a960c28facdee8 Mon Sep 17 00:00:00 2001 From: Emma Blue <90632321+emmambd@users.noreply.github.com> Date: Mon, 5 Aug 2024 09:54:18 -0400 Subject: [PATCH 3/5] Update to match transit provider in other feeds --- .../gtfs/realtime/pt-lisboa-carris-gtfs-rt-v-p-2032.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalogs/sources/gtfs/realtime/pt-lisboa-carris-gtfs-rt-v-p-2032.json b/catalogs/sources/gtfs/realtime/pt-lisboa-carris-gtfs-rt-v-p-2032.json index c766c524..cbddda6b 100644 --- a/catalogs/sources/gtfs/realtime/pt-lisboa-carris-gtfs-rt-v-p-2032.json +++ b/catalogs/sources/gtfs/realtime/pt-lisboa-carris-gtfs-rt-v-p-2032.json @@ -2,7 +2,7 @@ "mdb_source_id": 2032, "data_type": "gtfs-rt", "entity_type": "vp", - "provider": "Carris Metropolitana", + "provider": "Carris", "static_reference": [ 1032 ], From 8f0afd18a4e538370ac330704b6e654929f80a3d Mon Sep 17 00:00:00 2001 From: Emma Blue <90632321+emmambd@users.noreply.github.com> Date: Mon, 5 Aug 2024 09:57:27 -0400 Subject: [PATCH 4/5] Fix entity type to be an array --- .../gtfs/realtime/pt-lisboa-carris-gtfs-rt-v-p-2032.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/catalogs/sources/gtfs/realtime/pt-lisboa-carris-gtfs-rt-v-p-2032.json b/catalogs/sources/gtfs/realtime/pt-lisboa-carris-gtfs-rt-v-p-2032.json index cbddda6b..cd04c356 100644 --- a/catalogs/sources/gtfs/realtime/pt-lisboa-carris-gtfs-rt-v-p-2032.json +++ b/catalogs/sources/gtfs/realtime/pt-lisboa-carris-gtfs-rt-v-p-2032.json @@ -1,7 +1,9 @@ { "mdb_source_id": 2032, "data_type": "gtfs-rt", - "entity_type": "vp", + "entity_type": [ + "vp" + ], "provider": "Carris", "static_reference": [ 1032 From 22538bbad1f782d7465eb148e9733b5f8331e7f6 Mon Sep 17 00:00:00 2001 From: Emma Blue <90632321+emmambd@users.noreply.github.com> Date: Mon, 5 Aug 2024 10:02:19 -0400 Subject: [PATCH 5/5] remove null comment --- .../pt-lisboa-comboios-de-portugal-cp-gtfs-1037.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/catalogs/sources/gtfs/schedule/pt-lisboa-comboios-de-portugal-cp-gtfs-1037.json b/catalogs/sources/gtfs/schedule/pt-lisboa-comboios-de-portugal-cp-gtfs-1037.json index 99a075cf..bb834a3f 100644 --- a/catalogs/sources/gtfs/schedule/pt-lisboa-comboios-de-portugal-cp-gtfs-1037.json +++ b/catalogs/sources/gtfs/schedule/pt-lisboa-comboios-de-portugal-cp-gtfs-1037.json @@ -20,8 +20,7 @@ }, "redirect": [ { - "id": 2031, - "comment": null + "id": 2031 } ] -} \ No newline at end of file +}